diff -ruN 11p1/config/config-default.ini 12p3/config/config-default.ini
--- 11p1/config/config-default.ini	2005-09-17 03:17:18.000000000 -0500
+++ 12p3/config/config-default.ini	2006-06-18 06:19:16.000000000 -0500
@@ -17,9 +17,11 @@
 ENABLE_LIVESEARCH = false
 ENABLE_ACDROPDOWN = false
 GOOGLE_LINKS_NOFOLLOW = true
+NUM_SPAM_LINKS = 20
 USE_SAFE_DBSESSION = false
 ENABLE_DISCUSSION_LINK = false
 ENABLE_CAPTCHA = false
+USE_CAPTCHA_RANDOM_WORD = false
 
 WIKI_NAME = PhpWiki
 ENABLE_REVERSE_DNS = true
@@ -49,6 +51,7 @@
 DATABASE_DBA_HANDLER = gdbm
 DATABASE_TIMEOUT = 20
 DATABASE_PERSISTENT = false
+DATABASE_OPTIMISE_FREQUENCY = 50
 
 ; let all revisions be stored
 MAJOR_MIN_KEEP = 2147483647
@@ -89,15 +92,16 @@
 GROUP_METHOD = WIKIPAGE
 ;CATEGORY_GROUP_PAGE = CategoryGroup
 ;AUTH_GROUP_FILE = /etc/groups
-; DBAUTH_AUTH_CHECK = "SELECT IF(passwd='$password',1,0) as ok FROM user WHERE userid='$userid'"
-; DBAUTH_AUTH_CRYPT_METHOD = plain
-; DBAUTH_AUTH_USER_EXISTS = "SELECT userid FROM user WHERE userid='$userid'"
-; DBAUTH_AUTH_CREATE = "INSERT INTO user SET passwd=PASSWORD('$password'),userid='$userid'"
+DBAUTH_AUTH_CHECK = "SELECT IF(passwd='$password',1,0) as ok FROM pref WHERE userid='$userid'"
+DBAUTH_AUTH_CRYPT_METHOD = plain
+DBAUTH_AUTH_USER_EXISTS = "SELECT userid FROM pref WHERE userid='$userid'"
+DBAUTH_AUTH_CREATE = "INSERT INTO pref (passwd,userid) VALUES ('$password','$userid')"
 DBAUTH_PREF_SELECT = "SELECT prefs FROM pref WHERE userid='$userid'"
-DBAUTH_PREF_UPDATE = "REPLACE INTO pref SET prefs='$pref_blob',userid='$userid'"
-; DBAUTH_IS_MEMBER = "SELECT user FROM user WHERE user='$userid' AND group='$groupname'"
-; DBAUTH_GROUP_MEMBERS = "SELECT user FROM user WHERE group='$groupname'"
-; DBAUTH_USER_GROUPS = "SELECT group FROM user WHERE user='$userid'"
+DBAUTH_PREF_UPDATE = "UPDATE pref SET prefs='$pref_blob' WHERE userid='$userid'"
+DBAUTH_PREF_INSERT = "INSERT INTO pref (prefs,userid) VALUES ('$pref_blob','$userid')"
+DBAUTH_IS_MEMBER     = "SELECT userid FROM pref WHERE userid='$userid' AND groupname='$groupname'"
+DBAUTH_GROUP_MEMBERS = "SELECT userid FROM pref WHERE groupname='$groupname'"
+DBAUTH_USER_GROUPS   = "SELECT groupname FROM pref WHERE userid='$userid'"
 EDITING_POLICY = "EditingPolicy"
 ; old WikiUser options:
 ALLOW_HTTP_AUTH_LOGIN = false
@@ -127,9 +131,10 @@
 ; COPYRIGHTPAGE_URL = http://creativecommons.org/licenses/by/1.0/
 AUTHORPAGE_TITLE = "The PhpWiki Programming Team"
 AUTHORPAGE_URL = "http://phpwiki.org/ThePhpWikiProgrammingTeam"
+
 TOC_FULL_SYNTAX = true
 ENABLE_MARKUP_COLOR = true
-; ENABLE_MARKUP_TEMPLATE = false
+ENABLE_MARKUP_TEMPLATE = false
 
 ; these not:
 ; DBAUTH_AUTH_DSN =
@@ -148,12 +153,15 @@
 ; GOOGLE_LICENSE_KEY = "..."
 ; DBADMIN_USER = 
 ; DBADMIN_PASSWD = 
-; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
-BABYCART_PATH = /usr/local/bin/babycart
-; BLOG_DEFAULT_EMPTY_PREFIX = true
+BLOG_DEFAULT_EMPTY_PREFIX = true
 ; TOOLBAR_PAGELINK_PULLDOWN = *
 ; TOOLBAR_TEMPLATE_PULLDOWN = Template*
 
+; External executables:
+; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
+BABYCART_PATH = /usr/local/bin/babycart
+; GRAPHVIZ_EXE = /usr/local/bin/dot
+
 PLUGIN_CACHED_DATABASE = file
 ; PLUGIN_CACHED_CACHE_DIR = /tmp/cache
 PLUGIN_CACHED_FILENAME_PREFIX = phpwiki
diff -ruN 11p1/config/config.ini 12p3/config/config.ini
--- 11p1/config/config.ini	2006-02-17 18:03:34.000000000 -0600
+++ 12p3/config/config.ini	2006-07-26 15:58:08.000000000 -0500
@@ -13,7 +13,6 @@
 ;=========================================================================
 ; Part Zero: Latest Development and Tricky Options
 ;=========================================================================
-
 ; If PHP needs help in finding where you installed the rest of the PhpWiki
 ; code, you can set the include_path here.
 ;
@@ -34,28 +33,12 @@
 ; Default: 0
 ;DEBUG = 1
 
-; Enable the new method of handling WikiUsers.  This is currently an
-; experimental feature, although it is considered fairly stable.  It's best
-; to leave it on, and only disable it if you have problems with it.
-; Servers with memory-limit problems might want to turn it off. It costs ~300KB
-; Default: true
-;ENABLE_USER_NEW = false
-
-; Use access control lists (as in Solaris and Windows NTFS) per page and group, 
-; not per user for the whole wiki.
-; 
-; I suspect ACL page permissions to degrade speed by 10%. 
-; GROUP_METHOD=WIKIPAGE is slowest. (See Part 3a)
-; Default: true
-;ENABLE_PAGEPERM = false
-
 ; Graphical buttons on edit. Default: true
 ; Reportedly broken on MacOSX Safari
 ;ENABLE_EDIT_TOOLBAR = false
 
-; Adds two additional buttons in EDIT_TOOLBAR, Search&Replace and Undo
-; Undo is experimental.
-; Default: true
+; Adds two additional buttons in EDIT_TOOLBAR, Search&Replace and Undo.
+; Undo is experimental. Default: true
 ;JS_SEARCHREPLACE = true
 
 ; Note: Enable it for all users. Otherwise as per-user setting in UserPreferences.
@@ -67,19 +50,23 @@
 ; See http://hixie.ch/advocacy/xhtml
 ;ENABLE_XHTML_XML = true
 
-; Store DB query results in memory to avoid duplicate queries.
-; Disable only for old php's with low memory or memory_limit=8MB.
-; Default: true
-;USECACHE = false
-
 ; Needs babycart installed. See http://phpwiki.org/SpamAssassinIntegration
 ; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart
 ;ENABLE_SPAMASSASSIN = true
 
+; Check for links to blocked external tld domains in new edits, against 
+; multi.surbl.org and bl.spamcop.net.
+;ENABLE_SPAMBLOCKLIST = true
+
+; If more than this number of external links appear on non-authenticated 
+; edits it will be rejected as spam.
+;NUM_SPAM_LINKS = 20
+
 ; If GOOGLE_LINKS_NOFOLLOW is true, ref=nofollow is added to 
 ; all external links to discourage spam. You might want to turn it off,
 ; if you want to improve pageranks on external links.
 ; TODO: Add ref=nofollow only for external links added by anonymous users.
+; All internal action links do contain ref=nofollow
 ;GOOGLE_LINKS_NOFOLLOW = false
 
 ; LiveSearch enables immediate title search results via XMLHttpRequest.
@@ -97,19 +84,26 @@
 ;ENABLE_ACDROPDOWN = true
 
 ; Experimental WikiPedia feature: Force Discussion/Article link at the topnavbar.
-; This does not work yet.
 ;ENABLE_DISCUSSION_LINK = true
 
 ; If set to true, add some anti-spam countermeasures based on captcha
 ; tests.  See http://www.captcha.net/ for more information on captcha.
 ;ENABLE_CAPTCHA = true 
 
+; If USE_CAPTCHA_RANDOM_WORD is set to true,
+; Captcha will use a random word, otherwise a dictionary word.
+;USE_CAPTCHA_RANDOM_WORD = false
+
 ; USE_SAFE_DBSESSION should be enabled, if you encounter session problems, with 
 ; duplicate INSERT sess_id warnings at the bottom of the page. Reason is a 
 ; unreliable affected_rows implementation() in the sql backend. 
 ; Default is Disabled, using the fastest DbSession UPDATE method.
 ;USE_SAFE_DBSESSION = false
 
+; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but 
+; Blog/day/time only. Convenience for a single-user blog theme.
+;BLOG_DEFAULT_EMPTY_PREFIX = true
+
 ;==========================================================================
 ; Part One: Authentication and security settings.
 ;
@@ -120,7 +114,7 @@
 ;
 ; This is used to generate a keywords meta tag in the HTML templates,
 ; in bookmark titles for any bookmarks made to pages in your wiki,
-; and during RSS generation for the <title> of the RSS channel.
+; and during RSS generation for the title of the RSS channel.
 ;
 ; To use your own logo and signature files, name them PhpWikiLogo.png
 ; and PhpWikiSignature.png and put them into themes/default/images
@@ -181,7 +175,6 @@
 ; JavaScript) can be very risky.  If you are in a controlled environment,
 ; or you are using the two options below, however, it could be of use. 
 ENABLE_RAW_HTML = false
-; Seriously? its "safe" if you have the two below on and one is experimental? nice...
 
 ; If this is set, only pages locked by the Administrator may contain the
 ; RawHtml plugin
@@ -365,7 +358,7 @@
 ;       dba:   use one of the standard UNIX dbm libraries. Use BerkeleyDB (db3,4) (fastest)
 ;       file:  use a flat file database. (easiest)
 ;       cvs:   use a CVS server to store everything. (experimental, not recommended)
-DATABASE_TYPE = SQL
+DATABASE_TYPE = SQL 
    
 ; Prefix for filenames or table names
 ;
@@ -431,11 +423,30 @@
 ; Specified in seconds.
 DATABASE_TIMEOUT = 5
 
-; If action=upgrade detects mysql problems, but has no ALTER permissions, 
+; How often to try and optimise the database. Specified in seconds. 
+; Set to 0 to disable optimisation completely. Default is 50 (seconds).
+;
+; This is a fairly crude way of doing things as it requires a page save
+; to occur during the right minute for the optimisation to be triggered. 
+;
+; With most modern databases (eg. Postgres) and distributions (eg. Debian)
+; the system maintenance scripts take care of this nightly, so you will want
+; to set this parameter to 0 (disabled).
+;DATABASE_OPTIMISE_FREQUENCY = 50
+
+; Optional: Administrative SQL DB access (for action=upgrade)
+; If action=upgrade detects (My)SQL problems, but has no ALTER permissions, 
 ; give here a database username which has the necessary ALTER or CREATE permissions.
 ; Of course you can fix your database manually. See lib/upgrade.php for known issues.
-; DBADMIN_USER = root
-; DBADMIN_PASSWD = secret
+;DBADMIN_USER = root
+
+; Optional: Administrative SQL DB access (for action=upgrade)
+;DBADMIN_PASSWD = secret
+
+; Store DB query results in memory to avoid duplicate queries.
+; Disable only for old php's with low memory or memory_limit=8MB.
+; Default: true
+;USECACHE = false
 
 ;========================================================================
 ; Section 3a: Page revisions
@@ -588,6 +599,19 @@
 ;                       methods and return true on the first success.
 USER_AUTH_POLICY = stacked
 
+; Enable the new extended method of handling WikiUsers to support external auth and PAGEPERM.
+; Servers with memory-limit problems might want to turn it off. It costs ~300KB
+; Default: true
+;ENABLE_USER_NEW = false
+
+; Use access control lists (as in Solaris and Windows NTFS) per page and group, 
+; not per user for the whole wiki.
+; 
+; We suspect ACL page permissions to degrade speed by 10%. 
+; GROUP_METHOD=WIKIPAGE is slowest.
+; Default: true
+;ENABLE_PAGEPERM = false
+
 ; LDAP authentication options:
 ;
 ; The LDAP server to connect to.  Can either be a hostname, or a complete
@@ -651,19 +675,20 @@
 ;
 ; File to read for authentication information.
 ; Popular choices are /etc/shadow and /etc/httpd/.htpasswd
-; AUTH_USER_FILE = /etc/shadow
+;AUTH_USER_FILE = /etc/shadow
 
 ; Defines whether the user is able to change their own password via PHPWiki.
 ; Note that this means that the webserver user must be able to write to the
 ; file specified in AUTH_USER_FILE.
-; AUTH_USER_FILE_STORABLE = false
+;AUTH_USER_FILE_STORABLE = false
 
 ; Session Auth:
 ; Name of the session variable which holds the already authenticated username.
 ; Sample: "userid", "user[username]", "user->username"
-; AUTH_SESS_USER = userid
+;AUTH_SESS_USER = userid
+
 ; Which level will the user be? 1 = Bogo or 2 = Pass
-; AUTH_SESS_LEVEL = 2
+;AUTH_SESS_LEVEL = 2
 
 ; Group membership.  PhpWiki supports defining permissions for a group as
 ; well as for individual users.  This defines how group membership information
@@ -683,7 +708,7 @@
 ; For GROUP_METHOD = FILE, the file given below is referenced to obtain
 ; group membership information.  It should be in the same format as the
 ; standard unix /etc/groups(5) file.
-; AUTH_GROUP_FILE = /etc/groups
+;AUTH_GROUP_FILE = /etc/groups
 
 ; External database authentication and authorization.
 ;
@@ -696,39 +721,42 @@
 ;
 ; A database DSN to connect to.  Defaults to the DSN specified for the Wiki
 ; as a whole.
-; DBAUTH_AUTH_DSN = "mysql://wikiuser:@localhost/phpwiki"
-;
+;DBAUTH_AUTH_DSN = "mysql://wikiuser:@localhost/phpwiki"
+
 ; USER/PASSWORD queries
 ;
 ; For USER_AUTH_POLICY=strict and the Db method this is required:
-; DBAUTH_AUTH_USER_EXISTS = "SELECT userid FROM user WHERE userid='$userid'"
-;
+;DBAUTH_AUTH_USER_EXISTS = "SELECT userid FROM pref WHERE userid='$userid'"
+
 ; Check to see if the supplied username/password pair is OK
 ;
-; plaintext passwords:
-; DBAUTH_AUTH_CHECK = "SELECT IF(passwd='$password',1,0) AS ok FROM user WHERE userid='$userid'"
+; Plaintext Passwords:
+; DBAUTH_AUTH_CHECK = "SELECT IF(passwd='$password',1,0) AS ok FROM pref WHERE userid='$userid'"
 ;
-; database-hashed passwords (more secure):
-; DBAUTH_AUTH_CHECK = "SELECT IF(passwd=PASSWORD('$password'),1,0) AS ok FROM user WHERE userid='$userid'"
+; Database-hashed passwords (more secure):
+;DBAUTH_AUTH_CHECK = "SELECT IF(passwd=PASSWORD('$password'),1,0) AS ok FROM pref WHERE userid='$userid'"
 DBAUTH_AUTH_CRYPT_METHOD = plain
 
 ; If you want to use Unix crypt()ed passwords, you can use DBAUTH_AUTH_CHECK
 ; to get the password out of the database with a simple SELECT query, and
 ; specify DBAUTH_AUTH_USER_EXISTS and DBAUTH_AUTH_CRYPT_METHOD:
-; DBAUTH_AUTH_CHECK = "SELECT passwd FROM user where userid='$userid'"
+;DBAUTH_AUTH_CHECK = "SELECT passwd FROM pref where userid='$userid'"
 ; DBAUTH_AUTH_CRYPT_METHOD = crypt
-;
+
 ; Update the user's authentication credential.  If this is not defined but
 ; DBAUTH_AUTH_CHECK is, then the user will be unable to update their
 ; password.
 ;
-; Plaintext passwords:
-; DBAUTH_AUTH_UPDATE = "UPDATE user SET passwd='$password' WHERE userid='$userid'"
 ; Database-hashed passwords:
-; DBAUTH_AUTH_UPDATE = "UPDATE user SET passwd=PASSWORD('$password') WHERE userid='$userid'"
-;
-; Allow the user to create their own account.
-; DBAUTH_AUTH_CREATE = "INSERT INTO user SET passwd=PASSWORD('$password'),userid='$userid'"
+; DBAUTH_AUTH_UPDATE = "UPDATE pref SET passwd=PASSWORD('$password') WHERE userid='$userid'"
+; Plaintext passwords:
+;DBAUTH_AUTH_UPDATE = "UPDATE pref SET passwd='$password' WHERE userid='$userid'"
+
+; Allow users to create their own account.
+; with CRYPT_METHOD=crypt e.g:
+; DBAUTH_AUTH_CREATE = "INSERT INTO pref (passwd,userid) VALUES ('$password','$userid')"
+; with CRYPT_METHOD=plain:
+;DBAUTH_AUTH_CREATE = "INSERT INTO pref (passwd,userid) VALUES (PASSWORD('$password'),'$userid')"
 
 ; USER/PREFERENCE queries
 ;
@@ -739,30 +767,25 @@
 ;
 ; The prefs field stores the serialized form of the user's preferences array,
 ; to ease the complication of storage.
-; DBAUTH_PREF_SELECT = "SELECT prefs FROM user WHERE userid='$userid'"
-; DBAUTH_PREF_SELECT = "SELECT prefs FROM pref WHERE userid='$userid'"
+;DBAUTH_PREF_SELECT = "SELECT prefs FROM pref WHERE userid='$userid'"
 
 ; Update the user's preferences
-; DBAUTH_PREF_UPDATE = "UPDATE user SET prefs='$pref_blob' WHERE userid='$userid'"
-; Note that REPLACE works only with mysql and destroy all other columns!
-; DBAUTH_PREF_UPDATE = "REPLACE INTO pref SET prefs='$pref_blob',userid='$userid'"
+;DBAUTH_PREF_UPDATE = "UPDATE pref SET prefs='$pref_blob' WHERE userid='$userid'"
+;DBAUTH_PREF_INSERT = "INSERT INTO pref (userid,prefs) VALUES ('$userid','$pref_blob')"
 
 ; USERS/GROUPS queries
 ;
 ; You can define 1:n or n:m user<=>group relations, as you wish.
 ;
 ; Sample configurations:
-;  only one group per user (1:n):
-;   DBAUTH_IS_MEMBER = "SELECT user FROM user WHERE user='$userid' AND group='$groupname'"
-;   DBAUTH_GROUP_MEMBERS = "SELECT user FROM user WHERE group='$groupname'"
-;   DBAUTH_USER_GROUPS = "SELECT group FROM user WHERE user='$userid'"
-;  multiple groups per user (n:m):
-;   DBAUTH_IS_MEMBER = "SELECT userid FROM member WHERE userid='$userid' AND groupname='$groupname'"
+;  Only one group per user - 1:n: (Default)
+;   DBAUTH_IS_MEMBER     = "SELECT userid FROM pref WHERE userid='$userid' AND groupname='$groupname'"
+;   DBAUTH_GROUP_MEMBERS = "SELECT userid FROM pref WHERE groupname='$groupname'"
+;   DBAUTH_USER_GROUPS   = "SELECT groupname FROM pref WHERE userid='$userid'"
+;  Multiple groups per user - n:m:
+;   DBAUTH_IS_MEMBER     = "SELECT userid FROM member WHERE userid='$userid' AND groupname='$groupname'"
 ;   DBAUTH_GROUP_MEMBERS = "SELECT DISTINCT userid FROM member WHERE groupname='$groupname'"
-;   DBAUTH_USER_GROUPS = "SELECT groupname FROM member WHERE userid='$userid'"
-
-; A interim page which gets displayed on every edit attempt, if it exists.
-;EDITING_POLICY = EditingPolicy
+;   DBAUTH_USER_GROUPS   = "SELECT groupname FROM member WHERE userid='$userid'"
 
 ;========================================================================
 ; Part Four: Page appearance and layout
@@ -856,6 +879,7 @@
 ; some English pages are inserted into the wiki as well.
 ; DEFAULT_WIKI_PGSRC defines where the English pages reside.
 ;DEFAULT_WIKI_PGSRC = pgsrc
+
 ; These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
 ;DEFAULT_WIKI_PAGES = "ReleaseNotes:SteveWainstead:TestPage"
 
@@ -875,7 +899,7 @@
 ; Note that you can now also allow class|svg|svgz|vrml|swf ...,
 ; which will create embedded <object> instead of <img>. 
 ; Typical CGI extensions as pl or cgi maybe allowed too, but those two will be enforced to <img>
-;INLINE_IMAGES = "png|jpg|gif"
+;INLINE_IMAGES = "png|jpg|jpeg|gif"
 
 ; Perl regexp for WikiNames ("bumpy words")
 ; (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
@@ -967,6 +991,7 @@
 ;/
 ;SERVER_NAME = some.host.com
 ;SERVER_PORT = 80
+;SERVER_PROTOCOL = http 
 
 ; Relative URL (from the server root) of the PhpWiki
 ; script.
@@ -1052,40 +1077,86 @@
 ; redirect the browser...)
 ;DISABLE_HTTP_REDIRECT = true
 
-; Enable random quotes from a fortune directory when adding a new page.
-; Usually at /usr/share/fortune or /usr/share/games/fortune
-; If empty no quotes are inserted.
-;FORTUNE_DIR = /usr/share/fortune
-
 ; If you get a crash at loading LinkIcons you might want to disable 
 ; the getimagesize() function, which crashes on certain php versions and 
 ; and some external images (png's, ..). 
+;
 ; getimagesize() is only needed for spam prevention.
+;
+; Per default too small ploaded or external images are not displayed, 
+; to prevent from external 1 pixel spam.
 ;DISABLE_GETIMAGESIZE = true
 
-; Experimental: For using the Google API
-;GOOGLE_LICENSE_KEY = "..."
-
-; Optional: administrative SQL DB access (for action=upgrade)
-;DBADMIN_USER = 
-;DBADMIN_PASSWD = 
-
-; Optional: external PDF executable, %s is the xhtml filename
-;USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
-
-; Optional: SPAMASSASSIN wrapper. Only used if ENABLE_SPAMASSASSIN = true
-BABYCART_PATH = /usr/local/bin/babycart
+; A interim page which gets displayed on every edit attempt, if it exists.
+;EDITING_POLICY = EditingPolicy
 
-; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but 
-; Blog/day/time only. Convenience for a single-user blog theme.
-;BLOG_DEFAULT_EMPTY_PREFIX = true
+; Enable random quotes from a fortune directory when adding a new page.
+; Usually at /usr/share/fortune or /usr/share/games/fortune
+; If empty no quotes are inserted.
+;FORTUNE_DIR = /usr/share/fortune
 
 ; Add additional EDIT_TOOLBAR buttons if defined:
+; They need some time and memory.
 ; Insert a pagelink from this list:
 ;TOOLBAR_PAGELINK_PULLDOWN = *
 ; Insert a template from this list:
 ;TOOLBAR_TEMPLATE_PULLDOWN = Template*
 
+; Overide the default localized stoplist.
+;FULLTEXTSEARCH_STOPLIST = (A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)
+
+;===========================================================================
+; Optional Plugin Settings and external executables
+;===========================================================================
+
+; GoogleMaps and GooglePlugin
+; For using the Google API and GoogleMaps
+; http://www.google.com/apis/maps/signup.html
+;GOOGLE_LICENSE_KEY = "..."
+
+; On action=pdf: If enabled don't use the internal fpdf library.
+; External PDF executable, %s is the xhtml filename
+; 
+;USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
+
+; Optional: SPAMASSASSIN wrapper. Only used if ENABLE_SPAMASSASSIN = true
+; http://www.cynistar.net/~apthorpe/code/babycart/babycart.html
+BABYCART_PATH = /usr/local/bin/babycart
+
+; wikilens RateIt widget
+; style of the stars: empty = yellow, red or red
+; RATEIT_IMGPREFIX = 
+; RATEIT_IMGPREFIX = Star
+;RATEIT_IMGPREFIX = BStar
+
+; GraphViz plugin:
+; http://www.graphviz.org/
+;GRAPHVIZ_EXE = /usr/local/bin/dot
+
+; VisualWiki Plugin needs graphviz
+;VISUALWIKIFONT = Arial
+
+; disable user options
+;VISUALWIKI_ALLOWOPTIONS = false
+
+; PloticusPlugin:
+; http://ploticus.sourceforge.net/doc/welcome.html
+;PLOTICUS_EXE = /usr/local/bin/pl
+;PLOTICUS_PREFABS = /usr/share/ploticus
+
+; JabberPresence
+; http://edgar.netflint.net/howto.php
+;MY_JABBER_ID = 
+
+; PhpWeather needs this external php project
+; http://sourceforge.net/projects/phpweather/
+;PHPWEATHER_BASE_DIR = 
+
+; SyntaxHighlight plugin
+; http://www.andre-simon.de/doku/highlight/highlight.html
+;HIGHLIGHT_EXE = /usr/local/bin/highlight
+;HIGHLIGHT_DATA_DIR = /usr/share/highlight
+
 ;===========================================================================
 ; Part Eight: PLUGINCACHED Pear/Cache Settings
 ;===========================================================================
diff -ruN 11p1/config/two-level-tlds 12p3/config/two-level-tlds
--- 11p1/config/two-level-tlds	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/config/two-level-tlds	2006-06-18 06:19:16.000000000 -0500
@@ -0,0 +1,1966 @@
+com.ac
+edu.ac
+gov.ac
+net.ac
+mil.ac
+org.ac
+com.ae
+net.ae
+org.ae
+gov.ae
+ac.ae
+co.ae
+sch.ae
+pro.ae
+com.ai
+org.ai
+edu.ai
+gov.ai
+com.ar
+net.ar
+org.ar
+gov.ar
+mil.ar
+edu.ar
+int.ar
+co.at
+ac.at
+or.at
+gv.at
+priv.at
+com.au
+gov.au
+org.au
+edu.au
+id.au
+oz.au
+info.au
+net.au
+asn.au
+csiro.au
+telememo.au
+conf.au
+otc.au
+com.az
+net.az
+org.az
+com.bb
+net.bb
+org.bb
+ac.be
+belgie.be
+dns.be
+fgov.be
+com.bh
+gov.bh
+net.bh
+edu.bh
+org.bh
+com.bm
+edu.bm
+gov.bm
+org.bm
+net.bm
+adm.br
+adv.br
+agr.br
+am.br
+arq.br
+art.br
+ato.br
+bio.br
+bmd.br
+cim.br
+cng.br
+cnt.br
+com.br
+coop.br
+ecn.br
+edu.br
+eng.br
+esp.br
+etc.br
+eti.br
+far.br
+fm.br
+fnd.br
+fot.br
+fst.br
+g12.br
+ggf.br
+gov.br
+imb.br
+ind.br
+inf.br
+jor.br
+lel.br
+mat.br
+med.br
+mil.br
+mus.br
+net.br
+nom.br
+not.br
+ntr.br
+odo.br
+org.br
+ppg.br
+pro.br
+psc.br
+psi.br
+qsl.br
+rec.br
+slg.br
+srv.br
+tmp.br
+trd.br
+tur.br
+tv.br
+vet.br
+zlg.br
+com.bs
+net.bs
+org.bs
+ab.ca
+bc.ca
+mb.ca
+nb.ca
+nf.ca
+nl.ca
+ns.ca
+nt.ca
+nu.ca
+on.ca
+pe.ca
+qc.ca
+sk.ca
+yk.ca
+gc.ca
+co.ck
+net.ck
+org.ck
+edu.ck
+gov.ck
+com.cn
+edu.cn
+gov.cn
+net.cn
+org.cn
+ac.cn
+ah.cn
+bj.cn
+cq.cn
+gd.cn
+gs.cn
+gx.cn
+gz.cn
+hb.cn
+he.cn
+hi.cn
+hk.cn
+hl.cn
+hn.cn
+jl.cn
+js.cn
+ln.cn
+mo.cn
+nm.cn
+nx.cn
+qh.cn
+sc.cn
+sn.cn
+sh.cn
+sx.cn
+tj.cn
+tw.cn
+xj.cn
+xz.cn
+yn.cn
+zj.cn
+arts.co
+com.co
+edu.co
+firm.co
+gov.co
+info.co
+int.co
+nom.co
+mil.co
+org.co
+rec.co
+store.co
+web.co
+ac.cr
+co.cr
+ed.cr
+fi.cr
+go.cr
+or.cr
+sa.cr
+com.cu
+net.cu
+org.cu
+ac.cy
+com.cy
+gov.cy
+net.cy
+org.cy
+co.dk
+art.do
+com.do
+edu.do
+gov.do
+gob.do
+org.do
+mil.do
+net.do
+sld.do
+web.do
+com.dz
+org.dz
+net.dz
+gov.dz
+edu.dz
+ass.dz
+pol.dz
+art.dz
+com.ec
+k12.ec
+edu.ec
+fin.ec
+med.ec
+gov.ec
+mil.ec
+org.ec
+net.ec
+com.ee
+pri.ee
+fie.ee
+org.ee
+med.ee
+com.eg
+edu.eg
+eun.eg
+gov.eg
+net.eg
+org.eg
+sci.eg
+com.er
+net.er
+org.er
+edu.er
+mil.er
+gov.er
+ind.er
+com.es
+org.es
+gob.es
+edu.es 
+nom.es
+com.et
+gov.et
+org.et
+edu.et
+net.et
+biz.et
+name.et
+info.et
+ac.fj
+com.fj
+gov.fj
+id.fj
+org.fj
+school.fj
+com.fk
+ac.fk
+gov.fk
+net.fk
+nom.fk
+org.fk
+asso.fr
+nom.fr
+barreau.fr
+com.fr
+prd.fr
+presse.fr
+tm.fr
+aeroport.fr
+assedic.fr
+avocat.fr
+avoues.fr
+cci.fr
+chambagri.fr
+chirurgiens-dentistes.fr
+experts-comptables.fr
+geometre-expert.fr
+gouv.fr
+greta.fr
+huissier-justice.fr
+medecin.fr
+notaires.fr
+pharmacien.fr
+port.fr
+veterinaire.fr
+com.ge
+edu.ge
+gov.ge
+mil.ge
+net.ge
+org.ge
+pvt.ge
+co.gg
+org.gg
+sch.gg
+ac.gg
+gov.gg
+ltd.gg
+ind.gg
+net.gg
+alderney.gg
+guernsey.gg
+sark.gg
+com.gt
+edu.gt
+net.gt
+gob.gt
+org.gt
+mil.gt
+ind.gt
+com.gu
+edu.gu
+net.gu
+org.gu
+gov.gu
+mil.gu
+com.hk
+net.hk
+org.hk
+idv.hk
+gov.hk
+edu.hk
+co.hu
+2000.hu
+erotika.hu
+jogasz.hu
+sex.hu
+video.hu
+info.hu
+agrar.hu
+film.hu
+konyvelo.hu
+shop.hu
+org.hu
+bolt.hu
+forum.hu
+lakas.hu
+suli.hu
+priv.hu
+casino.hu
+games.hu
+media.hu
+szex.hu
+sport.hu
+city.hu
+hotel.hu
+news.hu
+tozsde.hu
+tm.hu
+erotica.hu
+ingatlan.hu
+reklam.hu
+utazas.hu
+ac.id
+co.id
+go.id
+mil.id
+net.id
+or.id
+co.il
+net.il
+org.il
+ac.il
+gov.il
+k12.il
+muni.il
+idf.il
+co.im
+net.im
+org.im
+ac.im
+lkd.co.im
+gov.im
+nic.im
+plc.co.im
+co.in
+net.in
+ac.in
+ernet.in
+gov.in
+nic.in
+res.in
+gen.in
+firm.in
+mil.in
+org.in
+ind.in
+ac.je
+co.je
+net.je
+org.je
+gov.je
+ind.je
+jersey.je
+ltd.je
+sch.je
+com.jo
+org.jo
+net.jo
+gov.jo
+edu.jo
+mil.jo
+ad.jp
+ac.jp
+co.jp
+go.jp
+or.jp
+ne.jp
+gr.jp
+ed.jp
+lg.jp
+net.jp
+org.jp
+gov.jp
+hokkaido.jp
+aomori.jp
+iwate.jp
+miyagi.jp
+akita.jp
+yamagata.jp
+fukushima.jp
+ibaraki.jp
+tochigi.jp
+gunma.jp
+saitama.jp
+chiba.jp
+tokyo.jp
+kanagawa.jp
+niigata.jp
+toyama.jp
+ishikawa.jp
+fukui.jp
+yamanashi.jp
+nagano.jp
+gifu.jp
+shizuoka.jp
+aichi.jp
+mie.jp
+shiga.jp
+kyoto.jp
+osaka.jp
+hyogo.jp
+nara.jp
+wakayama.jp
+tottori.jp
+shimane.jp
+okayama.jp
+hiroshima.jp
+yamaguchi.jp
+tokushima.jp
+kagawa.jp
+ehime.jp
+kochi.jp
+fukuoka.jp
+saga.jp
+nagasaki.jp
+kumamoto.jp
+oita.jp
+miyazaki.jp
+kagoshima.jp
+okinawa.jp
+sapporo.jp
+sendai.jp
+yokohama.jp
+kawasaki.jp
+nagoya.jp
+kobe.jp
+kitakyushu.jp
+utsunomiya.jp
+kanazawa.jp
+takamatsu.jp
+matsuyama.jp
+com.kh
+net.kh
+org.kh
+per.kh
+edu.kh
+gov.kh
+mil.kh
+ac.kr
+co.kr
+go.kr
+ne.kr
+or.kr
+pe.kr
+re.kr
+seoul.kr
+kyonggi.kr
+com.kw
+net.kw
+org.kw
+edu.kw
+gov.kw
+com.la
+net.la
+org.la
+com.lb
+org.lb
+net.lb
+edu.lb
+gov.lb
+mil.lb
+com.lc
+edu.lc
+gov.lc
+net.lc
+org.lc
+com.lv
+net.lv
+org.lv
+edu.lv
+gov.lv
+mil.lv
+id.lv
+asn.lv
+conf.lv
+com.ly
+net.ly
+org.ly
+co.ma
+net.ma
+org.ma
+press.ma
+ac.ma
+com.mk
+com.mm
+net.mm
+org.mm
+edu.mm
+gov.mm
+com.mo
+net.mo
+org.mo
+edu.mo
+gov.mo
+com.mt
+net.mt
+org.mt
+edu.mt
+tm.mt
+uu.mt
+com.mx
+net.mx
+org.mx
+com.my
+org.my
+gov.my
+edu.my
+net.my
+com.na
+org.na
+net.na
+alt.na
+edu.na
+cul.na
+unam.na
+telecom.na
+com.nc
+net.nc
+org.nc
+ac.ng
+edu.ng
+sch.ng
+com.ng
+gov.ng
+org.ng
+net.ng
+gob.ni
+com.ni
+net.ni
+edu.ni
+nom.ni
+org.ni
+com.np
+net.np
+org.np
+gov.np
+edu.np
+ac.nz
+co.nz
+cri.nz
+gen.nz
+geek.nz
+govt.nz
+iwi.nz
+maori.nz
+mil.nz
+net.nz
+org.nz
+school.nz
+com.om
+co.om
+edu.om
+ac.om
+gov.om
+net.om
+org.om
+mod.om
+museum.om
+biz.om
+pro.om
+med.om
+com.pa
+net.pa
+org.pa
+edu.pa
+ac.pa
+gob.pa
+sld.pa
+edu.pe
+gob.pe
+nom.pe
+mil.pe
+org.pe
+com.pe
+net.pe
+com.pg
+net.pg
+ac.pg
+com.ph
+net.ph
+org.ph
+mil.ph
+ngo.ph
+aid.pl
+agro.pl
+atm.pl
+auto.pl
+biz.pl
+com.pl
+edu.pl
+gmina.pl
+gsm.pl
+info.pl
+mail.pl
+miasta.pl
+media.pl
+mil.pl
+net.pl
+nieruchomosci.pl
+nom.pl
+org.pl
+pc.pl
+powiat.pl
+priv.pl
+realestate.pl
+rel.pl
+sex.pl
+shop.pl
+sklep.pl
+sos.pl
+szkola.pl
+targi.pl
+tm.pl
+tourism.pl
+travel.pl
+turystyka.pl
+com.pk
+net.pk
+edu.pk
+org.pk
+fam.pk
+biz.pk
+web.pk
+gov.pk
+gob.pk
+gok.pk
+gon.pk
+gop.pk
+gos.pk
+edu.ps
+gov.ps
+plo.ps
+sec.ps
+com.py
+net.py
+org.py
+edu.py
+com.qa
+net.qa
+org.qa
+edu.qa
+gov.qa
+asso.re
+com.re
+nom.re
+com.ro
+org.ro
+tm.ro
+nt.ro
+nom.ro
+info.ro
+rec.ro
+arts.ro
+firm.ro
+store.ro
+www.ro
+com.ru
+net.ru
+org.ru
+gov.ru
+pp.ru
+com.sa
+edu.sa
+sch.sa
+med.sa
+gov.sa
+net.sa
+org.sa
+pub.sa
+com.sb
+net.sb
+org.sb
+edu.sb
+gov.sb
+com.sd
+net.sd
+org.sd
+edu.sd
+sch.sd
+med.sd
+gov.sd
+tm.se
+press.se
+parti.se
+brand.se
+fh.se
+fhsk.se
+fhv.se
+komforb.se
+kommunalforbund.se
+komvux.se
+lanarb.se
+lanbib.se
+naturbruksgymn.se
+sshn.se
+org.se
+pp.se
+com.sg
+net.sg
+org.sg
+edu.sg
+gov.sg
+per.sg
+com.sh
+net.sh
+org.sh
+edu.sh
+gov.sh
+mil.sh
+gov.st
+saotome.st
+principe.st
+consulado.st
+embaixada.st
+org.st
+edu.st
+net.st
+com.st
+store.st
+mil.st
+co.st
+com.sv
+org.sv
+edu.sv
+gob.sv
+red.sv
+com.sy
+net.sy
+org.sy
+gov.sy
+ac.th
+co.th
+go.th
+net.th
+or.th
+com.tn
+net.tn
+org.tn
+edunet.tn
+gov.tn
+ens.tn
+fin.tn
+nat.tn
+ind.tn
+info.tn
+intl.tn
+rnrt.tn
+rnu.tn
+rns.tn
+tourism.tn
+com.tr
+net.tr
+org.tr
+edu.tr
+gov.tr
+mil.tr
+bbs.tr
+k12.tr
+gen.tr
+co.tt
+com.tt
+org.tt
+net.tt
+biz.tt
+info.tt
+pro.tt
+name.tt
+gov.tt
+edu.tt
+nic.tt
+us.tt
+uk.tt
+ca.tt
+eu.tt
+es.tt
+fr.tt
+it.tt
+se.tt
+dk.tt
+be.tt
+de.tt
+at.tt
+au.tt
+co.tv
+com.tw
+net.tw
+org.tw
+edu.tw
+idv.tw
+gove.tw
+com.ua
+net.ua
+org.ua
+edu.ua
+gov.ua
+ac.ug
+co.ug
+or.ug
+go.ug
+co.uk
+me.uk
+org.uk
+edu.uk
+ltd.uk
+plc.uk
+net.uk
+sch.uk
+nic.uk
+ac.uk
+gov.uk
+nhs.uk
+police.uk
+mod.uk
+dni.us
+fed.us
+com.uy
+edu.uy
+net.uy
+org.uy
+gub.uy
+mil.uy
+com.ve
+net.ve
+org.ve
+co.ve
+edu.ve
+gov.ve
+mil.ve
+arts.ve
+bib.ve
+firm.ve
+info.ve
+int.ve
+nom.ve
+rec.ve
+store.ve
+tec.ve
+web.ve
+co.vi
+net.vi
+org.vi
+com.vn
+biz.vn
+edu.vn
+gov.vn
+net.vn
+org.vn
+int.vn
+ac.vn
+pro.vn
+info.vn
+health.vn
+name.vn
+com.vu
+edu.vu
+net.vu
+org.vu
+de.vu
+ch.vu
+fr.vu
+com.ws
+net.ws
+org.ws
+gov.ws
+edu.ws
+ac.yu
+co.yu
+edu.yu
+org.yu
+com.ye
+net.ye
+org.ye
+gov.ye
+edu.ye
+mil.ye
+ac.za
+alt.za
+bourse.za
+city.za
+co.za
+edu.za
+gov.za
+law.za
+mil.za
+net.za
+ngo.za
+nom.za
+org.za
+school.za
+tm.za
+web.za
+co.zw
+ac.zw
+org.zw
+gov.zw
+eu.org
+au.com
+br.com
+cn.com
+de.com
+de.net
+eu.com
+gb.com
+gb.net
+hu.com
+no.com
+qc.com
+ru.com
+sa.com
+se.com
+uk.com
+uk.net
+us.com
+uy.com
+za.com
+dk.org
+tel.no
+fax.nr
+mob.nr
+mobil.nr
+mobile.nr
+tel.nr
+tlf.nr
+e164.arpa
+com.ac
+edu.ac
+gov.ac
+net.ac
+mil.ac
+org.ac
+com.ae
+net.ae
+org.ae
+gov.ae
+ac.ae
+co.ae
+sch.ae
+pro.ae
+com.ai
+org.ai
+edu.ai
+gov.ai
+com.ar
+net.ar
+org.ar
+gov.ar
+mil.ar
+edu.ar
+int.ar
+co.at
+ac.at
+or.at
+gv.at
+priv.at
+com.au
+gov.au
+org.au
+edu.au
+id.au
+oz.au
+info.au
+net.au
+asn.au
+csiro.au
+telememo.au
+conf.au
+otc.au
+com.az
+net.az
+org.az
+com.bb
+net.bb
+org.bb
+ac.be
+belgie.be
+dns.be
+fgov.be
+com.bh
+gov.bh
+net.bh
+edu.bh
+org.bh
+com.bm
+edu.bm
+gov.bm
+org.bm
+net.bm
+adm.br
+adv.br
+agr.br
+am.br
+arq.br
+art.br
+ato.br
+bio.br
+bmd.br
+cim.br
+cng.br
+cnt.br
+com.br
+coop.br
+ecn.br
+edu.br
+eng.br
+esp.br
+etc.br
+eti.br
+far.br
+fm.br
+fnd.br
+fot.br
+fst.br
+g12.br
+ggf.br
+gov.br
+imb.br
+ind.br
+inf.br
+jor.br
+lel.br
+mat.br
+med.br
+mil.br
+mus.br
+net.br
+nom.br
+not.br
+ntr.br
+odo.br
+org.br
+ppg.br
+pro.br
+psc.br
+psi.br
+qsl.br
+rec.br
+slg.br
+srv.br
+tmp.br
+trd.br
+tur.br
+tv.br
+vet.br
+zlg.br
+com.bs
+net.bs
+org.bs
+ab.ca
+bc.ca
+mb.ca
+nb.ca
+nf.ca
+nl.ca
+ns.ca
+nt.ca
+nu.ca
+on.ca
+pe.ca
+qc.ca
+sk.ca
+yk.ca
+gc.ca
+co.ck
+net.ck
+org.ck
+edu.ck
+gov.ck
+com.cn
+edu.cn
+gov.cn
+net.cn
+org.cn
+ac.cn
+ah.cn
+bj.cn
+cq.cn
+gd.cn
+gs.cn
+gx.cn
+gz.cn
+hb.cn
+he.cn
+hi.cn
+hk.cn
+hl.cn
+hn.cn
+jl.cn
+js.cn
+ln.cn
+mo.cn
+nm.cn
+nx.cn
+qh.cn
+sc.cn
+sn.cn
+sh.cn
+sx.cn
+tj.cn
+tw.cn
+xj.cn
+xz.cn
+yn.cn
+zj.cn
+arts.co
+com.co
+edu.co
+firm.co
+gov.co
+info.co
+int.co
+nom.co
+mil.co
+org.co
+rec.co
+store.co
+web.co
+ac.cr
+co.cr
+ed.cr
+fi.cr
+go.cr
+or.cr
+sa.cr
+com.cu
+net.cu
+org.cu
+ac.cy
+com.cy
+gov.cy
+net.cy
+org.cy
+co.dk
+art.do
+com.do
+edu.do
+gov.do
+gob.do
+org.do
+mil.do
+net.do
+sld.do
+web.do
+com.dz
+org.dz
+net.dz
+gov.dz
+edu.dz
+ass.dz
+pol.dz
+art.dz
+com.ec
+k12.ec
+edu.ec
+fin.ec
+med.ec
+gov.ec
+mil.ec
+org.ec
+net.ec
+com.ee
+pri.ee
+fie.ee
+org.ee
+med.ee
+com.eg
+edu.eg
+eun.eg
+gov.eg
+net.eg
+org.eg
+sci.eg
+com.er
+net.er
+org.er
+edu.er
+mil.er
+gov.er
+ind.er
+com.es
+org.es
+gob.es
+edu.es 
+nom.es
+com.et
+gov.et
+org.et
+edu.et
+net.et
+biz.et
+name.et
+info.et
+ac.fj
+com.fj
+gov.fj
+id.fj
+org.fj
+school.fj
+com.fk
+ac.fk
+gov.fk
+net.fk
+nom.fk
+org.fk
+asso.fr
+nom.fr
+barreau.fr
+com.fr
+prd.fr
+presse.fr
+tm.fr
+aeroport.fr
+assedic.fr
+avocat.fr
+avoues.fr
+cci.fr
+chambagri.fr
+chirurgiens-dentistes.fr
+experts-comptables.fr
+geometre-expert.fr
+gouv.fr
+greta.fr
+huissier-justice.fr
+medecin.fr
+notaires.fr
+pharmacien.fr
+port.fr
+veterinaire.fr
+com.ge
+edu.ge
+gov.ge
+mil.ge
+net.ge
+org.ge
+pvt.ge
+co.gg
+org.gg
+sch.gg
+ac.gg
+gov.gg
+ltd.gg
+ind.gg
+net.gg
+alderney.gg
+guernsey.gg
+sark.gg
+com.gt
+edu.gt
+net.gt
+gob.gt
+org.gt
+mil.gt
+ind.gt
+com.gu
+edu.gu
+net.gu
+org.gu
+gov.gu
+mil.gu
+com.hk
+net.hk
+org.hk
+idv.hk
+gov.hk
+edu.hk
+co.hu
+2000.hu
+erotika.hu
+jogasz.hu
+sex.hu
+video.hu
+info.hu
+agrar.hu
+film.hu
+konyvelo.hu
+shop.hu
+org.hu
+bolt.hu
+forum.hu
+lakas.hu
+suli.hu
+priv.hu
+casino.hu
+games.hu
+media.hu
+szex.hu
+sport.hu
+city.hu
+hotel.hu
+news.hu
+tozsde.hu
+tm.hu
+erotica.hu
+ingatlan.hu
+reklam.hu
+utazas.hu
+ac.id
+co.id
+go.id
+mil.id
+net.id
+or.id
+co.il
+net.il
+org.il
+ac.il
+gov.il
+k12.il
+muni.il
+idf.il
+co.im
+net.im
+org.im
+ac.im
+lkd.co.im
+gov.im
+nic.im
+plc.co.im
+co.in
+net.in
+ac.in
+ernet.in
+gov.in
+nic.in
+res.in
+gen.in
+firm.in
+mil.in
+org.in
+ind.in
+ac.je
+co.je
+net.je
+org.je
+gov.je
+ind.je
+jersey.je
+ltd.je
+sch.je
+com.jo
+org.jo
+net.jo
+gov.jo
+edu.jo
+mil.jo
+ad.jp
+ac.jp
+co.jp
+go.jp
+or.jp
+ne.jp
+gr.jp
+ed.jp
+lg.jp
+net.jp
+org.jp
+gov.jp
+hokkaido.jp
+aomori.jp
+iwate.jp
+miyagi.jp
+akita.jp
+yamagata.jp
+fukushima.jp
+ibaraki.jp
+tochigi.jp
+gunma.jp
+saitama.jp
+chiba.jp
+tokyo.jp
+kanagawa.jp
+niigata.jp
+toyama.jp
+ishikawa.jp
+fukui.jp
+yamanashi.jp
+nagano.jp
+gifu.jp
+shizuoka.jp
+aichi.jp
+mie.jp
+shiga.jp
+kyoto.jp
+osaka.jp
+hyogo.jp
+nara.jp
+wakayama.jp
+tottori.jp
+shimane.jp
+okayama.jp
+hiroshima.jp
+yamaguchi.jp
+tokushima.jp
+kagawa.jp
+ehime.jp
+kochi.jp
+fukuoka.jp
+saga.jp
+nagasaki.jp
+kumamoto.jp
+oita.jp
+miyazaki.jp
+kagoshima.jp
+okinawa.jp
+sapporo.jp
+sendai.jp
+yokohama.jp
+kawasaki.jp
+nagoya.jp
+kobe.jp
+kitakyushu.jp
+utsunomiya.jp
+kanazawa.jp
+takamatsu.jp
+matsuyama.jp
+com.kh
+net.kh
+org.kh
+per.kh
+edu.kh
+gov.kh
+mil.kh
+ac.kr
+co.kr
+go.kr
+ne.kr
+or.kr
+pe.kr
+re.kr
+seoul.kr
+kyonggi.kr
+com.kw
+net.kw
+org.kw
+edu.kw
+gov.kw
+com.la
+net.la
+org.la
+com.lb
+org.lb
+net.lb
+edu.lb
+gov.lb
+mil.lb
+com.lc
+edu.lc
+gov.lc
+net.lc
+org.lc
+com.lv
+net.lv
+org.lv
+edu.lv
+gov.lv
+mil.lv
+id.lv
+asn.lv
+conf.lv
+com.ly
+net.ly
+org.ly
+co.ma
+net.ma
+org.ma
+press.ma
+ac.ma
+com.mk
+com.mm
+net.mm
+org.mm
+edu.mm
+gov.mm
+com.mo
+net.mo
+org.mo
+edu.mo
+gov.mo
+com.mt
+net.mt
+org.mt
+edu.mt
+tm.mt
+uu.mt
+com.mx
+net.mx
+org.mx
+com.my
+org.my
+gov.my
+edu.my
+net.my
+com.na
+org.na
+net.na
+alt.na
+edu.na
+cul.na
+unam.na
+telecom.na
+com.nc
+net.nc
+org.nc
+ac.ng
+edu.ng
+sch.ng
+com.ng
+gov.ng
+org.ng
+net.ng
+gob.ni
+com.ni
+net.ni
+edu.ni
+nom.ni
+org.ni
+com.np
+net.np
+org.np
+gov.np
+edu.np
+ac.nz
+co.nz
+cri.nz
+gen.nz
+geek.nz
+govt.nz
+iwi.nz
+maori.nz
+mil.nz
+net.nz
+org.nz
+school.nz
+com.om
+co.om
+edu.om
+ac.om
+gov.om
+net.om
+org.om
+mod.om
+museum.om
+biz.om
+pro.om
+med.om
+com.pa
+net.pa
+org.pa
+edu.pa
+ac.pa
+gob.pa
+sld.pa
+edu.pe
+gob.pe
+nom.pe
+mil.pe
+org.pe
+com.pe
+net.pe
+com.pg
+net.pg
+ac.pg
+com.ph
+net.ph
+org.ph
+mil.ph
+ngo.ph
+aid.pl
+agro.pl
+atm.pl
+auto.pl
+biz.pl
+com.pl
+edu.pl
+gmina.pl
+gsm.pl
+info.pl
+mail.pl
+miasta.pl
+media.pl
+mil.pl
+net.pl
+nieruchomosci.pl
+nom.pl
+org.pl
+pc.pl
+powiat.pl
+priv.pl
+realestate.pl
+rel.pl
+sex.pl
+shop.pl
+sklep.pl
+sos.pl
+szkola.pl
+targi.pl
+tm.pl
+tourism.pl
+travel.pl
+turystyka.pl
+com.pk
+net.pk
+edu.pk
+org.pk
+fam.pk
+biz.pk
+web.pk
+gov.pk
+gob.pk
+gok.pk
+gon.pk
+gop.pk
+gos.pk
+edu.ps
+gov.ps
+plo.ps
+sec.ps
+com.py
+net.py
+org.py
+edu.py
+com.qa
+net.qa
+org.qa
+edu.qa
+gov.qa
+asso.re
+com.re
+nom.re
+com.ro
+org.ro
+tm.ro
+nt.ro
+nom.ro
+info.ro
+rec.ro
+arts.ro
+firm.ro
+store.ro
+www.ro
+com.ru
+net.ru
+org.ru
+gov.ru
+pp.ru
+com.sa
+edu.sa
+sch.sa
+med.sa
+gov.sa
+net.sa
+org.sa
+pub.sa
+com.sb
+net.sb
+org.sb
+edu.sb
+gov.sb
+com.sd
+net.sd
+org.sd
+edu.sd
+sch.sd
+med.sd
+gov.sd
+tm.se
+press.se
+parti.se
+brand.se
+fh.se
+fhsk.se
+fhv.se
+komforb.se
+kommunalforbund.se
+komvux.se
+lanarb.se
+lanbib.se
+naturbruksgymn.se
+sshn.se
+org.se
+pp.se
+com.sg
+net.sg
+org.sg
+edu.sg
+gov.sg
+per.sg
+com.sh
+net.sh
+org.sh
+edu.sh
+gov.sh
+mil.sh
+gov.st
+saotome.st
+principe.st
+consulado.st
+embaixada.st
+org.st
+edu.st
+net.st
+com.st
+store.st
+mil.st
+co.st
+com.sv
+org.sv
+edu.sv
+gob.sv
+red.sv
+com.sy
+net.sy
+org.sy
+gov.sy
+ac.th
+co.th
+go.th
+net.th
+or.th
+com.tn
+net.tn
+org.tn
+edunet.tn
+gov.tn
+ens.tn
+fin.tn
+nat.tn
+ind.tn
+info.tn
+intl.tn
+rnrt.tn
+rnu.tn
+rns.tn
+tourism.tn
+com.tr
+net.tr
+org.tr
+edu.tr
+gov.tr
+mil.tr
+bbs.tr
+k12.tr
+gen.tr
+co.tt
+com.tt
+org.tt
+net.tt
+biz.tt
+info.tt
+pro.tt
+name.tt
+gov.tt
+edu.tt
+nic.tt
+us.tt
+uk.tt
+ca.tt
+eu.tt
+es.tt
+fr.tt
+it.tt
+se.tt
+dk.tt
+be.tt
+de.tt
+at.tt
+au.tt
+co.tv
+com.tw
+net.tw
+org.tw
+edu.tw
+idv.tw
+gove.tw
+com.ua
+net.ua
+org.ua
+edu.ua
+gov.ua
+ac.ug
+co.ug
+or.ug
+go.ug
+co.uk
+me.uk
+org.uk
+edu.uk
+ltd.uk
+plc.uk
+net.uk
+sch.uk
+nic.uk
+ac.uk
+gov.uk
+nhs.uk
+police.uk
+mod.uk
+dni.us
+fed.us
+com.uy
+edu.uy
+net.uy
+org.uy
+gub.uy
+mil.uy
+com.ve
+net.ve
+org.ve
+co.ve
+edu.ve
+gov.ve
+mil.ve
+arts.ve
+bib.ve
+firm.ve
+info.ve
+int.ve
+nom.ve
+rec.ve
+store.ve
+tec.ve
+web.ve
+co.vi
+net.vi
+org.vi
+com.vn
+biz.vn
+edu.vn
+gov.vn
+net.vn
+org.vn
+int.vn
+ac.vn
+pro.vn
+info.vn
+health.vn
+name.vn
+com.vu
+edu.vu
+net.vu
+org.vu
+de.vu
+ch.vu
+fr.vu
+com.ws
+net.ws
+org.ws
+gov.ws
+edu.ws
+ac.yu
+co.yu
+edu.yu
+org.yu
+com.ye
+net.ye
+org.ye
+gov.ye
+edu.ye
+mil.ye
+ac.za
+alt.za
+bourse.za
+city.za
+co.za
+edu.za
+gov.za
+law.za
+mil.za
+net.za
+ngo.za
+nom.za
+org.za
+school.za
+tm.za
+web.za
+co.zw
+ac.zw
+org.zw
+gov.zw
+eu.org
+au.com
+br.com
+cn.com
+de.com
+de.net
+eu.com
+gb.com
+gb.net
+hu.com
+no.com
+qc.com
+ru.com
+sa.com
+se.com
+uk.com
+uk.net
+us.com
+uy.com
+za.com
+dk.org
+tel.no
+fax.nr
+mob.nr
+mobil.nr
+mobile.nr
+tel.nr
+tlf.nr
+e164.arpa
diff -ruN 11p1/config/whitelist 12p3/config/whitelist
--- 11p1/config/whitelist	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/config/whitelist	2006-06-18 06:19:16.000000000 -0500
@@ -0,0 +1 @@
+mydomain.org
diff -ruN 11p1/configurator.php 12p3/configurator.php
--- 11p1/configurator.php	2005-09-18 07:06:41.000000000 -0500
+++ 12p3/configurator.php	2006-06-18 06:19:16.000000000 -0500
@@ -1,4 +1,4 @@
-<?php // $Id: configurator.php,v 1.40 2005/09/18 12:06:41 rurban Exp $
+<?php // $Id: configurator.php,v 1.43 2006/05/17 17:27:12 rurban Exp $
 /*
  * Copyright 2002,2003,2005 $ThePhpWikiProgrammingTeam
  * Copyright 2002 Martin Geisler <gimpster@gimpster.com> 
@@ -55,6 +55,7 @@
 global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth;
 if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
 if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
+if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS'];
 
 if (empty($configurator))
     $configurator = "configurator.php";
@@ -154,7 +155,7 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<!-- $Id: configurator.php,v 1.40 2005/09/18 12:06:41 rurban Exp $ -->
+<!-- $Id: configurator.php,v 1.43 2006/05/17 17:27:12 rurban Exp $ -->
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
 <style type="text/css" media="screen">
@@ -316,6 +317,10 @@
 ; Here undefined definitions get defined by config-default.ini settings.
 ";
 
+// Detect not here listed configs:
+// for x in `perl -ne 'print $1,"\n" if /^;(\w+) =/' config/config-dist.ini`; do \
+//   grep \'$x\' configurator.php >/dev/null || echo $x ; done
+
 $properties["Part Zero"] =
 new part('_part0', $SEPARATOR."\n", "
 Part Zero: (optional)
@@ -340,90 +345,57 @@
 $properties["DEBUG"] =
 new numeric_define_optional('DEBUG', DEBUG);
 
-// TODO: bring the default to the front
-$properties["ENABLE_USER_NEW"] =
-new boolean_define_commented_optional
-('ENABLE_USER_NEW', 
- array('true'  => "Enabled",
-       'false' => "Disabled."));
-
-$properties["ENABLE_PAGEPERM"] =
-new boolean_define_commented_optional
-('ENABLE_PAGEPERM', 
- array('true'  => "Enabled",
-       'false' => "Disabled."));
-
 $properties["ENABLE_EDIT_TOOLBAR"] =
-new boolean_define_commented_optional
-('ENABLE_EDIT_TOOLBAR', 
- array('true'  => "Enabled",
-       'false' => "Disabled."));
+new boolean_define_commented_optional('ENABLE_EDIT_TOOLBAR');
 
 $properties["JS_SEARCHREPLACE"] =
-new boolean_define_commented_optional
-('JS_SEARCHREPLACE', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('JS_SEARCHREPLACE');
 
+// TESTME: use config-default:  = false
 $properties["ENABLE_DOUBLECLICKEDIT"] =
-new boolean_define_commented_optional
-('ENABLE_DOUBLECLICKEDIT', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('ENABLE_DOUBLECLICKEDIT');
 
-$properties["ENABLE_XHTML_XML"] =
-new boolean_define_commented_optional
-('ENABLE_XHTML_XML', 
- array('false' => "Disabled",
-       'true'  => "Enabled"));
+$properties["ENABLE_WYSIWYG"] =
+new boolean_define_commented_optional('ENABLE_WYSIWYG');
 
-$properties["USECACHE"] =
-new boolean_define_commented_optional
-('USECACHE', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+$properties["ENABLE_XHTML_XML"] =
+new boolean_define_commented_optional('ENABLE_XHTML_XML');
 
 $properties["ENABLE_SPAMASSASSIN"] =
-new boolean_define_commented_optional
-('ENABLE_SPAMASSASSIN', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('ENABLE_SPAMASSASSIN');
+
+$properties["ENABLE_SPAMBLOCKLIST"] =
+new boolean_define_optional('ENABLE_SPAMBLOCKLIST');
+
+$properties["NUM_SPAM_LINKS"] =
+    new numeric_define_optional('NUM_SPAM_LINKS', "20", "
+If more than this number of external links appear on non-authenticated 
+edits it will be rejected as spam.");
 
 $properties["GOOGLE_LINKS_NOFOLLOW"] =
-new boolean_define_commented_optional
-('GOOGLE_LINKS_NOFOLLOW', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('GOOGLE_LINKS_NOFOLLOW');
 
 $properties["ENABLE_LIVESEARCH"] =
-new boolean_define_commented_optional
-('ENABLE_LIVESEARCH', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('ENABLE_LIVESEARCH');
 
 $properties["ENABLE_ACDROPDOWN"] =
-new boolean_define_commented_optional
-('ENABLE_ACDROPDOWN', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('ENABLE_ACDROPDOWN');
 
 $properties["ENABLE_DISCUSSION_LINK"] =
-new boolean_define_commented_optional
-('ENABLE_DISCUSSION_LINK', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('ENABLE_DISCUSSION_LINK');
 
 $properties["ENABLE_CAPTCHA"] =
-new boolean_define_commented_optional
-('ENABLE_CAPTCHA', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('ENABLE_CAPTCHA');
+
+$properties["USE_CAPTCHA_RANDOM_WORD"] =
+new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD');
 
 $properties["USE_SAFE_DBSESSION"] =
-new boolean_define_commented_optional
-('USE_SAFE_DBSESSION', 
- array('false' => "Disabled",
-       'true'  => "Enabled"));
+new boolean_define_commented_optional('USE_SAFE_DBSESSION');
+
+$properties["BLOG_DEFAULT_EMPTY_PREFIX"] =
+new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX');
+
 
 $properties["Part One"] =
 new part('_part1', $SEPARATOR."\n", "
@@ -467,22 +439,13 @@
                           'true'  => "true. Only admin may download zip dumps"));
 
 $properties["Enable RawHtml Plugin"] =
-new boolean_define_commented_optional
-('ENABLE_RAW_HTML', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('ENABLE_RAW_HTML');
 
 $properties["Allow RawHtml Plugin only on locked pages"] =
-new boolean_define_commented_optional
-('ENABLE_RAW_HTML_LOCKEDONLY', 
- array('true'  => "Enabled",
-       'false' => "Disabled"));
+new boolean_define_commented_optional('ENABLE_RAW_HTML_LOCKEDONLY');
 
 $properties["Allow RawHtml Plugin if safe HTML code"] =
-new boolean_define_commented_optional
-('ENABLE_RAW_HTML_SAFE', 
- array('true'  => "Enabled",
-       'false' => "Disabled"), "
+    new boolean_define_commented_optional('ENABLE_RAW_HTML_SAFE','', "
 If this is set, all unsafe html code is stripped automatically (experimental!)
 See <a href=\"http://chxo.com/scripts/safe_html-test.php\" target=\"_new\">chxo.com/scripts/safe_html-test.php</a>
 ");
@@ -497,10 +460,7 @@
 new array_define('DISABLED_ACTIONS', DISABLED_ACTIONS /*array()*/);
 
 $properties["Moderate all Pagechanges"] =
-new boolean_define_commented_optional
-('ENABLE_MODERATEDPAGE_ALL', 
- array('false' => "Disabled",
-       'true'  => "Enabled"));
+new boolean_define_commented_optional('ENABLE_MODERATEDPAGE_ALL');
 
 $properties["Access Log File"] =
 new _define_commented_optional('ACCESS_LOG', ACCESS_LOG);
@@ -694,14 +654,18 @@
 Calculated from the settings above:");
 
 $properties["Filename / Table name Prefix"] =
-new _define_commented("DATABASE_PREFIX", DATABASE_PREFIX, "
+new _define_commented('DATABASE_PREFIX', DATABASE_PREFIX, "
 Used by all DB types:
 
 Prefix for filenames or table names, e.g. \"phpwiki_\"
 
 Currently <b>you MUST EDIT THE SQL file too!</b> (in the schemas/
 directory because we aren't doing on the fly sql generation
-during the installation.");
+during the installation.
+
+Note: This prefix is NOT prepended to the default DBAUTH_
+      tables user, pref and member!
+");
 
 $properties["DATABASE_PERSISTENT"] =
 new boolean_define_commented_optional
@@ -737,15 +701,18 @@
 new numeric_define("DATABASE_TIMEOUT", DATABASE_TIMEOUT, "
 Recommended values are 10-20 seconds. The more load the server has, the higher the timeout.");
 
+$properties["DATABASE_OPTIMISE_FREQUENCY"] =
+new numeric_define_optional('DATABASE_OPTIMISE_FREQUENCY', DATABASE_OPTIMISE_FREQUENCY);
+
 $properties["DBADMIN_USER"] =
-new _define_optional('DBADMIN_USER', DBADMIN_USER. "
-If action=upgrade detects mysql problems, but has no ALTER permissions, 
-give here a database username which has the necessary ALTER or CREATE permissions.
-Of course you can fix your database manually. See lib/upgrade.php for known issues.");
+new _define_optional('DBADMIN_USER', DBADMIN_USER);
 
 $properties["DBADMIN_PASSWD"] =
 new _define_password_optional('DBADMIN_PASSWD', DBADMIN_PASSWD);
 
+$properties["USECACHE"] =
+new boolean_define_commented_optional('USECACHE');
+
 ///////////////////
 
 $properties["Page Revisions"] =
@@ -806,19 +773,19 @@
 // config file if you really want to change these from the default.
 
 $properties["Major Edits: keep minimum days"] =
-    new numeric_define("MAJOR_MIN_KEEP", MAJOR_MIN_KEEP, "
+    new numeric_define('MAJOR_MIN_KEEP', MAJOR_MIN_KEEP, "
 Default: Keep for unlimited time. 
 Set to 0 to enable archive cleanup");
 $properties["Minor Edits: keep minumum days"] =
-    new numeric_define("MINOR_MIN_KEEP", MINOR_MIN_KEEP, "
+    new numeric_define('MINOR_MIN_KEEP', MINOR_MIN_KEEP, "
 Default: Keep for unlimited time. 
 Set to 0 to enable archive cleanup");
 
 $properties["Major Edits: how many"] =
-    new numeric_define("MAJOR_KEEP", MAJOR_KEEP, "
+    new numeric_define('MAJOR_KEEP', MAJOR_KEEP, "
 Keep up to 8 major edits");
 $properties["Major Edits: how many days"] =
-    new numeric_define("MAJOR_MAX_AGE", MAJOR_MAX_AGE, "
+    new numeric_define('MAJOR_MAX_AGE', MAJOR_MAX_AGE, "
 keep them no longer than a month");
 
 $properties["Minor Edits: how many"] =
@@ -915,7 +882,7 @@
 </pre>");
 
 $properties["PASSWORD_LENGTH_MINIMUM"] =
-    new numeric_define("PASSWORD_LENGTH_MINIMUM", "6");
+new numeric_define('PASSWORD_LENGTH_MINIMUM', PASSWORD_LENGTH_MINIMUM);
 
 $properties["USER_AUTH_POLICY"] =
 new _define_selection('USER_AUTH_POLICY',
@@ -938,6 +905,12 @@
 	<dd>check the given user - password combination for all
         methods and return true on the first success.</dd></dl>");
 
+$properties["ENABLE_USER_NEW"] =
+new boolean_define_commented_optional('ENABLE_USER_NEW');
+
+$properties["ENABLE_PAGEPERM"] =
+new boolean_define_commented_optional('ENABLE_PAGEPERM');
+
 ///////////////////
 
 $properties["Part Three A"] =
@@ -1058,6 +1031,11 @@
 
 Mysql: DBAUTH_PREF_UPDATE = \"REPLACE INTO pref SET prefs='\$pref_blob',userid='\$userid'\"");
 
+$properties["Create new user's preferences"] =
+    new _define_optional('DBAUTH_PREF_INSERT', "INSERT INTO pref (userid,prefs) VALUES ('\$userid','\$pref_blob')", "
+Define this if new user can be create by themselves.
+");
+
 $properties["USERS/GROUPS queries"] =
     new _define_optional('DBAUTH_IS_MEMBER', "SELECT user FROM user WHERE user='\$userid' AND group='\$groupname'", "
 You can define 1:n or n:m user<=>group relations, as you wish.
@@ -1217,13 +1195,7 @@
 Popular choices are /etc/shadow and /etc/httpd/.htpasswd");
 
 $properties["File Storable?"] =
-new boolean_define_commented_optional
-('AUTH_USER_FILE_STORABLE',
- array('false'  => "Disabled",
-       'true'   => "Enabled"), "
-Defines whether the user is able to change their own password via PhpWiki.
-Note that this means that the webserver user must be able to write to the
-file specified in AUTH_USER_FILE.");
+new boolean_define_commented_optional('AUTH_USER_FILE_STORABLE');
 
 $properties["Session Auth USER"] =
   new _define_optional('AUTH_SESS_USER', 'userid', "
@@ -1348,25 +1320,18 @@
        '../Logs/Hamwiki/hamwiki-20010830.zip'); 
 </pre>");
 
-/*
 $properties["Default Wiki Page Source"] =
 new _define('DEFAULT_WIKI_PGSRC', 'pgsrc', "
 DEFAULT_WIKI_PGSRC is only used when the language is *not* the
 default (English) and when reading from a directory: in that case
 some English pages are inserted into the wiki as well.
 DEFAULT_WIKI_PGSRC defines where the English pages reside.
-
-FIXME: is this really needed?
 ");
 
 $properties["Generic Pages"] =
-new array_variable('GenericPages', array('ReleaseNotes', 'SteveWainstead', 'TestPage'), "
-These are the pages which will get loaded from DEFAULT_WIKI_PGSRC.	
-
-FIXME: is this really needed?  Cannot we just copy these pages into
-the localized pgsrc?
+new array_variable('DEFAULT_WIKI_PAGES', array('ReleaseNotes', 'SteveWainstead', 'TestPage'), "
+These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
 ");
-*/
 
 ///////////////////
 
@@ -1408,12 +1373,7 @@
 by INTERWIKI_MAP_FILE (if any) will be used.");
 
 $properties["WARN_NONPUBLIC_INTERWIKIMAP"] =
-new boolean_define('WARN_NONPUBLIC_INTERWIKIMAP',   
-	array('true'  => "true",
-              'false' => "false"), "
-Display a warning if the internal lib/interwiki.map is used, and 
-not the public InterWikiMap page. This map is not readable from outside.");
-
+new boolean_define('WARN_NONPUBLIC_INTERWIKIMAP');
 
 $properties["Keyword Link Regexp"] =
 new _define_optional('KEYWORDS', '\"Category* OR Topic*\"', "
@@ -1455,31 +1415,13 @@
 Default Author URL");
 
 $properties["TOC_FULL_SYNTAX"] =
-new boolean_define_optional
-('TOC_FULL_SYNTAX', 
- array('true'  => "Enabled",
-       'false' => "Disabled"), "
-Allow full markup in headers to be parsed by the CreateToc plugin.
-
-If false you may not use WikiWords or [] links or any other markup in 
-headers in pages with the CreateToc plugin. But if false the parsing is 
-faster and more stable.");
+new boolean_define_optional('TOC_FULL_SYNTAX');
 
 $properties["ENABLE_MARKUP_COLOR"] =
-new boolean_define_optional
-('ENABLE_MARKUP_COLOR', 
- array('true'  => "Enabled",
-       'false' => "Disabled"), "
-If disabled the %color=... %% syntax will be disabled. Since 1.3.11
-Default: true");
+new boolean_define_optional('ENABLE_MARKUP_COLOR');
 
 $properties["ENABLE_MARKUP_TEMPLATE"] =
-new boolean_define_optional
-('ENABLE_MARKUP_TEMPLATE', 
- array('true'  => "Enabled",
-       'false' => "Disabled"), "
-Enable mediawiki-style {{TemplatePage|vars=value|...}} syntax. Since 1.3.11
-Default: undefined. Enabled automatically on the MonoBook theme if undefined.");
+new boolean_define_optional('ENABLE_MARKUP_TEMPLATE');
 
 ///////////////////
 
@@ -1569,6 +1511,10 @@
 (VIRTUAL_PATH is only used if USE_PATH_INFO is true.)
 ");
 
+$temp = !empty($_ENV['TEMP']) ? $_ENV['TEMP'] : "/tmp";
+$properties["TEMP_DIR"] =
+new _define_optional('TEMP_DIR', $temp);
+
 ///////////////////
 
 $properties["Part Seven"] =
@@ -1616,65 +1562,64 @@
 Page name of RecentChanges page.  Used for RSS Auto-discovery.");
 
 $properties["Disable HTTP Redirects"] =
-new boolean_define_commented_optional
-('DISABLE_HTTP_REDIRECT',
- array('false' => 'Enable HTTP Redirects',
-       'true' => 'Disable HTTP Redirects'),
-"
-(You probably don't need to touch this.)
-
-PhpWiki uses HTTP redirects for some of it's functionality.
-(e.g. after saving changes, PhpWiki redirects your browser to
-view the page you just saved.)
-
-Some web service providers (notably free European Lycos) don't seem to
-allow these redirects.  (On Lycos the result in an \"Internal Server Error\"
-report.)  In that case you can set DISABLE_HTTP_REDIRECT to true.
-(In which case, PhpWiki will revert to sneakier tricks to try to
-redirect the browser...)");
+new boolean_define_commented_optional('DISABLE_HTTP_REDIRECT');
 
 $properties["Disable GETIMAGESIZE"] =
-new boolean_define_commented_optional
-('DISABLE_GETIMAGESIZE',
- array('false' => 'Enable',
-       'true'  => 'Disable'), "
-Set GETIMAGESIZE to disabled, if your php fails to calculate the size on 
-inlined images, or you don't want to disable too small images to be inlined.
-
-Per default too small ploaded or external images are not displayed, 
-to prevent from external 1 pixel spam.");
+new boolean_define_commented_optional('DISABLE_GETIMAGESIZE');
 
 $properties["EDITING_POLICY"] =
   new _define_optional('EDITING_POLICY', "EditingPolicy", "
 An interim page which gets displayed on every edit attempt, if it exists.");
 
-$properties["ENABLE_MODERATEDPAGE_ALL"] =
-new boolean_define_commented_optional
-('ENABLE_MODERATEDPAGE_ALL',
- array('false' => 'Disable',
-       'true'  => 'Enable'), "
+$properties["TOOLBAR_PAGELINK_PULLDOWN"] =
+    new _define_commented_optional('TOOLBAR_PAGELINK_PULLDOWN');
+$properties["TOOLBAR_TEMPLATE_PULLDOWN"] =
+    new _define_commented_optional('TOOLBAR_TEMPLATE_PULLDOWN');
+$properties["FULLTEXTSEARCH_STOPLIST"] =
+    new _define_commented_optional('FULLTEXTSEARCH_STOPLIST');
+
+$properties["Part Seven A"] =
+new part('_part7a', $SEPARATOR."\n", "
+
+Part Seven A:
+
+Optional Plugin Settings and external executables
 ");
 
 $properties["FORTUNE_DIR"] =
-  new _define_commented_optional('FORTUNE_DIR', "/usr/share/fortune", "
-");
-$properties["DBADMIN_USER"] =
-  new _define_commented_optional('DBADMIN_USER', "", "
-");
-$properties["DBADMIN_PASSWD"] =
-  new _define_commented_optional('DBADMIN_PASSWD', "", "
-");
+  new _define_commented_optional('FORTUNE_DIR', "/usr/share/fortune");
 $properties["USE_EXTERNAL_HTML2PDF"] =
-  new _define_commented_optional('USE_EXTERNAL_HTML2PDF', "htmldoc --quiet --format pdf14 --no-toc --no-title %s", "
-");
+    new _define_commented_optional('USE_EXTERNAL_HTML2PDF', "htmldoc --quiet --format pdf14 --no-toc --no-title %s");
 $properties["BABYCART_PATH"] =
-  new _define_commented_optional('BABYCART_PATH', "/usr/local/bin/babycart", "
-");
+    new _define_commented_optional('BABYCART_PATH', "/usr/local/bin/babycart");
+$properties["GOOGLE_LICENSE_KEY"] =
+  new _define_commented_optional('GOOGLE_LICENSE_KEY');
+$properties["RATEIT_IMGPREFIX"] =
+    new _define_commented_optional('RATEIT_IMGPREFIX'); //BStar
+$properties["GRAPHVIZ_EXE"] =
+    new _define_commented_optional('GRAPHVIZ_EXE'); // /usr/local/bin/dot
+$properties["VISUALWIKIFONT"] =
+    new _define_commented_optional('VISUALWIKIFONT'); // Arial
+$properties["VISUALWIKI_ALLOWOPTIONS"] =
+    new boolean_define_commented_optional('VISUALWIKI_ALLOWOPTIONS'); // false
+$properties["PLOTICUS_EXE"] =
+    new _define_commented_optional('PLOTICUS_EXE'); // /usr/local/bin/pl
+$properties["PLOTICUS_PREFABS"] =
+    new _define_commented_optional('PLOTICUS_PREFABS'); // /usr/share/ploticus
+$properties["MY_JABBER_ID"] =
+    new _define_commented_optional('MY_JABBER_ID'); //
+$properties["PHPWEATHER_BASE_DIR"] =
+    new _define_commented_optional('PHPWEATHER_BASE_DIR'); //
+$properties["HIGHLIGHT_EXE"] =
+    new _define_commented_optional('HIGHLIGHT_EXE'); // /usr/local/bin/highlight
+$properties["HIGHLIGHT_DATA_DIR"] =
+    new _define_commented_optional('HIGHLIGHT_DATA_DIR'); // /usr/share/highlight
 
-$properties["Part Seven A"] =
-new part('_part7a', $SEPARATOR."\n", "
 
-Part Seven A:
+$properties["Part Eight"] =
+new part('_part8', $SEPARATOR."\n", "
+
+Part Eight:
 
 Cached Plugin Settings. (pear Cache)
 ");
@@ -1745,10 +1690,9 @@
 	if (!$description)
 	    $description = text_from_dist($config_item_name);
         $this->description = $description;
-	// TODO: get boolean default value from config-default.ini
 	if (defined($config_item_name) 
 	    and !preg_match("/(selection|boolean)/", get_class($this))
-	    and !preg_match("/(SCRIPT_NAME|VIRTUAL_PATH)/", $config_item_name))
+	    and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name))
 	    $this->default_value = constant($config_item_name); // ignore given default value
 	elseif ($config_item_name == $default_value)
 	    $this->default_value = '';
@@ -2103,6 +2047,7 @@
 
     function _define_password_optional($config_item_name, $default_value, $description = '', $jscheck = '') {
     	if ($config_item_name == $default_value) $default_value = '';
+        if (!$jscheck) $this->jscheck = " ";
         $this->_define($config_item_name, $default_value, $description, $jscheck);
     }
 
@@ -2115,7 +2060,18 @@
 	    return "${n}" . $this->_config_format($posted_value);
         }
     }
-
+    function get_html() {
+	$s = $this->get_config_item_header();
+	// dont re-encrypt already encrypted passwords
+	$value = $this->value();
+	$encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and 
+	             $GLOBALS['properties']["Encrypted Passwords"]->value();
+	if (empty($value))
+	    $encrypted = false;
+        $s .= "<input type=\"". ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
+           . "\" value=\"" . $value . "\" {$this->jscheck} />";
+	return $s;
+    }
 }
 
 class _define_password_commented_optional
@@ -2239,7 +2195,7 @@
         } else
             return "\n;" . $this->_config_format('');
     }
-    function get_html() {
+    function get_html () {
 	if (!$this->default_value)
 	    $this->default_value = array();
 	elseif (is_string($this->default_value))
@@ -2279,6 +2235,25 @@
 
 class boolean_define
 extends _define {
+
+    // adds ->values property, instead of ->default_value
+    function boolean_define($config_item_name, $values = false, $description = '', $jscheck = '') {
+        $this->config_item_name = $config_item_name;
+	if (!$description)
+	    $description = text_from_dist($config_item_name);
+        $this->description = $description;
+	// TESTME: get boolean default value from config-default.ini
+	if (defined($config_item_name))
+	    $this->default_value = constant($config_item_name); // ignore given default value
+        elseif (is_array($values))
+	    list($this->default_value,$dummy) = $values[0];
+        if (!$values) 
+            $values = array('false' => "Disabled",
+                            'true'  => "Enabled");
+	$this->values  = $values;
+	$this->jscheck = $jscheck;
+	$this->prefix = "";
+    }
     function _get_config_line($posted_value) {
         if ($this->description)
             $n = "\n";
@@ -2290,22 +2265,17 @@
         return sprintf("%s = %s", $this->get_config_item_name(),
                        (bool)$value ? 'true' : 'false');
     }
+    //TODO: radiobuttons, no list
     function get_html() {
         $output = $this->get_config_item_header();
 	$name = $this->get_config_item_name();
         $output .= '<select name="' . $name . "\" {$this->jscheck}>\n";
-	$values = $this->default_value;
-	if (defined($name))
-	    $this->default_value = constant($name);
-	else {
-	    $this->default_value = null;
-	    list($option, $label) = each($values);
-	    $output .= "  <option value=\"$option\" selected=\"selected\">$label</option>\n";
-	}
-        /* There can usually, only be two options, there can be
+	$values = $this->values;
+	$default_value = $this->default_value ? 'true' : 'false';
+        /* There can usually only be two options, there can be
          * three options in the case of a boolean_define_commented_optional */
         while (list($option, $label) = each($values)) {
-	    if (!is_null($this->default_value) and $this->default_value === $option)
+	    if (!is_null($this->default_value) and $option === $default_value)
 		$output .= "  <option value=\"$option\" selected=\"selected\">$label</option>\n";
 	    else
 		$output .= "  <option value=\"$option\">$label</option>\n";
@@ -2569,4 +2539,4 @@
 }
 ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff -ruN 11p1/.htaccess 12p3/.htaccess
--- 11p1/.htaccess	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/.htaccess	2006-06-18 06:19:16.000000000 -0500
@@ -0,0 +1,28 @@
+# $Id: .htaccess,v 1.8 2004/11/03 18:21:16 rurban Exp $
+
+<IfModule mod_php4.c>
+
+# For added security (and PhpWiki debugging purposes) you may want to 
+# uncomment the following lines.  (On the other hand, depending on
+# how your server and how it is configured, these lines might
+# cause "Internal Server Errors".)
+
+#  php_flag register_globals off
+#  php_flag track_vars on
+#  php_flag allow_url_fopen off
+
+</IfModule>
+
+<Files *.ini>
+   Order deny,allow
+   Deny from all
+</Files>
+
+# Try various wiki versions, like wiki, wikide, wikisidebar, ...
+# Requires certain AllowOverride permissions (which?)
+# <Files "wiki*">
+#   SetHandler application/x-httpd-php
+#   <IfDefine APACHE2>
+#    AcceptPathInfo on
+#   </IfDefine>
+# </Files>
diff -ruN 11p1/ImageTile.php 12p3/ImageTile.php
--- 11p1/ImageTile.php	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/ImageTile.php	2006-06-18 06:19:17.000000000 -0500
@@ -0,0 +1,149 @@
+<?php
+
+require_once('lib/stdlib.php');
+
+$remove = 0;
+if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) {
+    
+    $data_path = '';
+    list($usec, $sec) = explode(" ", microtime());
+    
+    $fp = fopen('config/config.ini','r');
+    while($config = fgetcsv($fp,1024,';')) {
+        if (preg_match('/DATA_PATH/',$config[0])) {
+            list($key,$value) = split('=',$config[0]);
+            $data_path = trim($value).'/';
+	}
+    }
+    fclose($fp);
+    @mkdir($data_path."uploads/thumbs");
+    $file = $data_path."uploads/thumbs/image_" . ((float)$usec + (float)$sec);
+    $source = url_get_contents($_REQUEST['url']);
+
+    @$fp = fopen($file,'w+');
+    if (!$fp) {
+        header ("Content-type: text/html");
+        echo "<html><head></head><body>ERROR : unable to open $file in write mode</body></html>";
+    }
+    fwrite($fp,$source);
+    $remove = 1;
+    
+} else {
+    @$fp = fopen($_REQUEST['url'],"r");
+    
+    if (!$fp) {
+    
+        header ("Content-type: text/html");
+        echo "<html><head></head><body>Not an image</body></html>";
+        exit();
+
+    } else {
+        $file = $_REQUEST['url'];
+        fclose($fp);
+    }
+}
+list ($a, $b, $type, $attr) = @getimagesize ($file);
+
+if (!$type) {
+    $type = basename ($_REQUEST['url']);
+    $type = preg_split ('/\./',$type);
+    $type = array_pop ($type);
+}
+
+switch ($type) {
+    case '2':
+        if (function_exists("imagecreatefromjpeg"))
+            $img = @imagecreatefromjpeg ($file);
+        else
+            show_plain ($file);
+        break;
+    case '3':
+        if (function_exists("imagecreatefrompng"))
+            $img = @imagecreatefrompng ($file);
+        else
+            show_plain ($file);
+        break;
+    case '1':
+        if (function_exists("imagecreatefromgif"))
+            $img = @imagecreatefromgif ($file);
+        else
+            show_plain ($file);
+        break;
+    case '15':
+        if (function_exists("imagecreatefromwbmp"))
+            $img = @imagecreatefromwbmp ($file);
+        else
+            show_plain ($file);
+        break;
+    case '16':
+        if (function_exists("imagecreatefromxbm"))
+            $img = @imagecreatefromxbm ($file);
+        else
+            show_plain ($file);
+        break;
+    case 'xpm':
+        if (function_exists("imagecreatefromxpm"))
+            $img = @imagecreatefromxpm ($file);
+        else
+            show_plain ($file);
+        break;
+    case 'gd':
+        if (function_exists("imagecreatefromgd"))
+            $img = @imagecreatefromgd ($file);
+        else
+            show_plain ($file);
+        break;
+    case 'gd2':
+        if (function_exists("imagecreatefromgd2"))
+            $img = @imagecreatefromgd2 ($file);
+        else
+            show_plain ($file);
+        break;
+    default:
+        //we are not stupid...
+        header ("Content-type: text/html");
+        echo "<html><head></head><body>Not an image</body></html>";
+        exit();
+        break;
+}    
+
+$width  = @imagesx($img);
+$height = @imagesy($img);
+
+$newwidth = $_REQUEST['width'];
+if (empty($newidth)) $newidth = 50;
+    
+$newheight = $_REQUEST['height'];
+if (empty($newheight)) $newheight = round($newwidth * ($height / $width)) ;
+
+$thumb = imagecreate($newwidth, $newheight);
+$img = imagecopyresampled($thumb, $img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
+
+if ($remove == 1) unlink ($file);
+
+header ("Content-type: image/png");
+imagepng($thumb);
+
+function show_plain () {
+    $mime = mime_content_type ($_REQUEST['url']);
+    header ("Content-type: $mime");
+    readfile($_REQUEST['url']);
+    exit();
+}
+
+
+/*
+ $Log: ImageTile.php,v $
+ Revision 1.4  2005/10/31 17:03:19  rurban
+ fix "r"
+
+*/
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
\ No newline at end of file
diff -ruN 11p1/lib/CachedMarkup.php 12p3/lib/CachedMarkup.php
--- 11p1/lib/CachedMarkup.php	2005-05-17 13:09:20.000000000 -0500
+++ 12p3/lib/CachedMarkup.php	2006-06-18 06:19:17.000000000 -0500
@@ -58,7 +58,7 @@
             } else {
                 // user our php lib. TESTME
                 include_once("ziplib.php");
-                $zip = ZipReader($packed);
+                $zip = new ZipReader($packed);
                 list(,$data,$attrib) = $zip->readFile();
                 return unserialize($data);
             }
@@ -301,6 +301,7 @@
             $this->_anchor = $anchor;
         if ($label and $label != $page)
             $this->_label = $label;
+        $this->_basepage = false;
     }
 
     function _getType() {
@@ -329,6 +330,7 @@
     }
 
     function expand($basepage, &$markup) {
+        $this->_basepage = $basepage;
 	$label = isset($this->_label) ? $this->_label : false;
 	$anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
         $page = new WikiPageName($this->_page, $basepage, $anchor);
@@ -336,12 +338,13 @@
 	else return HTML($label);
     }
 
-    function asXml() {
+    function asXML() {
 	$label = isset($this->_label) ? $this->_label : false;
 	$anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
-        $page = new WikiPageName($this->_page, false, $anchor);
+        // need basepage for subpages like /Remove (within CreateTOC)
+        $page = new WikiPageName($this->_page, $this->_basepage, $anchor);
 	$link = WikiLink($page, 'auto', $label);
-        return $link->asXml();
+        return $link->asXML();
     }
 
     function asString() {
@@ -379,10 +382,10 @@
         return LinkPhpwikiURL($this->_url, $label, $basepage);
     }
 
-    function asXml() {
+    function asXML() {
         $label = isset($this->_label) ? $this->_label : false;
         $link = LinkPhpwikiURL($this->_url, $label);
-        return $link->asXml();
+        return $link->asXML();
     }
 
     function asString() {
@@ -496,7 +499,7 @@
     }
 
     function expand($basepage, &$markup) {
-        $loader = &$this->_getLoader();
+        $loader = $this->_getLoader();
 
         $xml = $loader->expandPI($this->_pi, $GLOBALS['request'], $markup, $basepage);
         $div = HTML::div(array('class' => 'plugin'));
@@ -526,12 +529,12 @@
 
 
     function getWikiPageLinks($basepage) {
-        $loader = &$this->_getLoader();
+        $loader = $this->_getLoader();
 
         return $loader->getWikiPageLinks($this->_pi, $basepage);
     }
 
-    function _getLoader() {
+    function & _getLoader() {
         static $loader = false;
 
 	if (!$loader) {
diff -ruN 11p1/lib/Captcha.php 12p3/lib/Captcha.php
--- 11p1/lib/Captcha.php	2005-05-06 12:01:08.000000000 -0500
+++ 12p3/lib/Captcha.php	2006-06-18 06:19:17.000000000 -0500
@@ -1,8 +1,11 @@
 <?php
-/*
+rcs_id('$Id: Captcha.php,v 1.5 2005/10/31 16:44:13 rurban Exp $');
+/**
   Session Captcha v1.0
-  by Gavin M. Roy <gmr@bteg.net>
+    by Gavin M. Roy <gmr@bteg.net>
   Modified by Benjamin Drieu <bdrieu@april.org> - 2005 for PhpWiki
+  get_captcha_random_word() contributed by Dan Frankowski 2005 for PhpWiki
+  objectified and randomized 2005 by Reini Urban
 
   This File is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,78 +22,176 @@
   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
+class Captcha {
 
-function get_captcha_word () {
-    // Load In the Word List
-    $fp = fopen(FindFile("lib/captcha/dictionary"), "r");
-    while ( !feof($fp) )
-	$text[] = Trim(fgets($fp, 1024));
-    fclose($fp);
-
-    // Pick a Word
-    $word = "";
-    while ( strlen(Trim($word)) == 0 ) {
-	$x = rand(0, Count($text));
-	return $text[$x];
+    function Captcha($meta = array(), $width = 250, $height = 80) {
+        $this->meta   =& $meta;
+        $this->width  = $width;
+        $this->height = $height;
+        $this->length = 8;
+        $this->failed_msg = _("Typed in verification word mismatch ... are you a bot?");
+        $this->request =& $GLOBALS['request'];
     }
-}
 
-// Draw the Spiral
-function spiral( &$im, $origin_x = 100, $origin_y = 100, $r = 0, $g = 0, $b = 0 ) {
-    $theta = 1;
-    $thetac = 6;  
-    $radius = 15;  
-    $circles = 10;  
-    $points = 35;  
-    $lcolor = imagecolorallocate( $im, $r, $g, $b );
-    for( $i = 0; $i < ( $circles * $points ) - 1; $i++ ) {
-	$theta = $theta + $thetac;
-	$rad = $radius * ( $i / $points );
-	$x = ( $rad * cos( $theta ) ) + $origin_x;
-	$y = ( $rad * sin( $theta ) ) + $origin_y;
-	$theta = $theta + $thetac;
-	$rad1 = $radius * ( ( $i + 1 ) / $points );
-	$x1 = ( $rad1 * cos( $theta ) ) + $origin_x;
-	$y1 = ( $rad1 * sin( $theta ) ) + $origin_y;
-	imageline( $im, $x, $y, $x1, $y1, $lcolor );
-	$theta = $theta - $thetac;
+    function captchaword() {
+        if ( ! $this->request->getSessionVar('captchaword')) {
+	    $this->request->setSessionVar('captchaword', $this->get_word());
+	}
+        return $this->request->getSessionVar('captchaword');
+    }
+
+    function Failed () {
+        if ($this->request->getSessionVar('captcha_ok') == true)
+            return false;
+	
+        if ( ! array_key_exists ( 'captcha_input', $this->meta )
+             or ($this->request->getSessionVar('captchaword')
+                 and ($this->request->getSessionVar('captchaword') != $this->meta['captcha_input'])))
+            return true;
+	
+        $this->request->setSessionVar('captcha_ok', true);
+        return false;
+    }
+
+    function getFormElements() {
+        $el = array();
+        if (! $this->request->getSessionVar('captcha_ok')) {
+            $el['CAPTCHA_INPUT']
+                = HTML::input(array('type'  => 'text',
+                                    'class' => 'wikitext',
+                                    'id'    => 'edit:captcha_input',
+                                    'name'  => 'edit[captcha_input]',
+                                    'size'  => $this->length + 2,
+                                    'maxlength' => 256));
+            $url = WikiURL("", array("action"=>"captcha","id"=>time()), false);
+            $el['CAPTCHA_IMAGE'] = "<img src=\"$url\" alt=\"captcha\" />";
+            $el['CAPTCHA_LABEL'] = '<label for="edit:captcha_input">'._("Type word above:").' </label>';
+        }
+        return $el;
+    }
+
+    function get_word () { 
+        if (USE_CAPTCHA_RANDOM_WORD)
+            return get_dictionary_word(); 
+        else
+            return rand_ascii_readable($this->length); // lib/stdlib.php
+    }
+
+    function get_dictionary_word () {
+        // Load In the Word List
+        $fp = fopen(findfile("lib/captcha/dictionary"), "r");
+        while ( !feof($fp) )
+            $text[] = trim(fgets($fp, 1024));
+        fclose($fp);
+
+        // Pick a Word
+        $word = "";
+        better_srand();
+        while ( strlen(trim($word)) == 0 ) {
+            if (function_exists('mt_rand'))
+                $x = mt_rand(0, count($text));
+            else
+                $x = rand(0, count($text));
+            return $text[$x];
+        }
     }
-}
 
-function captcha_image ( $word ) {
-    $width = 250;
-    $height = 80;
+    // Draw the Spiral
+    function spiral( &$im, $origin_x = 100, $origin_y = 100, $r = 0, $g = 0, $b = 0 ) {
+        $theta = 1;
+        $thetac = 6;  
+        $radius = 15;  
+        $circles = 10;  
+        $points = 35;  
+        $lcolor = imagecolorallocate( $im, $r, $g, $b );
+        for( $i = 0; $i < ( $circles * $points ) - 1; $i++ ) {
+            $theta = $theta + $thetac;
+            $rad = $radius * ( $i / $points );
+            $x = ( $rad * cos( $theta ) ) + $origin_x;
+            $y = ( $rad * sin( $theta ) ) + $origin_y;
+            $theta = $theta + $thetac;
+            $rad1 = $radius * ( ( $i + 1 ) / $points );
+            $x1 = ( $rad1 * cos( $theta ) ) + $origin_x;
+            $y1 = ( $rad1 * sin( $theta ) ) + $origin_y;
+            imageline( $im, $x, $y, $x1, $y1, $lcolor );
+            $theta = $theta - $thetac;
+        }
+    }
+
+    function image ( $word ) {
+        $width  =& $this->width;
+        $height =& $this->height;
     
-    // Create the Image
-    $jpg = ImageCreate($width,$height);
-    $bg = ImageColorAllocate($jpg,255,255,255);
-    $tx = ImageColorAllocate($jpg,185,140,140);
-    ImageFilledRectangle($jpg,0,0,$width,$height,$bg);
-
-    $x = rand(0, $width);
-    $y = rand(0, $height);
-    spiral($jpg, $x, $y, 225, 190, 190);
-
-    $angle = rand(-25, 25);
-    $size = rand(14,20);
-    if ( $angle >= 0 )
-	$y = rand(50,$height-20);
-    else 
-	$y = rand(25, 50);
-    $x = rand(10, $width-100);
-
-    imagettftext($jpg, $size, $angle, $x, $y, $tx, realpath(FindFile("lib/captcha/Vera.ttf")), $word);
-
-    $x = rand(0, 280);
-    $y = rand(0, 115);
-    spiral($jpg, $x, $y, 255,190,190);
-
-    imageline($jpg, 0,0,$width-1,0,$tx);
-    imageline($jpg, 0,0,0,$height-1,$tx);
-    imageline($jpg, 0,$height-1,$width-1,$height-1,$tx);
-    imageline($jpg, $width-1,0,$width-1,$height-1,$tx);
+        // Create the Image
+        $jpg = ImageCreate($width,$height);
+        $bg  = ImageColorAllocate($jpg,255,255,255);
+        $tx  = ImageColorAllocate($jpg,185,140,140);
+        ImageFilledRectangle($jpg,0,0,$width,$height,$bg);
+
+        $x = rand(0, $width);
+        $y = rand(0, $height);
+        $this->spiral($jpg, $x, $y, $width-25, 190, 190);
+
+        $x = rand(10, 30);
+        $y = rand(50, $height-20); //50-60
+        
+        // randomize the chars
+        for ($i=0; $i < strlen($word); $i++) {
+            $angle += rand(-5, 5);
+            if ( $angle > 25 )  $angle = 15;
+            elseif ( $angle < -25 ) $angle = -15;
+            $size  = rand(14, 20);
+            $y += rand(-10, 10);
+            if ( $y < 10 )  $y = 11;
+            elseif ( $y > $height-10 ) $y = $height-11;
+            $x += rand($size, $size*2);
+            imagettftext($jpg, $size, $angle, $x, $y, $tx, 
+                         realpath(findfile("lib/captcha/Vera.ttf")), 
+                         $word[$i]);
+        }
+
+        $x = rand(0, $width+30);
+        $y = rand(0, $height+35); // 115
+        $this->spiral($jpg, $x, $y, 255,190,190);
+
+        imageline($jpg, 0,0,$width-1,0,$tx);
+        imageline($jpg, 0,0,0,$height-1,$tx);
+        imageline($jpg, 0,$height-1,$width-1,$height-1,$tx);
+        imageline($jpg, $width-1,0,$width-1,$height-1,$tx);
+
+	if (function_exists("ImageJpeg")) {
+	    header("Content-type: image/jpeg");
+	    ImageJpeg($jpg);
+	} elseif (function_exists("ImagePNG")) {
+	    header("Content-type: image/png");
+	    ImagePNG($jpg);
+	} elseif (function_exists("ImageGIF")) {
+	    header("Content-type: image/gif");
+	    ImageGIF($jpg);
+	} else {
+	    trigger_error("missing GD bitmap support", E_USER_WARNING);
+	}
+    }
 
-    header("Content-type: image/jpeg");
-    ImageJpeg($jpg);
 }
-?>
\ No newline at end of file
+
+// $Log: Captcha.php,v $
+// Revision 1.5  2005/10/31 16:44:13  rurban
+// fallback to PNG or GIF if JPEG support does not exist
+//
+// Revision 1.4  2005/10/30 14:20:42  rurban
+// move Captcha specific vars and methods into a Captcha object
+// randomize Captcha chars positions and angles (smoothly)
+//
+// Revision 1.3  2005/10/29 07:37:56  rurban
+// USE_CAPTCHA_RANDOM_WORD by Dan Frankowski
+//
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:   
+?>
diff -ruN 11p1/lib/config.php 12p3/lib/config.php
--- 11p1/lib/config.php	2005-05-17 13:05:27.000000000 -0500
+++ 12p3/lib/config.php	2006-06-18 06:19:17.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.136 2005/05/06 16:49:24 rurban Exp $');
+rcs_id('$Id: config.php,v 1.139 2006/03/19 14:50:42 rurban Exp $');
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
@@ -148,6 +148,7 @@
         */
     }
 
+    $accept = false; 
     if (isset($GLOBALS['request'])) // in fixup-dynamic-config there's no request yet
         $accept = $GLOBALS['request']->get('HTTP_ACCEPT_LANGUAGE');
     elseif (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']))
@@ -426,7 +427,7 @@
 }
 
 // => php-4.0.5
-if (!function_exists('is_scalar')) { // lib/stdlib.php:hash()
+if (!function_exists('is_scalar')) { // lib/stdlib.php:wikihash()
     function is_scalar($x) {
         return is_numeric($x) or is_string($x) or is_float($x) or is_bool($x); 
     }
@@ -551,13 +552,24 @@
 }
 
 function getUploadFilePath() {
-    return defined('PHPWIKI_DIR') ? PHPWIKI_DIR . "/uploads/" : "uploads/";
+    return defined('PHPWIKI_DIR') 
+        ? PHPWIKI_DIR . "/uploads/" 
+        : realpath(dirname(__FILE__) . "/../uploads/");
 }
 function getUploadDataPath() {
   return SERVER_URL . ((substr(DATA_PATH,0,1)=='/') ? '' : "/") . DATA_PATH . '/uploads/';
 }
 
 // $Log: config.php,v $
+// Revision 1.139  2006/03/19 14:50:42  rurban
+// sf.net patch #1438442 by Matt Brown: Unitialised variable reference in config.php
+//
+// Revision 1.138  2006/03/07 20:45:43  rurban
+// wikihash for php-5.1
+//
+// Revision 1.137  2005/08/06 14:31:10  rurban
+// ensure absolute uploads path
+//
 // Revision 1.136  2005/05/06 16:49:24  rurban
 // Safari comment
 //
diff -ruN 11p1/lib/DbaDatabase.php 12p3/lib/DbaDatabase.php
--- 11p1/lib/DbaDatabase.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/DbaDatabase.php	2006-06-18 06:19:17.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: DbaDatabase.php,v 1.16 2004/11/21 11:59:14 rurban Exp $');
+<?php rcs_id('$Id: DbaDatabase.php,v 1.18 2006/04/17 17:30:35 rurban Exp $');
 
 require_once('lib/ErrorManager.php');
 
@@ -150,16 +150,15 @@
             return $this->_error("sync()");
     }
 
-    function optimize() {
+    function optimize () {
         if (!dba_optimize($this->_dbh))
             return $this->_error("optimize()");
         return 1;
     }
     
     function _error($mes) {
-        trigger_error("DbaDatabase: $mes", E_USER_WARNING);
-        return false;
-        
+        //trigger_error("DbaDatabase: $mes", E_USER_WARNING);
+        //return false;
         trigger_error("$this->_file: dba error: $mes", E_USER_ERROR);
     }
 
diff -ruN 11p1/lib/DbSession/ADODB.php 12p3/lib/DbSession/ADODB.php
--- 11p1/lib/DbSession/ADODB.php	2005-02-11 08:41:40.000000000 -0600
+++ 12p3/lib/DbSession/ADODB.php	2006-06-18 06:19:17.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: ADODB.php,v 1.1 2005/02/11 14:41:40 rurban Exp $');
+<?php rcs_id('$Id: ADODB.php,v 1.2 2005/11/21 20:48:48 rurban Exp $');
 /*
  Copyright 2005 $ThePhpWikiProgrammingTeam
 
@@ -45,13 +45,13 @@
         return $this;
     }
 
-    function _connect() {
+    function & _connect() {
         global $request;
         static $parsed = false;
         $dbh = &$this->_dbh;
         if (!$dbh or !is_resource($dbh->_connectionID)) {
             if (!$parsed) $parsed = parseDSN($request->_dbi->getParam('dsn'));
-            $this->_dbh = &ADONewConnection($parsed['phptype']); // Probably only MySql works just now
+            $this->_dbh =& ADONewConnection($parsed['phptype']); // Probably only MySql works just now
             $this->_dbh->Connect($parsed['hostspec'],$parsed['username'], 
                                  $parsed['password'], $parsed['database']);
             $dbh = &$this->_dbh;                             
@@ -110,7 +110,7 @@
      */
     function read ($id) {
         //$this->log("_read($id)");
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $qid = $dbh->qstr($id);
         $res = '';
@@ -148,7 +148,7 @@
      */
     function write ($id, $sess_data) {
         
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $qid = $dbh->qstr($id);
         $qip = $dbh->qstr($GLOBALS['request']->get('REMOTE_ADDR'));
@@ -195,7 +195,7 @@
      * @access private
      */
     function destroy ($id) {
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $qid = $dbh->qstr($id);
 
@@ -213,7 +213,7 @@
      * @access private
      */
     function gc ($maxlifetime) {
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $threshold = time() - $maxlifetime;
 
@@ -227,7 +227,7 @@
     // TODO: ip-accesstime dynamic blocking API
     function currentSessions() {
         $sessions = array();
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $rs = $dbh->Execute("SELECT sess_data,sess_date,sess_ip FROM $table ORDER BY sess_date DESC");
         if ($rs->EOF) {
@@ -258,6 +258,9 @@
 }
 
 // $Log: ADODB.php,v $
+// Revision 1.2  2005/11/21 20:48:48  rurban
+// fix ref warnings reported by schorni
+//
 // Revision 1.1  2005/02/11 14:41:40  rurban
 // seperate DbSession classes: less memory, a bit slower
 //
diff -ruN 11p1/lib/DbSession/dba.php 12p3/lib/DbSession/dba.php
--- 11p1/lib/DbSession/dba.php	2005-08-07 05:49:57.000000000 -0500
+++ 12p3/lib/DbSession/dba.php	2006-06-18 06:19:17.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: dba.php,v 1.3 2005/08/07 10:49:57 rurban Exp $');
+<?php rcs_id('$Id: dba.php,v 1.4 2006/02/22 20:56:24 rurban Exp $');
 
 /** DBA Sessions
  *  session:
@@ -27,7 +27,7 @@
     function quote($str) { return $str; }
     function query($sql) { return false; }
 
-    function _connect() {
+    function & _connect() {
         global $DBParams;
         $dbh = &$this->_dbh;
         if (!$dbh) {
@@ -112,7 +112,7 @@
     // TODO: ip-accesstime dynamic blocking API
     function currentSessions() {
         $sessions = array();
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         for ($id = $dbh->firstkey(); $id !== false; $id = $dbh->nextkey()) {
             $result = $dbh->get($id);
             list($date,$ip,$packed) = explode(':', $result, 3);
@@ -132,6 +132,9 @@
 }
 
 // $Log: dba.php,v $
+// Revision 1.4  2006/02/22 20:56:24  rurban
+// fix more refs
+//
 // Revision 1.3  2005/08/07 10:49:57  rurban
 // do not connect/disconnect each time. fix refs
 //
diff -ruN 11p1/lib/DbSession/PDO.php 12p3/lib/DbSession/PDO.php
--- 11p1/lib/DbSession/PDO.php	2005-02-11 08:41:40.000000000 -0600
+++ 12p3/lib/DbSession/PDO.php	2006-06-18 06:19:17.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: PDO.php,v 1.1 2005/02/11 14:41:40 rurban Exp $');
+<?php rcs_id('$Id: PDO.php,v 1.2 2006/02/22 20:56:24 rurban Exp $');
 
 /** 
  * Db sessions for PDO, based on pear DB Sessions.
@@ -26,7 +26,7 @@
         return $this;
     }
 
-    function _connect() {
+    function & _connect() {
         $dbh =& $this->_dbh;
         if (!$dbh or !is_object($dbh)) {
             global $DBParams;
@@ -88,7 +88,7 @@
      */
     function read ($id) {
         //$this->log("_read($id)");
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $sth = $dbh->prepare("SELECT sess_data FROM $table WHERE sess_id=?");
         $sth->bindParam(1, $id, PDO_PARAM_STR, 32);
@@ -125,7 +125,7 @@
      */
     function write ($id, $sess_data) {
         
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $time = time();
 
@@ -244,6 +244,9 @@
 }
 
 // $Log: PDO.php,v $
+// Revision 1.2  2006/02/22 20:56:24  rurban
+// fix more refs
+//
 // Revision 1.1  2005/02/11 14:41:40  rurban
 // seperate DbSession classes: less memory, a bit slower
 //
diff -ruN 11p1/lib/DbSession/SQL.php 12p3/lib/DbSession/SQL.php
--- 11p1/lib/DbSession/SQL.php	2005-02-11 08:41:40.000000000 -0600
+++ 12p3/lib/DbSession/SQL.php	2006-06-18 06:19:17.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: SQL.php,v 1.1 2005/02/11 14:41:40 rurban Exp $');
+<?php rcs_id('$Id: SQL.php,v 1.2 2005/11/21 20:57:58 rurban Exp $');
 
 /**
  * DB sessions for pear DB
@@ -31,7 +31,7 @@
         return $this;
     }
 
-    function _connect() {
+    function & _connect() {
         $dbh = &$this->_dbh;
         $this->_connected = is_resource($dbh->connection);
         if (!$this->_connected) {
@@ -94,7 +94,7 @@
      */
     function read ($id) {
         //$this->log("_read($id)");
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $qid = $dbh->quote($id);
     
@@ -134,7 +134,7 @@
      */
     function write ($id, $sess_data) {
         
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         //$dbh->unlock(false,1);
         $table = $this->_table;
         $qid = $dbh->quote($id);
@@ -182,7 +182,7 @@
      * @access private
      */
     function destroy ($id) {
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $qid = $dbh->quote($id);
 
@@ -200,7 +200,7 @@
      * @access private
      */
     function gc ($maxlifetime) {
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $threshold = time() - $maxlifetime;
 
@@ -214,7 +214,7 @@
     // TODO: ip-accesstime dynamic blocking API
     function currentSessions() {
         $sessions = array();
-        $dbh = &$this->_connect();
+        $dbh = $this->_connect();
         $table = $this->_table;
         $res = $dbh->query("SELECT sess_data,sess_date,sess_ip FROM $table ORDER BY sess_date DESC");
         if (DB::isError($res) || empty($res))
@@ -241,6 +241,9 @@
 
 
 // $Log: SQL.php,v $
+// Revision 1.2  2005/11/21 20:57:58  rurban
+// fix ref warnings, analog to ADODB
+//
 // Revision 1.1  2005/02/11 14:41:40  rurban
 // seperate DbSession classes: less memory, a bit slower
 //
diff -ruN 11p1/lib/DbSession.php 12p3/lib/DbSession.php
--- 11p1/lib/DbSession.php	2005-02-27 13:40:36.000000000 -0600
+++ 12p3/lib/DbSession.php	2006-06-18 06:19:17.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: DbSession.php,v 1.33 2005/02/27 19:40:36 rurban Exp $');
+<?php rcs_id('$Id: DbSession.php,v 1.35 2005/08/07 10:51:11 rurban Exp $');
 
 /**
  * Store sessions data in Pear DB / ADODB / dba / PDO, ....
@@ -14,7 +14,6 @@
  */
 class DbSession
 {
-    var $_backend;
     /**
      * Constructor
      *
@@ -29,7 +28,8 @@
         // Check for existing DbSession handler
         $db_type = $dbh->getParam('dbtype');
         if (isa($dbh, 'WikiDB')) {
-            //$db_type = substr(get_class($dbh),7); // will fail with php4 and case-sensitive filesystem
+            // will fail with php4 and case-sensitive filesystem
+            //$db_type = substr(get_class($dbh),7); 
             
             // < 4.1.2 crash on dba sessions at session_write_close(). 
             // (Tested with 4.1.1 and 4.1.2)
@@ -41,9 +41,9 @@
             
             $class = "DbSession_".$db_type;
             if (class_exists($class)) {
-                $backend = &$dbh->_backend;
-                $this->_backend = new $class($backend->_dbh, $table);
-                return $this->_backend;
+                // dba has no ->_dbh, so this is used for the session link
+                $this->_backend = new $class($dbh->_backend->_dbh, $table);
+                return $this;
             }
         }
         //Fixme: E_USER_WARNING ignored!
@@ -63,6 +63,12 @@
 }
 
 // $Log: DbSession.php,v $
+// Revision 1.35  2005/08/07 10:51:11  rurban
+// reformatting
+//
+// Revision 1.34  2005/08/07 10:08:33  rurban
+// dba simplification: no _backend in the subclass
+//
 // Revision 1.33  2005/02/27 19:40:36  rurban
 // fix for php4 and case-sensitive filesystems
 //
diff -ruN 11p1/lib/display.php 12p3/lib/display.php
--- 11p1/lib/display.php	2005-05-05 03:54:40.000000000 -0500
+++ 12p3/lib/display.php	2006-06-18 06:19:18.000000000 -0500
@@ -1,6 +1,6 @@
 <?php
 // display.php: fetch page or get default content
-rcs_id('$Id: display.php,v 1.65 2005/05/05 08:54:40 rurban Exp $');
+rcs_id('$Id: display.php,v 1.66 2006/03/19 14:26:29 rurban Exp $');
 
 require_once('lib/Template.php');
 
@@ -76,7 +76,10 @@
             header("Content-Type: text/html; charset=" . $GLOBALS['charset']);
     }
 */    
-    GeneratePage($template, $pagetitle, $revision);
+    /* Tell google (and others) not to take notice of action pages */
+    if (GOOGLE_LINKS_NOFOLLOW)
+	$args = array('ROBOTS_META' => "noindex,nofollow");
+    GeneratePage($template, $pagetitle, $revision, $args);
     $request->checkValidators();
     flush();
 }
@@ -90,6 +93,8 @@
         $revision = $page->getRevision($version);
         if (!$revision)
             NoSuchRevision($request, $page, $version);
+        /* Tell Google (and others) to ignore old versions of pages */
+	$toks['ROBOTS_META'] = "noindex,nofollow";
     }
     else {
         $revision = $page->getCurrentRevision();
@@ -202,6 +207,20 @@
         }
     }
    
+    /* Check for special pagenames */
+    /*
+    if ( $pagename == _("RecentChanges") 
+         || $pagename == _("RecentEdits")
+         || $pagename == _("RecentVisitors")) {
+        $toks['ROBOTS_META']="noindex,follow";
+    } else
+    */
+    if ($pagename == _("SandBox")) {
+        $toks['ROBOTS_META']="noindex,nofollow";
+    } else if (!isset($toks['ROBOTS_META'])) {
+        $toks['ROBOTS_META'] = "index,follow";
+    }
+   
     $toks['CONTENT'] = new Template('browse', $request, $page_content);
     
     $toks['TITLE'] = $pagetitle;   // <title> tag
@@ -209,7 +228,6 @@
     $toks['revision'] = $revision;
     if (!empty($redirect_message))
         $toks['redirected'] = $redirect_message;
-    $toks['ROBOTS_META'] = 'index,follow';
     $toks['PAGE_DESCRIPTION'] = $page_content->getDescription();
     $toks['PAGE_KEYWORDS'] = GleanKeywords($page);
     if (!$template)
@@ -224,6 +242,9 @@
 }
 
 // $Log: display.php,v $
+// Revision 1.66  2006/03/19 14:26:29  rurban
+// sf.net patch by Matt Brown: Add rel=nofollow to more actions
+//
 // Revision 1.65  2005/05/05 08:54:40  rurban
 // fix pagename split for title and header
 //
diff -ruN 11p1/lib/editpage.php 12p3/lib/editpage.php
--- 11p1/lib/editpage.php	2005-05-06 12:54:22.000000000 -0500
+++ 12p3/lib/editpage.php	2006-06-18 06:19:18.000000000 -0500
@@ -29,12 +29,15 @@
                 $request->redirect(WikiURL($this->page->getName())); // noreturn
         }
         
-        
         $this->meta = array('author' => $this->user->getId(),
                             'author_id' => $this->user->getAuthenticatedId(),
                             'mtime' => time());
         
         $this->tokens = array();
+        if (ENABLE_CAPTCHA) {
+            require_once('lib/Captcha.php');
+            $this->Captcha = new Captcha($this->meta);
+        }
         
         $version = $request->getArg('version');
         if ($version !== false) {
@@ -55,7 +58,8 @@
 
             // The edit request has specified some initial content from a template 
             if (  ($template = $request->getArg('template'))
-                   and $request->_dbi->isWikiPage($template)) {
+                   and $request->_dbi->isWikiPage($template)) 
+            {
                 $page = $request->_dbi->getPage($template);
                 $current = $page->getCurrentRevision();
                 $this->_content = $current->getPackedContent();
@@ -74,14 +78,15 @@
         $tokens = &$this->tokens;
         $tokens['PAGE_LOCKED_MESSAGE'] = '';
         $tokens['CONCURRENT_UPDATE_MESSAGE'] = '';
+        $r =& $this->request;
 
-        if (isset($this->request->args['pref']['editWidth'])
-            and ($this->request->getPref('editWidth') != $this->request->args['pref']['editWidth'])) {
-            $this->request->_prefs->set('editWidth', $this->request->args['pref']['editWidth']);
-        }
-        if (isset($this->request->args['pref']['editHeight'])
-            and ($this->request->getPref('editHeight') != $this->request->args['pref']['editHeight'])) {
-            $this->request->_prefs->set('editHeight', $this->request->args['pref']['editHeight']);
+        if (isset($r->args['pref']['editWidth'])
+            and ($r->getPref('editWidth') != $r->args['pref']['editWidth'])) {
+            $r->_prefs->set('editWidth', $r->args['pref']['editWidth']);
+        }
+        if (isset($r->args['pref']['editHeight'])
+            and ($r->getPref('editHeight') != $r->args['pref']['editHeight'])) {
+            $r->_prefs->set('editHeight', $r->args['pref']['editHeight']);
         }
 
         if (! $this->canEdit()) {
@@ -89,28 +94,29 @@
                 return $this->viewSource();
             $tokens['PAGE_LOCKED_MESSAGE'] = $this->getLockedMessage();
         }
-        elseif ($this->request->getArg('save_and_redirect_to') != "") {
-            if (ENABLE_CAPTCHA && $this->captchaFailed()) {
+        elseif ($r->getArg('save_and_redirect_to') != "") {
+            if (ENABLE_CAPTCHA && $this->Captcha->Failed()) {
 		$this->tokens['PAGE_LOCKED_MESSAGE'] = 
-                    HTML::p(HTML::h1(_("Typed in verification word mismatch ... are you a bot?")));
+                    HTML::p(HTML::h1($this->Captcha->failed_msg));
 	    }
             elseif ( $this->savePage()) {
                 // noreturn
-                $this->request->redirect(WikiURL($this->request->getArg('save_and_redirect_to')));
+                $r->redirect(WikiURL($r->getArg('save_and_redirect_to')));
                 return true;    // Page saved.
             }
             $saveFailed = true;
         }
         elseif ($this->editaction == 'save') {
-            if (ENABLE_CAPTCHA && $this->captchaFailed()) {
+            if (ENABLE_CAPTCHA && $this->Captcha->Failed()) {
 		$this->tokens['PAGE_LOCKED_MESSAGE'] = 
-                    HTML::p(HTML::h1(_("Typed in verification word mismatch ... are you a bot?")));
+                    HTML::p(HTML::h1($this->Captcha->failed_msg));
 	    }
             elseif ($this->savePage()) {
                 return true;    // Page saved.
             }
-            else
+            else {
                 $saveFailed = true;
+            }
         }
 
         if ($saveFailed and $this->isConcurrentUpdate())
@@ -132,8 +138,9 @@
             $this->_currentVersion = $this->current->getVersion();
             $this->version = $this->_currentVersion;
             $unresolved = $diff->ConflictingBlocks;
-            $tokens['CONCURRENT_UPDATE_MESSAGE'] = $this->getConflictMessage($unresolved);
-        } elseif ($saveFailed) {
+            $tokens['CONCURRENT_UPDATE_MESSAGE'] 
+                = $this->getConflictMessage($unresolved);
+        } elseif ($saveFailed && !$this->_isSpam) {
             $tokens['CONCURRENT_UPDATE_MESSAGE'] = 
                 HTML(HTML::h2(_("Some internal editing error")),
             	     HTML::p(_("Your are probably trying to edit/create an invalid version of this page.")),
@@ -171,7 +178,6 @@
             $pagelink = WikiLink($this->page);
         }
 
-
         $title = new FormattedText ($title_fs, $pagelink);
         if (USE_HTMLAREA and $template == 'editpage') {
             $WikiTheme->addMoreHeaders(Edit_HtmlArea_Head());
@@ -188,6 +194,7 @@
         assert($this->selected);
 
         $this->tokens['PAGE_SOURCE'] = $this->_content;
+        $this->tokens['HIDDEN_INPUTS'] = HiddenInputs($this->request->getArgs());
         return $this->output('viewsource', _("View Source: %s"));
     }
 
@@ -227,7 +234,8 @@
             return true;
         }
 
-        if ($this->isSpam()) {
+        if (!$this->user->isAdmin() and $this->isSpam()) {
+            $this->_isSpam = true;
             return false;
             /*
             // Save failed. No changes made.
@@ -272,11 +280,11 @@
         $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
         $cleaner->cleanPageRevisions($page);
 
-        /* generate notification emails done in WikiDB::save to catch all direct calls 
-          (admin plugins) */
+        /* generate notification emails done in WikiDB::save to catch 
+         all direct calls (admin plugins) */
 
         // look at the errorstack
-        $errors = $GLOBALS['ErrorManager']->_postponed_errors;
+        $errors   = $GLOBALS['ErrorManager']->_postponed_errors;
         $warnings = $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML(); 
         $GLOBALS['ErrorManager']->_postponed_errors = $errors;
 
@@ -307,19 +315,6 @@
         return true;
     }
 
-    function captchaFailed () {
-	if ($this->request->getSessionVar('captcha_ok') == true)
-	    return false;
-	
-	if ( ! array_key_exists ( 'captcha_input', $this->meta )
-             or ($this->request->getSessionVar('captchaword')
-                 and ($this->request->getSessionVar('captchaword') != $this->meta['captcha_input'])))
-	    return true;
-	
-	$this->request->setSessionVar('captcha_ok', true);
-	return false;
-    }
-
     function isConcurrentUpdate () {
         assert($this->current->getVersion() >= $this->_currentVersion);
         return $this->current->getVersion() != $this->_currentVersion;
@@ -347,12 +342,9 @@
      * Need to check dynamically some blacklist wikipage settings 
      * (plugin WikiAccessRestrictions) and some static blacklist.
      * DONE: 
-     *   More then 20 new external links
-     *   content patterns by babycart (only php >= 4.3 for now)
-     * TODO:
-     *   IP blacklist 
-     *   domain blacklist
-     *   url patterns
+     *   Always: More then 20 new external links
+     *   ENABLE_SPAMASSASSIN:  content patterns by babycart (only php >= 4.3 for now)
+     *   ENABLE_SPAMBLOCKLIST: content domain blacklist
      */
     function isSpam () {
         $current = &$this->current;
@@ -360,37 +352,63 @@
 
         $oldtext = $current->getPackedContent();
         $newtext =& $this->_content;
+
+        // FIXME: in longer texts the NUM_SPAM_LINKS number should be increased.
+        //        better use a certain text : link ratio.
+
         // 1. Not more then 20 new external links
-        if ($this->numLinks($newtext) - $this->numLinks($oldtext) >= 20) {
-            // mail the admin?
+        if ($this->numLinks($newtext) - $this->numLinks($oldtext) >= NUM_SPAM_LINKS)
+        {
+            // Allow strictly authenticated users?
+            // TODO: mail the admin?
             $this->tokens['PAGE_LOCKED_MESSAGE'] = 
                 HTML($this->getSpamMessage(),
-                     HTML::p(HTML::em(_("Too many external links."))));
+                     HTML::p(HTML::strong(_("Too many external links."))));
             return true;
         }
         // 2. external babycart (SpamAssassin) check
         // This will probably prevent from discussing sex or viagra related topics. So beware.
         if (ENABLE_SPAMASSASSIN) {
-            $user = $request->getUser();
             include_once("lib/spam_babycart.php");
             if ($babycart = check_babycart($newtext, $request->get("REMOTE_ADDR"), 
-                                           $user->getId())) {
-                // mail the admin?
+                                           $this->user->getId())) {
+                // TODO: mail the admin
                 if (is_array($babycart))
                     $this->tokens['PAGE_LOCKED_MESSAGE'] = 
                         HTML($this->getSpamMessage(),
-                             HTML::p(HTML::em(_("SpamAssassin reports: ", 
-                                                join("\n", $babycart)))));
+                             HTML::p(HTML::em(_("SpamAssassin reports: "), 
+                                                join("\n", $babycart))));
                 return true;
             }
         }
+        // 3. extract (new) links and check surbl for blocked domains
+        if (ENABLE_SPAMBLOCKLIST and $this->numLinks($newtext)) {
+            include_once("lib/SpamBlocklist.php");
+            include_once("lib/InlineParser.php");
+            $parsed = TransformLinks($newtext);
+            foreach ($parsed->_content as $link) {
+            	if (isa($link, 'Cached_ExternalLink')) {
+                  $uri = $link->_getURL($this->page->getName());
+                  if ($res = IsBlackListed($uri)) {
+                    // TODO: mail the admin
+                    $this->tokens['PAGE_LOCKED_MESSAGE'] = 
+                        HTML($this->getSpamMessage(),
+                             HTML::p(HTML::strong(_("External links contain blocked domains:")),
+                             HTML::ul(HTML::li(sprintf(_("%s is listed at %s"), 
+                                                       $res[2], $res[0])))));
+                    return true;
+                  }
+            	}
+            }
+        }
+
         return false;
     }
 
     /** Number of external links in the wikitext
      */
     function numLinks(&$text) {
-        return substr_count($text, "http://");
+        return substr_count($text, "http://") + substr_count($text, "https://");
     }
 
     /** Header of the Anti Spam message 
@@ -472,8 +490,6 @@
     function getTextArea () {
         $request = &$this->request;
 
-        // wrap=virtual is not HTML4, but without it NS4 doesn't wrap
-        // long lines
         $readonly = ! $this->canEdit(); // || $this->isConcurrentUpdate();
         if (USE_HTMLAREA) {
             $html = $this->getPreview();
@@ -481,16 +497,16 @@
             $this->_content = $html->asXML();
         }
 
-        /** <textarea wrap="virtual"> is not valid xhtml but Netscape 4 requires it
-         * to wrap long lines.
-         */
-        $textarea = HTML::textarea(array('class' => 'wikiedit',
+        $textarea = HTML::textarea(array('class'=> 'wikiedit',
                                          'name' => 'edit[content]',
                                          'id'   => 'edit[content]',
                                          'rows' => $request->getPref('editHeight'),
                                          'cols' => $request->getPref('editWidth'),
                                          'readonly' => (bool) $readonly),
                                    $this->_content);
+        /** <textarea wrap="virtual"> is not valid XHTML but Netscape 4 requires it
+         * to wrap long lines.
+         */
         if (isBrowserNS4())
             $textarea->setAttr('wrap', 'virtual');
         if (USE_HTMLAREA)
@@ -512,20 +528,9 @@
 
         $el['HIDDEN_INPUTS'] = HiddenInputs($h);
         $el['EDIT_TEXTAREA'] = $this->getTextArea();
-        if ( ENABLE_CAPTCHA && ! $request->getSessionVar('captchaword')) {
-	    $request->setSessionVar('captchaword', get_captcha_word());
-	}
-	if ( ENABLE_CAPTCHA && ! $request->getSessionVar('captcha_ok')) {
-	    $el['CAPTCHA_INPUT']
-		= HTML::input(array('type'  => 'text',
-				    'class' => 'wikitext',
-				    'id'    => 'edit[captcha_input]',
-				    'name'  => 'edit[captcha_input]',
-				    'size'  => 20,
-				    'maxlength' => 256));
-	    $el['CAPTCHA_IMAGE'] = '<img src="?action=captcha" alt="captcha" />';
-	    $el['CAPTCHA_LABEL'] = '<label for="edit[captcha_input]">'._("Type word above:").' </label>';
-	}
+        if ( ENABLE_CAPTCHA ) {
+            $el = array_merge($el, $this->Captcha->getFormElements());
+        }
         $el['SUMMARY_INPUT']
             = HTML::input(array('type'  => 'text',
                                 'class' => 'wikitext',
@@ -740,13 +745,14 @@
             $pagelink = WikiLink($this->page);
         }
 
-        $title = new FormattedText ($title_fs, $pagelink);
+        //$title = new FormattedText ($title_fs, $pagelink);
         $template = Template($template, $this->tokens);
 
         //GeneratePage($template, $title, $rev);
         PrintXML($template);
         return true;
     }
+
     function getConflictMessage () {
         $message = HTML(HTML::p(fmt("Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save.",
                                     "<<<<<<<",
@@ -758,6 +764,24 @@
 
 /**
  $Log: editpage.php,v $
+ Revision 1.106  2005/11/21 22:03:08  rurban
+ fix syntax error inside ENABLE_SPAMBLOCKLIST
+
+ Revision 1.105  2005/11/21 20:53:59  rurban
+ beautify request pref lines, no antispam if admin (netznetz request), user is a member anyway
+
+ Revision 1.101  2005/10/30 16:12:28  rurban
+ simplify viewsource tokens
+
+ Revision 1.100  2005/10/30 14:20:42  rurban
+ move Captcha specific vars and methods into a Captcha object
+ randomize Captcha chars positions and angles (smoothly)
+
+ Revision 1.99  2005/10/29 08:21:58  rurban
+ ENABLE_SPAMBLOCKLIST:
+   Check for links to blocked external tld domains in new edits, against
+   multi.surbl.org and bl.spamcop.net.
+
  Revision 1.96  2005/05/06 17:54:22  rurban
  silence Preview warnings for PAGE_LOCKED_MESSAGE, CONCURRENT_UPDATE_MESSAGE (thanks to schorni)
 
diff -ruN 11p1/lib/EditToolbar.php 12p3/lib/EditToolbar.php
--- 11p1/lib/EditToolbar.php	2005-05-06 13:43:41.000000000 -0500
+++ 12p3/lib/EditToolbar.php	2006-06-18 06:19:18.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: EditToolbar.php,v 1.2 2005/05/06 18:43:41 rurban Exp $');
+rcs_id('$Id: EditToolbar.php,v 1.5 2005/10/29 14:16:17 rurban Exp $');
 
 /**
  * EDIT Toolbar Initialization.
@@ -77,7 +77,7 @@
    txt=txt.replace(ein,aus);
    ein=ein.toString().substring(1,ein.toString().length-2);
    result(z_repl, '"
-.sprintf(_("Substring \"%s\" found %s times. Replace with with \"%s\"?"), "'+ein+'", "'+z_repl+'", "'+aus+'")
+.sprintf(_("Substring \"%s\" found %s times. Replace with \"%s\"?"), "'+ein+'", "'+z_repl+'", "'+aus+'")
 ."', txt, '"
 .sprintf(_("String \"%s\" not found."), "'+ein+'")
 ."');
@@ -108,7 +108,7 @@
       }
    }
 }
-//save a snapshot in the undo buffer (unused)
+//save a snapshot in the undo buffer
 function undo_save() {
    undo_buffer[undo_buffer_index]=f.editarea.value;
    undo_buffer_index++;
@@ -123,7 +123,30 @@
         if (ENABLE_EDIT_TOOLBAR) {
             $WikiTheme->addMoreHeaders(JavaScript('',array('src' => $WikiTheme->_findData("toolbar.js"))));
         }
-        $this->tokens['EDIT_TOOLBAR'] = $this->_generate();
+
+        include_once("lib/WikiPluginCached.php");
+        $cache = WikiPluginCached::newCache();
+        $dbi = $GLOBALS['request']->getDbh();
+        // regenerate if number of pages changes (categories, pages, templates)
+        $key = $dbi->numPages();
+        $key .= '+categories+plugin';
+        if (TOOLBAR_PAGELINK_PULLDOWN) {
+            $key .= "+pages";
+        }
+        if (TOOLBAR_TEMPLATE_PULLDOWN) {
+            $key .= "+templates_" . $dbi->getTimestamp();
+        }
+        $id = $cache->generateId($key);
+        $content = $cache->get($id, 'toolbarcache');
+
+        if (!empty($content)) {
+            $this->tokens['EDIT_TOOLBAR'] =& $content;
+        } else {
+            $content = $this->_generate();
+            // regenerate buttons every 3600 seconds
+            $cache->save($id, $content, '+3600', 'toolbarcache'); 
+            $this->tokens['EDIT_TOOLBAR'] =& $content;
+        }
     }
 
     function getTokens () {
@@ -214,26 +237,29 @@
             $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png"); 
             //$redo_btn = $WikiTheme->getImageURL("ed_redo.png");
             $sr_btn   = $WikiTheme->getImageURL("ed_replace.png");
-            $sr_html = HTML(HTML::img(array('class'=>"toolbar",
-                                            'id'   =>"sr_undo",
-                                            'src'  =>$undo_d_btn,
-                                            'title'=>_("Undo Search & Replace"),
-                                            'alt'  =>_("Undo Search & Replace"),
-                                            'disabled'=>"disabled", 
-                                            'value'   =>"Undo",
-                                            'onfocus' =>"if(this.blur && undo_buffer_index==0) this.blur()",
-                                            'onclick' =>"do_undo()")),
-                            HTML::img(array('class'=>"toolbar",
-                                            'src'  => $sr_btn,
-                                            'alt'  =>_("Search & Replace"),
-                                            'title'=>_("Search & Replace"),
-                                            'onclick'=>"replace()")));
+            //TODO: generalize the UNDO button and fix it for Search & Replace
+            $sr_html = HTML(HTML::img
+                            (array('class'=>"toolbar",
+                                   'id'   =>"sr_undo",
+                                   'src'  =>$undo_d_btn,
+                                   'title'=>_("Undo Search & Replace"),
+                                   'alt'  =>_("Undo Search & Replace"),
+                                   //'disabled'=>"disabled",   //non-XHTML conform
+                                   //'onfocus' =>"if(this.blur && undo_buffer_index==0) this.blur()",
+                                   'onclick' =>"do_undo()")),
+                            HTML::img
+                            (array('class'=>"toolbar",
+                                   'src'  => $sr_btn,
+                                   'alt'  =>_("Search & Replace"),
+                                   'title'=>_("Search & Replace"),
+                                   'onclick'=>"replace()")));
         } else {
             $sr_html = '';
         }
 
-        //TODO: delegate these calculations to a seperate popup action request
-        //   action=pulldown or xmlrpc/soap (see google: WebServiceProxyFactory.createProxyAsync)
+        //TODO: delegate these calculations to a seperate popup/pulldown action request
+        // using moacdropdown and xmlrpc:titleSearch
+        // action=pulldown or xmlrpc/soap (see google: WebServiceProxyFactory.createProxyAsync)
 
         // Button to generate categories, display in extra window as popup and insert
         $sr_html = HTML($sr_html, $this->categoriesPulldown());
@@ -247,7 +273,6 @@
         if (TOOLBAR_TEMPLATE_PULLDOWN)
             $sr_html = HTML($sr_html, $this->templatePulldown(TOOLBAR_TEMPLATE_PULLDOWN));
 
-
         // don't use document.write for replace, otherwise self.opener is not defined.
         $toolbar_end = "document.writeln(\"</div>\");";
         if ($sr_html)
@@ -258,33 +283,35 @@
             return HTML(Javascript($toolbar . $toolbar_end));
     }
 
+    //TODO: make the result cached
     function categoriesPulldown() {
         global $WikiTheme;
 
         require_once('lib/TextSearchQuery.php');
         $dbi =& $GLOBALS['request']->_dbi;
-        $pages = $dbi->titleSearch(new TextSearchQuery(''.
-                                                       _("Category").' OR '.
-                                                       _("Topic").''));
-        if ($pages->count()) {
+        // KEYWORDS formerly known as $KeywordLinkRegexp
+        $pages = $dbi->titleSearch(new TextSearchQuery(KEYWORDS, true));
+        if ($pages) {
             $categories = array();
             while ($p = $pages->next()){
                 $categories[] = $p->getName();
             }
+            if (!$categories) return '';
             $more_buttons = HTML::img(array('class'=>"toolbar",
                                             'src'  => $WikiTheme->getImageURL("ed_category.png"),
                                             'title'=>_("AddCategory"),
+                                            'alt'=>_("AddCategory"),
                                             'onclick'=>"showPulldown('".
                                             _("Insert Categories (double-click)")
                                             ."',['".join("','",$categories)."'],'"
                                             ._("Insert")."','"
-                                            ._("Close")
-                                            ."')"));
+                                            ._("Close")."')"));
             return HTML("\n", $more_buttons);
         }
         return '';
     }
 
+    //TODO: Make the result cached. Esp. the args are expensive
     function pluginPulldown() {
         global $WikiTheme;
 
@@ -295,24 +322,36 @@
         $plugins = $pd->getFiles();
         unset($pd);
         sort($plugins);
-
         if (!empty($plugins)) {
             $plugin_js = '';
+            require_once("lib/WikiPlugin.php");
+            $w = new WikiPluginLoader;
             foreach ($plugins as $plugin) {
                 $pluginName = str_replace(".php", "", $plugin);
-                $toinsert = "<?plugin $pluginName ?>"; // args?
-                $plugin_js .= ",['$pluginName','$toinsert']";
+                $p = $w->getPlugin($pluginName, false); // second arg?
+                // trap php files which aren't WikiPlugin~s
+                if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
+                    $plugin_args = '';
+                    $desc = $p->getArgumentsDescription();
+                    $src = array("\n",'"',"'",'|','[',']','\\');
+                    $replace = array('%0A','%22','%27','%7C','%5B','%5D','%5C');
+                    $desc = str_replace("<br />",' ',$desc->asXML());
+                    if ($desc)
+                        $plugin_args = '\n'.str_replace($src, $replace, $desc);
+                    $toinsert = "%0A<?plugin ".$pluginName.$plugin_args."?>"; // args?
+                    $plugin_js .= ",['$pluginName','$toinsert']";
+                }
             }
             $plugin_js = substr($plugin_js, 1);
             $more_buttons = HTML::img(array('class'=>"toolbar",
                                             'src'  => $WikiTheme->getImageURL("ed_plugins.png"),
                                             'title'=>_("AddPlugin"),
+                                            'alt'=>_("AddPlugin"),
                                             'onclick'=>"showPulldown('".
                                             _("Insert Plugin (double-click)")
                                             ."',[".$plugin_js."],'"
                                             ._("Insert")."','"
-                                            ._("Close")
-                                            ."')"));
+                                            ._("Close")."')"));
             return HTML("\n", $more_buttons);
         }
         return '';
@@ -331,27 +370,32 @@
             return HTML("\n", HTML::img(array('class'=>"toolbar",
                                               'src'  => $WikiTheme->getImageURL("ed_pages.png"),
                                               'title'=>_("AddPageLink"),
+                                              'alt'=>_("AddPageLink"),
                                               'onclick'=>"showPulldown('".
                                               _("Insert PageLink (double-click)")
                                               ."',['".join("','",$pages)."'],'"
                                               ._("Insert")."','"
-                                              ._("Close")
-                                              ."')")));
+                                              ._("Close")."')")));
         }
         return '';
     }
 
+    //TODO: make the result cached
     function templatePulldown($query, $case_exact=false, $regex='auto') {
         require_once('lib/TextSearchQuery.php');
         $dbi =& $GLOBALS['request']->_dbi;
         $page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex));
+        $count = 0;
         if ($page_iter->count()) {
             global $WikiTheme;
             $pages_js = '';
             while ($p = $page_iter->next()) {
                 $rev = $p->getCurrentRevision();
-                $toinsert = str_replace("\n",'\n',addslashes($rev->_get_content()));
-                $pages_js .= ",['".$p->getName()."','$toinsert']";
+                $src = array("\n",'"');
+                $replace = array('_nl','_quot'); 
+                $toinsert = str_replace($src, $replace, $rev->_get_content());
+                //$toinsert = str_replace("\n",'\n',addslashes($rev->_get_content()));
+                $pages_js .= ",['".$p->getName()."','_nl$toinsert']";
             }
             $pages_js = substr($pages_js, 1);
             if (!empty($pages_js))
@@ -359,12 +403,12 @@
                             (array('class'=>"toolbar",
                                    'src'  => $WikiTheme->getImageURL("ed_template.png"),
                                    'title'=>_("AddTemplate"),
+                                   'alt'=>_("AddTemplate"),
                                    'onclick'=>"showPulldown('".
                                    _("Insert Template (double-click)")
                                    ."',[".$pages_js."],'"
                                    ._("Insert")."','"
-                                   ._("Close")
-                                   ."')")));
+                                   ._("Close")."')")));
         }
         return '';
     }
@@ -373,6 +417,18 @@
 
 /*
  $Log: EditToolbar.php,v $
+ Revision 1.5  2005/10/29 14:16:17  rurban
+ fix typo
+
+ Revision 1.4  2005/09/29 23:07:58  rurban
+ cache toolbar
+
+ Revision 1.3  2005/09/26 06:25:50  rurban
+ EditToolbar enhancements by Thomas Harding: add plugins args, properly quote control chars. added plugin method getArgumentsDescription to override the default description string
+
+ Revision 1.3  2005/09/22 13:40:00 tharding
+ add modules arguments
+ 
  Revision 1.2  2005/05/06 18:43:41  rurban
  add AddTemplate EditToolbar icon
 
@@ -389,4 +445,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/ErrorManager.php 12p3/lib/ErrorManager.php
--- 11p1/lib/ErrorManager.php	2005-04-11 14:41:23.000000000 -0500
+++ 12p3/lib/ErrorManager.php	2006-06-18 06:19:18.000000000 -0500
@@ -212,6 +212,13 @@
             $msg->printXML();
             return;
         }
+
+        // template which flushed the pending errors already handled,
+        // so display now all errors directly.
+        if (!empty($GLOBALS['request']->_finishing)) {
+            $this->_postpone_mask = 0;
+	}
+        
         $in_handler = true;
 
         foreach ($this->_handlers as $handler) {
@@ -239,11 +246,10 @@
             }
         }
 
-        $this->_noCacheHeaders();
-
         // Error was either fatal, or was not handled by a handler.
         // Handle it ourself.
         if ($error->isFatal()) {
+            $this->_noCacheHeaders();
             echo "<html><body><div style=\"font-weight:bold; color:red\">Fatal Error:</div>\n";
             if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
                 echo "error_reporting=",error_reporting(),"\n<br>";
@@ -254,8 +260,8 @@
         }
         else if (($error->errno & error_reporting()) != 0) {
             if  (($error->errno & $this->_postpone_mask) != 0) {
-                if ((function_exists('is_a') and is_a($error,'PhpErrorOnce'))
-                    or (!function_exists('is_a') and 
+                if ((function_exists('isa') and isa($error, 'PhpErrorOnce'))
+                    or (!function_exists('isa') and 
                     (
                      // stdlib independent isa()
                      (strtolower(get_class($error)) == 'phperroronce')
@@ -269,6 +275,7 @@
             }
             else {
                 //echo "postponed errors: ";
+                $this->_noCacheHeaders();
                 if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
                     echo "error_reporting=",error_reporting(),"\n";
                     if (function_exists("debug_backtrace")) // >= 4.3.0
@@ -610,6 +617,12 @@
 }
 
 // $Log: ErrorManager.php,v $
+// Revision 1.45  2005/10/29 14:28:08  uckelman
+// existence of isa should be checked, not built-in is_a()
+//
+// Revision 1.44  2005/08/07 10:52:43  rurban
+// stricter error handling: dba errors are fatal, display errors on Request->finish or session_close
+//
 // Revision 1.43  2005/04/11 19:41:23  rurban
 // Improve postponed errors+warnins list layout.
 //
diff -ruN 11p1/lib/HtmlElement.php 12p3/lib/HtmlElement.php
--- 11p1/lib/HtmlElement.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/HtmlElement.php	2006-06-18 06:19:18.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: HtmlElement.php,v 1.46 2005/01/25 06:50:33 rurban Exp $');
+<?php rcs_id('$Id: HtmlElement.php,v 1.47 2005/08/06 12:53:36 rurban Exp $');
 /**
  * Code for writing the HTML subset of XML.
  * @author: Jeff Dairiki
@@ -493,13 +493,13 @@
     $script_args = $script_args ? array_merge($default_script_args, $script_args)
                                 : $default_script_args;
     if (empty($js))
-        return HTML::script($script_args);
+        return HTML(HTML::script($script_args),"\n");
     else
         // see http://devedge.netscape.com/viewsource/2003/xhtml-style-script/
-        return HTML::script($script_args,
+        return HTML(HTML::script($script_args,
                             new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
-                                       . "\n".rtrim($js)."\n"
-                                       . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->")));
+                                       . "\n".trim($js)."\n"
+                                       . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))),"\n");
 }
 
 /** Conditionally display content based of whether javascript is supported.
@@ -535,6 +535,9 @@
     
 /**
  $Log: HtmlElement.php,v $
+ Revision 1.47  2005/08/06 12:53:36  rurban
+ beautify SCRIPT lines
+
  Revision 1.46  2005/01/25 06:50:33  rurban
  added label
 
diff -ruN 11p1/lib/HttpClient.php 12p3/lib/HttpClient.php
--- 11p1/lib/HttpClient.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/HttpClient.php	2006-06-18 06:19:18.000000000 -0500
@@ -264,8 +264,9 @@
     function getRequestURL() {
         $url = 'http://'.$this->host;
         if ($this->port != 80) {
+            $url = 'https://'.$this->host;
             $url .= ':'.$this->port;
-        }            
+        }
         $url .= $this->path;
         return $url;
     }
diff -ruN 11p1/lib/imagecache.php 12p3/lib/imagecache.php
--- 11p1/lib/imagecache.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/imagecache.php	2006-06-18 06:19:18.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: imagecache.php,v 1.12 2004/11/21 11:59:20 rurban Exp $');
+<?php rcs_id('$Id: imagecache.php,v 1.13 2006/03/19 15:01:00 rurban Exp $');
 /*
  Copyright (C) 2002 Johannes Groe (Johannes Gro&szlig;e)
 
@@ -75,7 +75,7 @@
         $request->_user->_authhow = 'session';
         return ENABLE_USER_NEW ? $user->UserName() : $request->_user;
     }
-    if ($userid = $request->getCookieVar('WIKI_ID')) {
+    if ($userid = $request->getCookieVar(getCookieName())) {
         if (!empty($userid) and substr($userid,0,2) != 's:') {
             $request->_user->authhow = 'cookie';
             return $userid;
@@ -166,4 +166,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:   
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/IniConfig.php 12p3/lib/IniConfig.php
--- 11p1/lib/IniConfig.php	2005-09-15 00:56:12.000000000 -0500
+++ 12p3/lib/IniConfig.php	2006-06-18 06:19:19.000000000 -0500
@@ -141,6 +141,7 @@
          'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR', /*'KEYWORDS',*/
          // extra logic:
          //'DATABASE_PREFIX', 'DATABASE_DSN', 'DATABASE_TYPE', 'DATABASE_DBHANDLER',
+	 'DATABASE_OPTIMISE_FREQUENCY',
          'INTERWIKI_MAP_FILE', 'COPYRIGHTPAGE_TITLE', 'COPYRIGHTPAGE_URL',
          'AUTHORPAGE_TITLE', 'AUTHORPAGE_URL', 
          'WIKI_NAME_REGEXP',
@@ -183,7 +184,8 @@
          'DISABLE_HTTP_REDIRECT',
          'PLUGIN_CACHED_USECACHE', 'PLUGIN_CACHED_FORCE_SYNCMAP',
          'BLOG_EMPTY_DEFAULT_PREFIX', 'DATABASE_PERSISTENT',
-         'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA'
+         'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA',
+         'USE_CAPTCHA_RANDOM_WORD'
          );
 
     $rs = @parse_ini_file($file);
@@ -245,7 +247,9 @@
                                   'ALLOW_HTTP_AUTH_LOGIN', 'ALLOW_LDAP_LOGIN',
                                   'ALLOW_IMAP_LOGIN', 'ALLOW_USER_LOGIN',
                                   'REQUIRE_SIGNIN_BEFORE_EDIT',
-                                  'WIKIDB_NOCACHE_MARKUP')))
+                                  'WIKIDB_NOCACHE_MARKUP',
+                                  'COMPRESS_OUTPUT'
+                                  )))
         {
             ;
         }
@@ -290,7 +294,7 @@
             unset($rsdef[$item]);
         }
     }
-    if (!in_array(DATABASE_TYPE, array('SQL','ADODB','PDO','dba','file','cvs','cvsclient')))
+    if (!in_array(DATABASE_TYPE, array('SQL','ADODB','PDO','dba','file','cvs')))
         trigger_error(sprintf("Invalid DATABASE_TYPE=%s. Choose one of %s", 
                               DATABASE_TYPE, "SQL,ADODB,PDO,dba,file,cvs"), 
                       E_USER_ERROR);
@@ -361,6 +365,7 @@
                       'DBAUTH_AUTH_UPDATE' => 'auth_update',
                       'DBAUTH_AUTH_CREATE' => 'auth_create',
                       'DBAUTH_PREF_SELECT' => 'pref_select',
+                      'DBAUTH_PREF_INSERT' => 'pref_insert',
                       'DBAUTH_PREF_UPDATE' => 'pref_update',
                       'DBAUTH_IS_MEMBER' => 'is_member',
                       'DBAUTH_GROUP_MEMBERS' => 'group_members',
@@ -506,9 +511,8 @@
 
 // moved from lib/config.php [1ms]
 function fixup_static_configs($file) {
-    global $FieldSeparator, $charset, $WikiNameRegexp, $KeywordLinkRegexp, $AllActionPages;
+    global $FieldSeparator, $charset, $WikiNameRegexp, $AllActionPages;
     global $HTTP_SERVER_VARS, $DBParams, $LANG;
-
     // init FileFinder to add proper include paths
     FindFile("lib/interwiki.map",true);
     
@@ -655,7 +659,7 @@
  * by startup scripts for wiki farms.
  */
 function fixup_dynamic_configs($file) {
-    global $WikiNameRegexp, $KeywordLinkRegexp;
+    global $WikiNameRegexp;
     global $HTTP_SERVER_VARS, $DBParams, $LANG;
 
     if (defined('INCLUDE_PATH') and INCLUDE_PATH)
@@ -667,16 +671,22 @@
 
     update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);
     if (empty($LANG)) {
-        if (!defined("DEFAULT_LANGUAGE") or !DEFAULT_LANGUAGE)
+        if (!defined("DEFAULT_LANGUAGE") or !DEFAULT_LANGUAGE) {
             // TODO: defer this to WikiRequest::initializeLang()
             $LANG = guessing_lang(); 
-        else    
+            guessing_setlocale (LC_ALL,$LANG);
+        }
+        else
             $LANG = DEFAULT_LANGUAGE;
     }
  
     // Set up (possibly fake) gettext()
     // Todo: this could be moved to fixup_static_configs()
-    if (!function_exists ('bindtextdomain')) {
+    // Bug #1381464 with php-5.1.1
+    if (!function_exists ('bindtextdomain')
+        and !function_exists ('gettext')
+        and !function_exists ('_'))
+    {
         $locale = array();
 
         function gettext ($text) { 
@@ -685,7 +695,6 @@
                 return $locale[$text];
             return $text;
         }
-
         function _ ($text) {
             return gettext($text);
         }
@@ -707,6 +716,9 @@
             $chback = 1;
             $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path);
         }
+        // tell gettext not to use unicode. PHP >= 4.2.0. Thanks to Kai Krakow.
+        if (defined('CHARSET') and function_exists('bind_textdomain_codeset'))
+            @bind_textdomain_codeset("phpwiki", CHARSET);
         textdomain("phpwiki");
         if ($chback) { // change back
             chdir($bindtextdomain_real . (isWindows() ? "\\.." : "/.."));
@@ -715,8 +727,7 @@
 
     // language dependent updates:
     $WikiNameRegexp = pcre_fix_posix_classes($WikiNameRegexp);
-    if ($KeywordLinkRegexp)
-    	$KeywordLinkRegexp = pcre_fix_posix_classes($KeywordLinkRegexp);
+    //if ($KeywordLinkRegexp) $KeywordLinkRegexp = pcre_fix_posix_classes($KeywordLinkRegexp);
     if (!defined('CATEGORY_GROUP_PAGE'))
         define('CATEGORY_GROUP_PAGE',_("CategoryGroup"));
     if (!defined('WIKI_NAME'))
@@ -850,6 +861,12 @@
 }
 
 // $Log: IniConfig.php,v $
+// Revision 1.97  2005/10/29 14:16:38  rurban
+// fix broken locale update
+//
+// Revision 1.96  2005/09/26 06:27:33  rurban
+// default locale fix Thomas Harding
+//
 // Revision 1.94  2005/09/15 05:56:12  rurban
 // read configurator desc from config-dist.ini, update desc, fix some warnings
 //
diff -ruN 11p1/lib/InlineParser.php 12p3/lib/InlineParser.php
--- 11p1/lib/InlineParser.php	2005-09-14 00:57:19.000000000 -0500
+++ 12p3/lib/InlineParser.php	2006-06-18 06:19:19.000000000 -0500
@@ -1,5 +1,5 @@
 <?php 
-rcs_id('$Id: InlineParser.php,v 1.69 2005/09/14 05:57:19 rurban Exp $');
+rcs_id('$Id: InlineParser.php,v 1.70 2005/10/31 16:45:23 rurban Exp $');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki@dairiki.org>
  * Copyright (C) 2004,2005 Reini Urban
  *
@@ -356,6 +356,17 @@
     } else
         $link  = UnWikiEscape($rawlink);
 
+    /* Relatives links by Joel Schaubert.
+     * Recognize [../bla] or [/bla] as relative links, without needing http://
+     * but {/link] only if SUBPAG_SEPERATOR is not /
+     */
+    if (SUBPAGE_SEPARATOR == '/') {
+    	if (preg_match('/^\.\.\//', $link)) {
+            return new Cached_ExternalLink($link, $label);
+    	}
+    } else if (preg_match('/^(\.\.\/|\/)/', $link)) {
+        return new Cached_ExternalLink($link, $label);
+    }
     // [label|link]
     // if label looks like a url to an image, we want an image link.
     if (isImageLink($label)) {
@@ -726,20 +737,23 @@
     var $_markup = array();
     
     function InlineTransformer ($markup_types = false) {
-        if (!$markup_types)
+        if (!$markup_types) {
+            $non_default = false;
             $markup_types = array('escape', 'bracketlink', 'url',
                                   'interwiki', 'wikiword', 'linebreak',
                                   'old_emphasis', 'nestled_emphasis',
                                   'html_emphasis', 'html_abbr', 'plugin',
                                   'isonumchars', 'isohexchars', /*'html_entities',*/
                                   );
+        } else 
+            $non_default = true;
         foreach ($markup_types as $mtype) {
             $class = "Markup_$mtype";
             $this->_addMarkup(new $class);
         }
-        if (ENABLE_MARKUP_COLOR)
+        if (ENABLE_MARKUP_COLOR and !$non_default)
             $this->_addMarkup(new Markup_color);
-        if (defined("ENABLE_MARKUP_TEMPLATE") and ENABLE_MARKUP_TEMPLATE)
+        if (ENABLE_MARKUP_TEMPLATE and !$non_default)
             $this->_addMarkup(new Markup_template_plugin);
     }
 
@@ -870,6 +884,9 @@
 }
 
 // $Log: InlineParser.php,v $
+// Revision 1.70  2005/10/31 16:45:23  rurban
+// added cfg-able markups only for default TextTransformation, not for links and others
+//
 // Revision 1.69  2005/09/14 05:57:19  rurban
 // make ENABLE_MARKUP_TEMPLATE optional
 //
diff -ruN 11p1/lib/loadsave.php 12p3/lib/loadsave.php
--- 11p1/lib/loadsave.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/loadsave.php	2006-06-18 06:19:19.000000000 -0500
@@ -2,7 +2,7 @@
 rcs_id('$Id: loadsave.php,v 1.137 2005/01/30 23:14:38 rurban Exp $');
 
 /*
- Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam
+ Copyright 1999,2000,2001,2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
 
  This file is part of PhpWiki.
 
@@ -155,7 +155,7 @@
     $iter = $page->getAllRevisions();
     $parts = array();
     while ($revision = $iter->next()) {
-        $parts[] = MimeifyPageRevision($revision);
+        $parts[] = MimeifyPageRevision($page, $revision);
         if ($nversions > 0 && count($parts) >= $nversions)
             break;
     }
@@ -218,17 +218,17 @@
     } else {
         $excludeList = array();
     }
-    if ($whichpages = $request->getArg('pages')) {  // which pagenames
-        if ($whichpages == '[]') // current page
-            $whichpages = $thispage;
-        $pages = new WikiDB_Array_PageIterator(explodePageList($whichpages));
+    if ($pages = $request->getArg('pages')) {  // which pagenames
+        if ($pages == '[]') // current page
+            $pages = $thispage;
+        $page_iter = new WikiDB_Array_PageIterator(explodePageList($pages));
     } else {
-        $pages = $dbi->getAllPages(false,false,false,$excludeList);
+        $page_iter = $dbi->getAllPages(false,false,false,$excludeList);
     }
     $request_args = $request->args;
     $timeout = (! $request->getArg('start_debug')) ? 30 : 240;
     
-    while ($page = $pages->next()) {
+    while ($page = $page_iter->next()) {
 	$request->args = $request_args; // some plugins might change them (esp. on POST)
         longer_timeout($timeout); 	// Reset watchdog
 
@@ -292,18 +292,18 @@
     } else {
         $excludeList = array();
     }
-    if ($whichpages = $request->getArg('pages')) {  // which pagenames
-        if ($whichpages == '[]') // current page
-            $whichpages = $thispage;
-        $pages = new WikiDB_Array_PageIterator(explodePageList($whichpages));
+    if ($pages = $request->getArg('pages')) {  // which pagenames
+        if ($pages == '[]') // current page
+            $pages = $thispage;
+        $page_iter = new WikiDB_Array_PageIterator(explodePageList($pages));
     } else {
-        $pages = $dbi->getAllPages(false,false,false,$excludeList);
+        $page_iter = $dbi->getAllPages(false,false,false,$excludeList);
     }
 
     $request_args = $request->args;
     $timeout = (! $request->getArg('start_debug')) ? 30 : 240;
 
-    while ($page = $pages->next()) {
+    while ($page = $page_iter->next()) {
 	$request->args = $request_args; // some plugins might change them (esp. on POST)
         longer_timeout($timeout); 	// Reset watchdog
 
@@ -400,19 +400,22 @@
     } else {
         $excludeList = array();
     }
-    if ($whichpages = $request->getArg('pages')) {  // which pagenames
-        if ($whichpages == '[]') // current page
-            $whichpages = $thispage;
-        $pages = new WikiDB_Array_PageIterator(explodePageList($whichpages));
+    if ($pages = $request->getArg('pages')) {  // which pagenames
+        if ($pages == '[]') // current page
+            $pages = $thispage;
+        $page_iter = new WikiDB_Array_PageIterator(explodePageList($pages));
+    // not at admin page: dump only the current page
+    } elseif ($thispage != _("PhpWikiAdministration")) { 
+        $page_iter = new WikiDB_Array_PageIterator(array($thispage));
     } else {
-        $pages = $dbi->getAllPages(false,false,false,$excludeList);
+        $page_iter = $dbi->getAllPages(false,false,false,$excludeList);
     }
 
     global $WikiTheme;
     if (defined('HTML_DUMP_SUFFIX'))
         $WikiTheme->HTML_DUMP_SUFFIX = HTML_DUMP_SUFFIX;
     $WikiTheme->DUMP_MODE = 'HTML';
-    $_bodyAttr = $WikiTheme->_MoreAttr['body'];
+    $_bodyAttr = @$WikiTheme->_MoreAttr['body'];
     unset($WikiTheme->_MoreAttr['body']);
 
     // check if the dumped file will be accessible from outside
@@ -434,7 +437,7 @@
     $request_args = $request->args;
     $timeout = (! $request->getArg('start_debug')) ? 20 : 240;
     
-    while ($page = $pages->next()) {
+    while ($page = $page_iter->next()) {
 	$request->args = $request_args; // some plugins might change them (esp. on POST)
         longer_timeout($timeout); 	// Reset watchdog
           
@@ -497,12 +500,15 @@
         unset($template);
         unset($data);
     }
-    $pages->free();
+    $page_iter->free();
 
     if (!empty($WikiTheme->dumped_images) and is_array($WikiTheme->dumped_images)) {
         @mkdir("$directory/images");
         foreach ($WikiTheme->dumped_images as $img_file) {
-            if ($img_file and ($from = $WikiTheme->_findFile($img_file, true)) and basename($from)) {
+            if ($img_file 
+                and ($from = $WikiTheme->_findFile($img_file, true)) 
+                and basename($from)) 
+            {
                 $target = "$directory/images/".basename($img_file);
                 if (copy($WikiTheme->_path . $from, $target)) {
                     _copyMsg($from, fmt("... copied to %s", $target));
@@ -518,7 +524,10 @@
     	// Buttons also
         @mkdir("$directory/images/buttons");
         foreach ($WikiTheme->dumped_buttons as $text => $img_file) {
-            if ($img_file and ($from = $WikiTheme->_findFile($img_file, true)) and basename($from)) {
+            if ($img_file 
+                and ($from = $WikiTheme->_findFile($img_file, true)) 
+                and basename($from)) 
+            {
                 $target = "$directory/images/buttons/".basename($img_file);
                 if (copy($WikiTheme->_path . $from, $target)) {
                     _copyMsg($from, fmt("... copied to %s", $target));
@@ -532,7 +541,10 @@
     }
     if (!empty($WikiTheme->dumped_css) and is_array($WikiTheme->dumped_css)) {
         foreach ($WikiTheme->dumped_css as $css_file) {
-            if ($css_file and ($from = $WikiTheme->_findFile(basename($css_file), true)) and basename($from)) {
+            if ($css_file 
+                and ($from = $WikiTheme->_findFile(basename($css_file), true)) 
+                and basename($from)) 
+            {
                 $target = "$directory/" . basename($css_file);
                 if (copy($WikiTheme->_path . $from, $target)) {
                     _copyMsg($from, fmt("... copied to %s", $target));
@@ -574,19 +586,19 @@
     } else {
         $excludeList = array();
     }
-    if ($whichpages = $request->getArg('pages')) {  // which pagenames
-        if ($whichpages == '[]') // current page
-            $whichpages = $thispage;
-        $pages = new WikiDB_Array_PageIterator(explodePageList($whichpages));
+    if ($pages = $request->getArg('pages')) {  // which pagenames
+        if ($pages == '[]') // current page
+            $pages = $thispage;
+        $page_iter = new WikiDB_Array_PageIterator(explodePageList($pages));
     } else {
-        $pages = $dbi->getAllPages(false,false,false,$excludeList);
+        $page_iter = $dbi->getAllPages(false,false,false,$excludeList);
     }
 
     global $WikiTheme;
     if (defined('HTML_DUMP_SUFFIX'))
         $WikiTheme->HTML_DUMP_SUFFIX = HTML_DUMP_SUFFIX;
     $WikiTheme->DUMP_MODE = 'ZIPHTML';
-    $_bodyAttr = $WikiTheme->_MoreAttr['body'];
+    $_bodyAttr = @$WikiTheme->_MoreAttr['body'];
     unset($WikiTheme->_MoreAttr['body']);
 
     /* ignore fatals in plugins */
@@ -598,7 +610,7 @@
     $request_args = $request->args;
     $timeout = (! $request->getArg('start_debug')) ? 20 : 240;
     
-    while ($page = $pages->next()) {
+    while ($page = $page_iter->next()) {
 	$request->args = $request_args; // some plugins might change them (esp. on POST)
         longer_timeout($timeout); 	// Reset watchdog
 
@@ -643,7 +655,7 @@
         unset($template);
         unset($data);
     }
-    $pages->free();
+    $page_iter->free();
 
     $attrib = false;
     // Deal with css and images here.
@@ -876,26 +888,67 @@
     $dbi =& $request->_dbi;
     $page = $dbi->getPage($pagename);
     $current = $page->getCurrentRevision();
-    if ($current->getVersion() == 0) {
+    $currversion = $current->getVersion();
+    if ($currversion == 0) {
         $mesg->pushContent(' ', _("no page content"));
         PrintXML(HTML::dt(fmt("Revert")," ",WikiLink($pagename)),
                  $mesg);
+        flush();
         return;
     }
-    if ($current->getVersion() == $version) {
+    if ($currversion == $version) {
         $mesg->pushContent(' ', _("same version page"));
+        PrintXML(HTML::dt(fmt("Revert")," ",WikiLink($pagename)),
+                 $mesg);
+        flush();
+        return;
+    }
+    if ($request->getArg('cancel')) {
+        $mesg->pushContent(' ', _("Cancelled"));
+        PrintXML(HTML::dt(fmt("Revert")," ",WikiLink($pagename)),
+                 $mesg);
+        flush();
+        return;
+    }
+    if (!$request->getArg('verify')) {
+        $mesg->pushContent(HTML::br(),
+                           _("Are you sure?"),
+                           HTML::br(),
+                           HTML::form(array('action' => $request->getPostURL(),
+                                            'method' => 'post'),
+                                      HiddenInputs($request->getArgs(), false, array('verify')),
+                                      HiddenInputs(array('verify' => 1)),
+                                      Button('submit:verify', _("Yes"), 'button'),
+                                      HTML::Raw('&nbsp;'),
+                                      Button('submit:cancel', _("Cancel"), 'button')));
+        $rev = $page->getRevision($version);
+        $html = HTML(HTML::dt(fmt("Revert %s to version $version", WikiLink($pagename))), 
+                     $mesg,
+                     $rev->getTransformedContent()); 
+        $template = Template('browse', 
+                             array('CONTENT' => $html));
+        GeneratePage($template, $pagename, $rev);
+        $request->checkValidators();
+        flush();
         return;
     }
     $rev = $page->getRevision($version);
     $content = $rev->getPackedContent();
     $versiondata = $rev->_data;
     $versiondata['summary'] = sprintf(_("revert to version %d"), $version);
-    $new = $page->save($content, $current->getVersion() + 1, $versiondata);
+    $new = $page->save($content, $currversion + 1, $versiondata);
     $dbi->touch();
-    $mesg->pushContent(' ', fmt("- version %d saved to database as version %d",
-                                $version, $new->getVersion()));
-    PrintXML(HTML::dt(fmt("Revert")," ",WikiLink($pagename)),
-             $mesg);
+    
+    $pagelink = WikiLink($pagename);
+    $mesg->pushContent(fmt("Revert: %s", $pagelink), 
+                       fmt("- version %d saved to database as version %d",
+                           $version, $new->getVersion()));
+    // Force browse of current page version.
+    $request->setArg('version', false);
+    $template = Template('savepage', array());
+    $template->replace('CONTENT', $new->getTransformedContent());
+    
+    GeneratePage($template, $mesg, $new);
     flush();
 }
 
@@ -1307,6 +1360,21 @@
 
 /**
  $Log: loadsave.php,v $
+ Revision 1.142  2006/03/19 17:16:32  rurban
+ remove remaining cruft
+
+ Revision 1.141  2006/03/19 17:11:32  rurban
+ add verify to RevertPage, display reverted page as template
+
+ Revision 1.140  2006/03/07 20:45:43  rurban
+ wikihash for php-5.1
+
+ Revision 1.139  2005/08/27 18:02:43  rurban
+ fix and expand pages
+
+ Revision 1.138  2005/08/27 09:39:10  rurban
+ dumphtml when not at admin page: dump the current or given page
+
  Revision 1.137  2005/01/30 23:14:38  rurban
  simplify page names
 
diff -ruN 11p1/lib/main.php 12p3/lib/main.php
--- 11p1/lib/main.php	2005-09-15 15:36:54.000000000 -0500
+++ 12p3/lib/main.php	2006-06-18 06:19:19.000000000 -0500
@@ -1,7 +1,7 @@
 <?php //-*-php-*-
-rcs_id('$Id: main.php,v 1.216 2005/08/27 09:40:46 rurban Exp $');
+rcs_id('$Id: main.php,v 1.223  2006/03/19 15:01:00  rurban Exp $');
 /*
- Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam
+ Copyright 1999,2000,2001,2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
 
  This file is part of PhpWiki.
 
@@ -91,7 +91,9 @@
         $this->setArg('pagename', $this->_deducePagename());
         $this->setArg('action', $this->_deduceAction());
 
-        if ((DEBUG & _DEBUG_SQL) or (time() % 50 == 0)) {
+        if ((DEBUG & _DEBUG_SQL)
+	    or (DATABASE_OPTIMISE_FREQUENCY > 0 and 
+                (time() % DATABASE_OPTIMISE_FREQUENCY == 0))) {
             if ($this->_dbi->_backend->optimize())
                 trigger_error(_("Optimizing database"), E_USER_NOTICE);
         }
@@ -238,7 +240,7 @@
             else
                 $action = 'edit';
   	}
-        if (0) {
+        if (! ENABLE_PAGEPERM) { // Bug #1438392 by Matt Brown
             $require_level = $this->requiredAuthority($action);
             if (! $this->_user->hasAuthority($require_level))
                 $this->_notAuthorized($require_level); // NORETURN
@@ -388,7 +390,7 @@
     function _setUser (&$user) {
         $this->_user =& $user;
         if (defined('MAIN_setUser')) return; // don't set cookies twice
-        $this->setCookieVar('WIKI_ID', $user->getAuthenticatedId(),
+        $this->setCookieVar(getCookieName(), $user->getAuthenticatedId(),
                             COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN);
         if ($user->isSignedIn())
             $user->_authhow = 'signin';
@@ -505,7 +507,7 @@
                     'xmlrpc'     => _("access this wiki via XML-RPC"),
                     'soap'       => _("access this wiki via SOAP"),
                     'zip'        => _("download a zip dump from this wiki"),
-                    'ziphtml'    => _("download an html zip dump from this wiki")
+                    'ziphtml'    => _("download a html zip dump from this wiki")
                     );
         }
         if (in_array($action, array_keys($actionDescriptions)))
@@ -662,7 +664,7 @@
         if ($current->getVersion() > 0)
             return;             // Homepage exists.
 
-        include('lib/loadsave.php');
+        include_once('lib/loadsave.php');
         SetupWiki($this);
         $this->finish();        // NORETURN
     }
@@ -862,7 +864,7 @@
         if (!empty($HTTP_ENV_VARS['REMOTE_USER']))
             return $HTTP_ENV_VARS['REMOTE_USER'];
 
-        if ($userid = $this->getCookieVar('WIKI_ID')) {
+        if ($userid = $this->getCookieVar(getCookieName())) {
             if (!empty($userid) and substr($userid,0,2) != 's:') {
                 $this->_user->authhow = 'cookie';
                 return $userid;
@@ -1134,7 +1136,8 @@
 
     function action_captcha () {
         include_once "lib/Captcha.php";
-        captcha_image ( $this->getSessionVar('captchaword')); 
+        $captcha = new Captcha();
+        $captcha->image ( $captcha->captchaword() ); 
     }
     
 }
@@ -1237,8 +1240,8 @@
 if (defined('WIKI_SOAP')   and WIKI_SOAP)   return;
 
     $validators = array('wikiname' => WIKI_NAME,
-                        'args'     => hash($request->getArgs()),
-                        'prefs'    => hash($request->getPrefs()));
+                        'args'     => wikihash($request->getArgs()),
+                        'prefs'    => wikihash($request->getPrefs()));
     if (CACHE_CONTROL == 'STRICT') {
         $dbi = $request->getDbh();
         $timestamp = $dbi->getTimestamp();
@@ -1272,6 +1275,28 @@
 
 
 // $Log: main.php,v $
+// Revision 1.223  2006/03/19 15:01:00  rurban
+// sf.net patch #1333957 by Matt Brown: Authentication cookie identical across all wikis on a host
+//
+// Revision 1.222  2006/03/19 14:53:12  rurban
+// sf.net patch #1438392 by Matt Brown: Bogo Login is broken when ENABLE_PAGEPERM=false
+//
+// Revision 1.221  2006/03/19 14:23:51  rurban
+// sf.net patch #1377011 by Matt Brown: add DATABASE_OPTIMISE_FREQUENCY
+//
+// Revision 1.220  2006/03/07 21:04:15  rurban
+// wikihash for php-5.1
+//
+// Revision 1.219  2005/10/30 14:20:42  rurban
+// move Captcha specific vars and methods into a Captcha object
+// randomize Captcha chars positions and angles (smoothly)
+//
+// Revision 1.218  2005/10/29 14:18:06  rurban
+// fix typo
+//
+// Revision 1.217  2005/09/18 12:44:00  rurban
+// novatrope patch to let only _AUTHENTICATED view pages
+//
 // Revision 1.216  2005/08/27 09:40:46  rurban
 // fix login with HttpAuth
 //
@@ -1831,4 +1856,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/PagePerm.php 12p3/lib/PagePerm.php
--- 11p1/lib/PagePerm.php	2005-05-06 11:57:54.000000000 -0500
+++ 12p3/lib/PagePerm.php	2006-06-18 06:19:19.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PagePerm.php,v 1.39 2005/05/06 16:57:54 rurban Exp $');
+rcs_id('$Id: PagePerm.php,v 1.40 2005/10/29 14:16:58 rurban Exp $');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -647,7 +647,7 @@
                              HTML::td($newgroup),
                              HTML::td(array('align'=>'center'),$nbsp,$newperm),
                              HTML::td(array('align'=>'right','style' => 'background: #ccc url('.$addsrc.') no-repeat'),$addbutton),
-                             HTML::td(HTML::small(_("Check to add this Acl")))));
+                             HTML::td(HTML::small(_("Check to add this ACL")))));
         }
         if ($type == 'default')
             $table->setAttr('style','border: dotted thin black; background-color:#eee;');
@@ -724,6 +724,9 @@
 }
 
 // $Log: PagePerm.php,v $
+// Revision 1.40  2005/10/29 14:16:58  rurban
+// unify message
+//
 // Revision 1.39  2005/05/06 16:57:54  rurban
 // support captcha
 //
diff -ruN 11p1/lib/PageType.php 12p3/lib/PageType.php
--- 11p1/lib/PageType.php	2005-05-06 11:48:41.000000000 -0500
+++ 12p3/lib/PageType.php	2006-06-18 06:19:19.000000000 -0500
@@ -103,7 +103,7 @@
      * @param hash $meta Version meta-data
      * @return XmlContent The transformed page text.
      */
-    function transform(&$page, &$text, $meta) {
+    function transform($page, &$text, $meta) {
         $fmt_class = 'PageFormatter_' . $this->getName();
         $formatter = new $fmt_class($page, $meta);
         return $formatter->format($text);
@@ -202,7 +202,7 @@
 
 
     function _parseMap ($text) {
-        if (!preg_match_all("/^\s*(\S+)\s+(\S+)/m",
+        if (!preg_match_all("/^\s*(\S+)\s+(.+)$/m",
                             $text, $matches, PREG_SET_ORDER))
             return false;
 
@@ -210,7 +210,9 @@
             $map[$m[1]] = $m[2];
         }
 
-        // Add virtual monikers: Upload:, Talk:, User:
+        // Add virtual monikers Upload: Talk: User:
+        // and expand special variables %u, %b, %d
+
         // Upload: Should be expanded later to user-specific upload dirs. 
         // In the Upload plugin, not here: Upload:ReiniUrban/uploaded-file.png
         if (empty($map['Upload'])) {
@@ -222,8 +224,10 @@
         if (empty($map["User"])) {
             $map["User"] = "%s";
         }
+        // Talk:PageName => PageName/Discussion as default, which might be overridden
         if (empty($map["Talk"])) {
             $pagename = $GLOBALS['request']->getArg('pagename');
+            // against PageName/Discussion/Discussion
             if (string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion")))
                 $map["Talk"] = "%s";
             else
@@ -251,7 +255,7 @@
                                              Iso8601DateTime());
         }
 
-        // Maybe add other monikers also (SemanticWeb link predicates?)
+        // Maybe add other monikers also - SemanticWeb link predicates
         // Should they be defined in a RDF? (strict mode)
         // Or should the SemanticWeb lib add it by itself? 
         // (adding only a subset dependent on the context = model)
@@ -312,7 +316,7 @@
         // New policy: default = new markup (old crashes quite often)
     }
 
-    function _transform(&$text) {
+    function _transform($text) {
 	include_once('lib/BlockParser.php');
 	return TransformText($text, $this->_markup);
     }
@@ -338,10 +342,10 @@
 class PageFormatter_interwikimap extends PageFormatter
 {
     function format($text) {
-	return HTML::div(array('class' => 'wikitext'),
-			 $this->_transform($this->_getHeader($text)),
-			 $this->_formatMap($text),
-			 $this->_transform($this->_getFooter($text)));
+        return HTML::div(array('class' => 'wikitext'), 
+                         $this->_transform($this->_getHeader($text)),
+                         $this->_formatMap($text),
+                         $this->_transform($this->_getFooter($text)));
     }
 
     function _getHeader($text) {
@@ -499,6 +503,12 @@
     }
 }
 // $Log: PageType.php,v $
+// Revision 1.47  2005/08/07 09:14:38  rurban
+// fix comments
+//
+// Revision 1.46  2005/08/06 13:09:33  rurban
+// allow spaces in interwiki paths, even implicitly. fixes bug #1218733
+//
 // Revision 1.45  2005/05/06 16:48:41  rurban
 // support %u, %b, %d expansion for Upload: User: and Talk: interwiki monikers
 //
diff -ruN 11p1/lib/plugin/_AuthInfo.php 12p3/lib/plugin/_AuthInfo.php
--- 11p1/lib/plugin/_AuthInfo.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/_AuthInfo.php	2006-06-18 06:19:24.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: _AuthInfo.php,v 1.19 2005/04/01 14:04:31 rurban Exp $');
+rcs_id('$Id: _AuthInfo.php,v 1.20 2006/03/07 21:07:42 rurban Exp $');
 /**
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -41,7 +41,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.19 $");
+                            "\$Revision: 1.20 $");
     }
 
     function getDefaultArguments() {
@@ -52,7 +52,7 @@
         $args = $this->getArgs($argstr, $request);
         extract($args);
         if (empty($userid) or $userid == $request->_user->UserName()) {
-            $user =& $request->_user;
+            $user = $request->_user;
             $userid = $user->UserName();
         } else {
             $user = WikiUser($userid);
@@ -106,6 +106,11 @@
                                        'cellspacing' => 0));
             //$table->pushContent(HTML::tr(HTML::td(array('colspan' => 2))));
             $userdata = obj2hash($user, array('_dbi','_request', 'password', 'passwd'));
+            if (isa($user, "_FilePassUser")) {
+            	foreach ($userdata['_file']->users as $u => $p) {
+            	    $userdata['_file']->users[$u] = "<hidden>";
+            	}
+            }
             $table->pushContent($this->_showhash("User: Object of ".get_class($user), $userdata));
             if (ENABLE_USER_NEW) {
               $group = &$request->getGroup();
@@ -198,6 +203,9 @@
 };
 
 // $Log: _AuthInfo.php,v $
+// Revision 1.20  2006/03/07 21:07:42  rurban
+// protect File passwords
+//
 // Revision 1.19  2005/04/01 14:04:31  rurban
 // use obj2hash exclude arg,
 // fix minor security flaw: enable _AuthInfo only if Admin or DEBUG && _DEBUG_LOGIN
diff -ruN 11p1/lib/plugin/BlogArchives.php 12p3/lib/plugin/BlogArchives.php
--- 11p1/lib/plugin/BlogArchives.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/BlogArchives.php	2006-06-18 06:19:20.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: BlogArchives.php,v 1.4 2004/12/16 18:29:00 rurban Exp $');
+rcs_id('$Id: BlogArchives.php,v 1.5 2005/10/29 09:06:37 rurban Exp $');
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  */
@@ -30,7 +30,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.4 $");
+                            "\$Revision: 1.5 $");
     }
 
     function getDefaultArguments() {
@@ -45,31 +45,6 @@
                    );
     }
 
-    // "2004-12" => "December 2004"
-    function _monthTitle($month){
-        //list($year,$mon) = explode("-",$month);
-        return strftime("%B %Y", strtotime($month."-01"));
-    }
-
-    // "User/Blog/2004-12-13/12:28:50+01:00" => array('month' => "2004-12", ...)
-    function _blog($rev_or_page) {
-    	$pagename = $rev_or_page->getName();
-        if (preg_match("/^(.*Blog)\/(\d\d\d\d-\d\d)-(\d\d)\/(.*)/", $pagename, $m))
-            list(,$prefix,$month,$day,$time) = $m;
-        return array('pagename' => $pagename,
-                     // page (list pages per month) or revision (list months)?
-                     //'title' => isa($rev_or_page,'WikiDB_PageRevision') ? $rev_or_page->get('summary') : '',
-                     //'monthtitle' => $this->_monthTitle($month),
-                     'month'   => $month,
-                     'day'   => $day,
-                     'time'  => $time,
-                     'prefix' => $prefix);
-    }
-
-    function _nonDefaultArgs($args) {
-    	return array_diff_assoc($args, $this->getDefaultArguments());
-    }
-    
     function run($dbi, $argstr, &$request, $basepage) {
         if (is_array($argstr)) { // can do with array also.
             $args =& $argstr;
@@ -161,6 +136,9 @@
 };
 
 // $Log: BlogArchives.php,v $
+// Revision 1.5  2005/10/29 09:06:37  rurban
+// move common blog methods to WikiBlog
+//
 // Revision 1.4  2004/12/16 18:29:00  rurban
 // allow empty Blog prefix
 //
diff -ruN 11p1/lib/plugin/BlogJournal.php 12p3/lib/plugin/BlogJournal.php
--- 11p1/lib/plugin/BlogJournal.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/BlogJournal.php	2006-06-18 06:19:20.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: BlogJournal.php,v 1.4 2004/12/16 18:29:00 rurban Exp $');
+rcs_id('$Id: BlogJournal.php,v 1.4 2005/11/21 20:56:23 rurban Exp $');
 /*
  * Copyright 2005 $ThePhpWikiProgrammingTeam
  */
@@ -40,31 +40,6 @@
                      );
     }
 
-    // "2004-12" => "December 2004"
-    function _monthTitle($month){
-        //list($year,$mon) = explode("-",$month);
-        return strftime("%B %Y", strtotime($month."-01"));
-    }
-
-    // "User/Blog/2004-12-13/12:28:50+01:00" => array('month' => "2004-12", ...)
-    function _blog($rev_or_page) {
-    	$pagename = $rev_or_page->getName();
-        if (preg_match("/^(.*Blog)\/(\d\d\d\d-\d\d)-(\d\d)\/(.*)/", $pagename, $m))
-            list(,$prefix,$month,$day,$time) = $m;
-        return array('pagename' => $pagename,
-                     // page (list pages per month) or revision (list months)?
-                     //'title' => isa($rev_or_page,'WikiDB_PageRevision') ? $rev_or_page->get('summary') : '',
-                     //'monthtitle' => $this->_monthTitle($month),
-                     'month'   => $month,
-                     'day'   => $day,
-                     'time'  => $time,
-                     'prefix' => $prefix);
-    }
-
-    function _nonDefaultArgs($args) {
-    	return array_diff_assoc($args, $this->getDefaultArguments());
-    }
-    
     function run($dbi, $argstr, &$request, $basepage) {
         if (is_array($argstr)) { // can do with array also.
             $args =& $argstr;
@@ -94,12 +69,12 @@
             $prefix .= (SUBPAGE_SEPARATOR . $args['month']);
         $pages = $dbi->titleSearch(new TextSearchQuery("^".$prefix, true, 'posix'));
         $html = HTML(); $i = 0;
-        while (($page = $pages->next()) and $i < $count) {
+        while (($page = $pages->next()) and $i < $args['count']) {
             $rev = $page->getCurrentRevision(false);
             if ($rev->get('pagetype') != 'wikiblog') continue;
             $i++;
             $blog = $this->_blog($rev);
-            $html->pushContent(HTML::h3(WikiLink($page, 'known', $rev->get('summary'))));
+            //$html->pushContent(HTML::h3(WikiLink($page, 'known', $rev->get('summary'))));
             $html->pushContent($rev->getTransformedContent('wikiblog'));
         }
         if ($args['user'] == $user->UserName())
@@ -115,6 +90,22 @@
 };
 
 // $Log: BlogJournal.php,v $
+// Revision 1.4  2005/11/21 20:56:23  rurban
+// no duplicate headline and no direct page link anymore
+//
+// Revision 1.3  2005/11/21 20:47:21  rurban
+// fix count error
+//
+// Revision 1.2  2005/10/29 09:06:37  rurban
+// move common blog methods to WikiBlog
+//
+// Revision 1.1  2005/10/29 09:03:17  rurban
+// Include the latest blog entries for the current users blog if signed,
+// or the ADMIN_USER's Blog if not.
+// UnfoldSubpages for blogs.
+// Rui called this plugin "JournalLast", but this was written completely
+// independently, without having seen the src (yet).
+//
 
 // Local Variables:
 // mode: php
diff -ruN 11p1/lib/plugin/CalendarList.php 12p3/lib/plugin/CalendarList.php
--- 11p1/lib/plugin/CalendarList.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/CalendarList.php	2006-06-18 06:19:20.000000000 -0500
@@ -1,8 +1,37 @@
 <?php // -*-php-*-
-rcs_id('$Id: CalendarList.php,v 1.6 2005/04/02 03:05:44 uckelman Exp $');
+rcs_id('$Id: CalendarList.php,v 1.9 2006/05/14 17:40:31 rurban Exp $');
 
-if (!defined('SECONDS_PER_DAY'))
-define('SECONDS_PER_DAY', 24 * 3600);
+/**
+ Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam
+
+ This file is part of PhpWiki.
+
+ PhpWiki 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.
+
+ PhpWiki 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 PhpWiki; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+// if not defined in config.ini
+if (!defined('PLUGIN_CALENDARLIST_ORDER'))	
+  define('PLUGIN_CALENDARLIST_ORDER',	'normal');
+if (!defined('PLUGIN_CALENDARLIST_NEXT_N_DAYS'))
+  define('PLUGIN_CALENDARLIST_NEXT_N_DAYS','');
+if (!defined('PLUGIN_CALENDARLIST_NEXT_N'))	
+  define('PLUGIN_CALENDARLIST_NEXT_N',	 '');
+if (!defined('PLUGIN_CALENDARLIST_LAST_N_DAYS'))
+  define('PLUGIN_CALENDARLIST_LAST_N_DAYS','');
+if (!defined('PLUGIN_CALENDARLIST_LAST_N'))	
+  define('PLUGIN_CALENDARLIST_LAST_N',	 '');
 
 /**
  * This is a list of calendar appointments. 
@@ -29,16 +58,16 @@
     function getDefaultArguments() {
         return array('prefix'       => '[pagename]',
                      'date_format'  => '%Y-%m-%d',
-                     'order' 	    => 'normal', // or reverse (counting backwards)
+                     'order' 	    => PLUGIN_CALENDARLIST_ORDER, // normal or reverse (report sequence)
                      'year'         => '',
                      'month'        => '',
                      'month_offset' => 0,
-                     //support ranges, based on a simple patch by JoshWand
-                     'next_n_days'  => '',
-                     'last_n_days'  => '',
-                     // next or last n entries:
-                     'next_n'  => '',
-                     //'last_n'  => '', // not yet
+                     //support ranges: next n days/events
+                     'next_n_days'  => PLUGIN_CALENDARLIST_NEXT_N_DAYS,	// one or the other, not both
+                     'next_n'	    => PLUGIN_CALENDARLIST_NEXT_N,
+                     // last n days/entries:
+                     'last_n_days'  => PLUGIN_CALENDARLIST_LAST_N_DAYS,	// one or the other, not both
+                     'last_n'	    => PLUGIN_CALENDARLIST_LAST_N,
 
                      'month_format' => '%B, %Y',
                      'wday_format'  => '%a',
@@ -62,7 +91,29 @@
         }
     }
 
-    function __date($dbi, $time) {
+    function _count_events($dbi, $n = 7, $direction = 1) {
+        //	This is used by the last_n/next_n options to determine the date that
+        //	accounts for the number of N events in the past/future.
+        //	RETURNS: date of N-th event or the last item found
+        $args = &$this->args;				// gather the args array
+        $timeTMP = time();				// start with today's date
+        $t = $timeTMP;					// init the control date variable to now
+        
+        for ($i=0; $i<=180; $i++) {			// loop thru 180 days, past or future
+            $date_string = strftime($args['date_format'], $t);
+            $page_for_date = $args['prefix'] . SUBPAGE_SEPARATOR . $date_string;
+            if ($dbi->isWikiPage($page_for_date)) { // if this date has any comments/events
+                $timeTMP = $t;			    //  capture the date of this event for return
+                if ($n-- <= 0) break;		    //  if we reached the limit, return the date
+            }
+            $t += 24 * 3600 * $direction;	    // advance one day back or forward
+        }
+        
+        // return the date of the N-th or last, most past/future event in the range
+        return $timeTMP;
+    }
+
+    function _date($dbi, $time) {
         $args = &$this->args;
         $date_string = strftime($args['date_format'], $time);
 
@@ -96,6 +147,7 @@
         $args       = &$this->args;
         $this->_links = array();
 
+        // default to this month
         $now = localtime(time() + 3600 * $request->getPref('timeOffset'), 1);
         foreach ( array('month' => $now['tm_mon'] + 1,
                         'year'  => $now['tm_year'] + 1900)
@@ -104,69 +156,92 @@
             if (!($args[$param] = intval($args[$param])))
                 $args[$param]   = $dflt;
         }
+
+        // ***************************************************
+        // start of Plugin CalendarList display logic
+        // determine start date
         if ($args['last_n_days']) {
-            $time = mktime(0, 0, 0,                            // hh, mm, ss,
-                           $args['month'] + $args['month_offset'], // month (1-12)
-                           $now['tm_mday'] - $args['last_n_days'],
-                           $args['year']);
-        } elseif ($args['next_n_days'] or $args['next_n'] 
-                  or ($args['order'] == 'reverse')
-                 /* or $args['last_n']*/) {
-            $time = mktime(0, 0, 0,                            // hh, mm, ss,
-                           $args['month'] + $args['month_offset'], // month (1-12)
-                           $now['tm_mday'] ,                   // starting today
-                           $args['year']);
-        } else {
-            $time = mktime(12, 0, 0,                           // hh, mm, ss,
-                           $args['month'] + $args['month_offset'], // month (1-12)
-                           1,                                   // starting at monday
-                           $args['year']);
-        } 
-        $t = localtime($time, 1);
+            // n days ago (should not be affected by month or month_offset)
+            $start = mktime(0, 0, 0, // h, m, s
+                            $now['tm_mon'] + 1, // month (1-12)
+                            $now['tm_mday'] - $args['last_n_days'], // days prior
+                            $now['tm_year'] + 1900);
+        }
+        elseif ($args['last_n']) {
+            // get date for last nth event
+            $start = $this->_count_events($dbi, $args['last_n'], -1);
+        }
+        else {
+            // start of requested month
+            $start = mktime(0, 0, 0, // h, m, s
+                            $args['month'] + $args['month_offset'], // month (1-12)
+                            1, // days prior
+                            $args['year']);
+        }
 
-        if ($now['tm_year'] == $t['tm_year'] && $now['tm_mon'] == $t['tm_mon'])
-            $this->_today = $now['tm_mday'];
-        else
-            $this->_today = false;
+        // determine end date
+        if ($args['next_n_days']) {
+            // n days from now (should not be affected by month or month_offset)
+            $end = mktime(23, 59, 59, // h, m, s
+                            $now['tm_mon'] + 1, // month (1-12)
+                            $now['tm_mday'] + $args['next_n_days'], // days prior
+                            $now['tm_year'] + 1900);
+        }
+        elseif ($args['last_n']) {
+            // get date for next nth event
+            $end = $this->_count_events($dbi, $args['next_n'], 1);
+        }
+        else {
+            // trick to get last day of requested month
+            $end = mktime(0, 0, -1, // h, m, s
+                            $args['month'] + 1 + $args['month_offset'], // month (1-12)
+                            1, // days prior
+                            $args['year']);
+        }
 
-        $cal = HTML::dl();
+        // switch values for reverse order
+        $step = 24 * 3600;
+        if ($args['order'] == 'reverse') {
+            $time_tmp = $start;
+            $start = $end;
+            $end = $time_tmp;
+            $step *= -1;
+        }
 
-        $done = false;
-        $n = 0; 
-        if ($args['order'] == "reverse")
-            $max = $time - (180 * SECONDS_PER_DAY);
-        else
-            $max = $time + (180 * SECONDS_PER_DAY);
-        while (!$done) {
-            $success = $cal->pushContent($this->__date($dbi, $time));
-            if ($args['order'] == "reverse") {
-                $time -= SECONDS_PER_DAY;
-                if ($time <= $max) return $cal;
-            } else {
-                $time += SECONDS_PER_DAY;
-                if ($time >= $max) return $cal;
-            }
+        // style tag on wiki description but not in here
+        $cal = HTML::dl();
 
-            $t     = localtime($time, 1);
-            if ($args['next_n_days']) {
-                if ($n == $args['next_n_days']) return $cal;
-                $n++;
-            } elseif ($args['next_n']) {
-                if ($n == $args['next_n']) return $cal;
-                if (!empty($success))
-                    $n++;
-            } elseif ($args['last_n_days']) {
-                $done = ($t['tm_mday'] == $now['tm_mday']);
-            } else { // stop at next/prev month
-                $done = ($t['tm_mon'] != $now['tm_mon']);
-            }
+        // loop through dates and create list
+        for ($i = $start; ($step > 0) ? $i < $end : $i > $end; $i += $step) {
+            $cal->pushContent($this->_date($dbi, $i));
         }
+        //	end of Plugin CalendarList display logic
+        // ***************************************************
+
         return $cal;
     }
 };
 
 
 // $Log: CalendarList.php,v $
+// Revision 1.9  2006/05/14 17:40:31  rurban
+// Patch #1232730 by banjo
+//
+// Revision 1.8  2005/10/12 06:18:31  rurban
+// dont overdo constants
+//
+// Revision 1.7  2005/07/21 18:55:55  rurban
+// applied mpullen patch (Revised to work on all date range combinations...),
+// but still does not work as documented.
+//
+// Revision 1.6.2  2005/06/24 12:00:00  mpullen
+//   Corrected bug in the main WHILE loop to detect proper termination point in time
+//   {it was stopping one day too soon in either direction}.
+//
+// Revision 1.6.1  2005/06/23 12:00:00  mpullen
+//   Revised to work on all date range combinations (past and future, by days or count of events)
+//   Externalized five control parameter constants to the config.ini file (new section 8 for PLUGINs)
+//
 // Revision 1.6  2005/04/02 03:05:44  uckelman
 // Removed & from vars passed by reference (not needed, causes PHP to complain).
 //
@@ -182,7 +257,9 @@
 //   last_n not yet
 //
 // Revision 1.2  2004/02/17 12:11:36  rurban
-// added missing 4th basepage arg at plugin->run() to almost all plugins. This caused no harm so far, because it was silently dropped on normal usage. However on plugin internal ->run invocations it failed. (InterWikiSearch, IncludeSiteMap, ...)
+// added missing 4th basepage arg at plugin->run() to almost all plugins. This caused no harm so far,
+//	because it was silently dropped on normal usage. However on plugin internal ->run invocations it failed.
+//	(InterWikiSearch, IncludeSiteMap, ...)
 //
 // Revision 1.1  2003/11/18 19:06:03  carstenklapp
 // New plugin to be used in conjunction with the Calendar plugin.
diff -ruN 11p1/lib/plugin/Calendar.php 12p3/lib/plugin/Calendar.php
--- 11p1/lib/plugin/Calendar.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/Calendar.php	2006-06-18 06:19:20.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: Calendar.php,v 1.30 2005/04/02 03:05:44 uckelman Exp $');
+rcs_id('$Id: Calendar.php,v 1.31 2006/03/19 14:26:29 rurban Exp $');
 /**
  Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
 
@@ -47,7 +47,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.30 $");
+                            "\$Revision: 1.31 $");
     }
 
     function getDefaultArguments() {
@@ -163,6 +163,7 @@
         }
         else {
             $date = HTML::a(array('class' => 'cal-hide',
+                                  'rel'   => 'nofollow',
                                   'href'  => WikiURL($page_for_date,
                                                      array('action' => 'edit')),
                                   'title' => sprintf(_("Edit %s"),
@@ -239,6 +240,9 @@
 };
 
 // $Log: Calendar.php,v $
+// Revision 1.31  2006/03/19 14:26:29  rurban
+// sf.net patch by Matt Brown: Add rel=nofollow to more actions
+//
 // Revision 1.30  2005/04/02 03:05:44  uckelman
 // Removed & from vars passed by reference (not needed, causes PHP to complain).
 //
diff -ruN 11p1/lib/plugin/CreateBib.php 12p3/lib/plugin/CreateBib.php
--- 11p1/lib/plugin/CreateBib.php	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/lib/plugin/CreateBib.php	2006-06-18 06:19:21.000000000 -0500
@@ -0,0 +1,186 @@
+<?php // -*-php-*-
+rcs_id('$Id: CreateBib.php,v 1.1 2006/03/07 21:02:36 rurban Exp $');
+/*
+ Copyright 2004 $ThePhpWikiProgrammingTeam
+
+ This file is part of PhpWiki.
+
+ PhpWiki 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.
+
+ PhpWiki 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 PhpWiki; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * CreateBib:  Automatically create a BibTex file from page
+ *
+ * Usage:   
+ *  <?plugin CreateBib pagename||=whatever ?>
+ *                     
+ * @author:  Lea Viljanen
+ */
+
+class WikiPlugin_CreateBib
+extends WikiPlugin
+{
+    function getName() {
+        return _("CreateBib");
+    }
+
+    function getDescription() {
+        return _("Automatically create a Bibtex file from linked pages");
+    }
+
+    function getVersion() {
+        return preg_replace("/[Revision: $]/", '',
+                            "\$Revision: 1.1 $");
+    }
+
+    function getDefaultArguments() {
+        return array( 'pagename'  => '[pagename]', // The page from which the BibTex file is generated
+                      );
+    }
+
+    function preg_quote ($heading) {
+        return str_replace(array("/",".","?","*"),
+    		           array('\/','\.','\?','\*'), $heading);
+    }
+    
+
+    // Have to include the $starttag and $endtag to the regexps...
+    function extractBibTeX (&$content, $starttag, $endtag) 
+    {
+        $bib = array();
+
+        $start = false;
+        $stop = false;
+        for ($i=0; $i<count($content); $i++) 
+        {
+            // $starttag shows when to start
+            if (preg_match('/^@/',$content[$i],$match)) {
+                $start = true;
+            }
+            // $endtag shows when to stop
+            else if (preg_match('/^\}/',$content[$i],$match)) {
+                $stop = true;
+            }
+            if ($start) {
+                $bib[] = $content[$i];
+                if ($stop) $start = false;
+            }
+        }
+        return $bib;
+    }
+
+    // Extract article links. Current markup is by * characters...
+    // Assume straight list
+    function extractArticles (&$content) {
+        $articles = array();
+        for ($i=0; $i<count($content); $i++) {
+            // Should match "* [WikiPageName] whatever"
+            //if (preg_match('/^\s*\*\s+(\[.+\])/',$content[$i],$match)) 
+            if (preg_match('/^\s*\*\s+\[(.+)\]/',$content[$i],$match))
+            {
+                $articles[] = $match[1];
+            }
+        }
+        return $articles;
+    }
+                
+
+    function dumpFile(&$thispage, $filename) {
+      include_once("lib/loadsave.php");
+      $mailified = MailifyPage($thispage);
+
+      $attrib = array('mtime' => $thispage->get('mtime'), 'is_ascii' => 1);
+
+      $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $filename);
+      $zip->addRegularFile( FilenameForPage($thispage->getName()),
+                            $mailified, $attrib);
+      $zip->finish();
+
+    }
+
+    function run($dbi, $argstr, $request, $basepage) {
+        extract($this->getArgs($argstr, $request));
+        if ($pagename) {
+            // Expand relative page names.
+            $page = new WikiPageName($pagename, $basepage);
+            $pagename = $page->name;
+        }
+        if (!$pagename) {
+            return $this->error(_("no page specified"));
+        }
+
+        // Get the links page contents
+        $page = $dbi->getPage($pagename);
+        $current = $page->getCurrentRevision();
+        $content = $current->getContent();
+
+	// Prepare the button to trigger dumping
+	$dump_url = $request->getURLtoSelf(array("file" => "tube.bib"));
+        global $WikiTheme;
+        $dump_button = $WikiTheme->makeButton("To File", 
+					  $dump_url , 'foo');
+
+        $html = HTML::div(array('class' => 'bib','align' => 'left'));
+	$html->pushContent($dump_button, ' ');
+        $list = HTML::pre(array('name'=>'biblist','id'=>'biblist',
+				'class' => 'bib'));
+
+        // Let's find the subpages
+        if ($articles = $this->extractArticles($content)) {
+            foreach ($articles as $h) {
+
+                // Now let's get the bibtex information from that subpage
+                $subpage = $dbi->getPage($h);
+                $subversion = $subpage->getCurrentRevision();
+                $subcontent = $subversion->getContent();
+
+                $bib = $this->extractBibTeX($subcontent, "@", "}");
+
+                // ...and finally just push the bibtex data to page
+                $foo = implode("\n", $bib);
+                $bar = $foo . "\n\n";
+                $list->pushContent(HTML::raw($bar));
+            }
+        }
+        $html->pushContent($list);
+
+        if ($request->getArg('file')) {
+            // Yes, we want to dump this somewhere
+            // Get the contents of this page
+            $p = $dbi->getPage($pagename);
+            $c = $p->getCurrentRevision();
+            $pagedata = $c->getContent();
+            $this->dumpFile($pagedata, $request->getArg('file'));
+	}
+
+        return $html;
+    }
+};
+
+// $Log: CreateBib.php,v $
+// Revision 1.1  2006/03/07 21:02:36  rurban
+// contributed by Lea Viljanen
+//
+// Based on CreateTOC
+
+// For emacs users
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
diff -ruN 11p1/lib/plugin/CreateToc.php 12p3/lib/plugin/CreateToc.php
--- 11p1/lib/plugin/CreateToc.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/CreateToc.php	2006-06-18 06:19:21.000000000 -0500
@@ -1,7 +1,7 @@
 <?php // -*-php-*-
-rcs_id('$Id: CreateToc.php,v 1.26 2004/09/20 14:07:16 rurban Exp $');
+rcs_id('$Id: CreateToc.php,v 1.29 2006/04/15 12:26:54 rurban Exp $');
 /*
- Copyright 2004 $ThePhpWikiProgrammingTeam
+ Copyright 2004,2005 $ThePhpWikiProgrammingTeam
 
  This file is part of PhpWiki.
 
@@ -30,14 +30,14 @@
  *
  * Known problems: 
  * - MacIE will not work with jshide.
- * - it will crash with old markup!
+ * - it will crash with old markup and Apache2 (?)
  * - Certain corner-edges will not work with TOC_FULL_SYNTAX. 
  *   I believe I fixed all of them now, but who knows?
  * - bug #969495 "existing labels not honored" seems to be fixed.
  */
 
 if (!defined('TOC_FULL_SYNTAX'))
-    define('TOC_FULL_SYNTAX',1);
+    define('TOC_FULL_SYNTAX', 1);
 
 class WikiPlugin_CreateToc
 extends WikiPlugin
@@ -52,64 +52,125 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.26 $");
+                            "\$Revision: 1.29 $");
     }
 
     function getDefaultArguments() {
-        return array( 'pagename'  => '[pagename]', // not sure yet. TOC of another page here?
+        return array( 'pagename'  => '[pagename]', // TOC of another page here?
                       // or headers=1,2,3 is also possible.
-                      'headers'   => "!!!,!!,!",   // "!!!" => h1, "!!" => h2, "!" => h3
+                      'headers'   => "!!!,!!,!",   // "!!!"=>h1, "!!"=>h2, "!"=>h3
                       'noheader'  => 0,            // omit <h1>Table of Contents</h1>
                       'align'     => 'left',
                       'with_toclink' => 0,         // link back to TOC
                       'jshide'    => 0,            // collapsed TOC as DHTML button
                       'liststyle' => 'dl',         // or 'ul' or 'ol'
                       'indentstr' => '&nbsp;&nbsp;',
+		      'with_counter' => 0,
                       );
     }
+    // Initialisation of toc counter
+    function _initTocCounter() {
+        $counter = array(1=>1, 2=>0, 3=>0);
+        return $counter;
+    }
+
+    // Update toc counter with a new title
+    function _tocCounter(&$counter, $level) {
+        $counter[$level]++;
+        $level--;
+        for($i = $level; $i > 0; $i--) {
+            $counter[$level] = 0;
+        }
+    }
+
+    // Get string corresponding to the current title
+    function _getCounter(&$counter, $level) {
+        $str=$counter[3];
+        for($i = 2; $i > 0; $i--) {
+            if($counter[$i] != 0)
+                $str .= '.'.$counter[$i];
+        }
+        return $str;
+    }
 
     function preg_quote ($heading) {
         return str_replace(array("/",".","?","*"),
     		           array('\/','\.','\?','\*'), $heading);
     }
     
-    function searchHeader ($content, $start_index, $heading, $level) {
-    	$count = substr_count($level,'!');
-    	switch ($count) {
-    		case 1: $h = "h4"; break;
-    		case 2: $h = "h3"; break;
-    		case 3: $h = "h2"; break;
-    	}
-        if (defined('TOC_FULL_SYNTAX') and TOC_FULL_SYNTAX) {
+    // Get HTML header corresponding to current level (level is set of !)
+    function _getHeader($level) {
+     	$count = substr_count($level,'!');
+     	switch ($count) {
+     	    case 1: $h = "h4"; break;
+   	    case 2: $h = "h3"; break;
+     	    case 3: $h = "h2"; break;
+     	}
+        return $h;
+    }
+
+    function _quote($heading) {
+        if (TOC_FULL_SYNTAX ) {
             $theading = TransformInline($heading);
-            $qheading = preg_quote($theading->asString());
+            $qheading = preg_quote($theading->asXML(), "/");
         } else {
-            $qheading = preg_quote($heading);
+            $qheading = XmlContent::_quote(preg_quote($heading, "/"));
         }
+        return $qheading;
+    }
+    
+    /*
+     * @param $hstart id (in $content) of heading start
+     * @param $hend   id (in $content) of heading end
+     */
+    function searchHeader ($content, $start_index, $heading, 
+                           $level, &$hstart, &$hend, $basepage=false) {
+        $hstart = 0;
+        $hend = 0;
+    	$h = $this->_getHeader($level);
+        $qheading = $this->_quote($heading);
     	for ($j=$start_index; $j < count($content); $j++) {
             if (is_string($content[$j])) {
-    		if (preg_match("/<$h>$qheading<\/$h>/",$content[$j])) {
+    		if (preg_match("/<$h>$qheading<\/$h>/", 
+    		               $content[$j]))
     		    return $j;
-    		}
-    	    } elseif (isa($content[$j],'cached_wikilink')) {
-                // shortcut for single wikiword headers
-    	    	$content[$j] = $content[$j]->asString();
-    	    	if ($content[$j] == $heading and 
-                    substr($content[$j-1],-4,4) == "<$h>" and
-                    substr($content[$j+1],0,5) == "</$h>") {
-    		    return $j; // single wikiword
-    		} elseif (defined('TOC_FULL_SYNTAX') and TOC_FULL_SYNTAX) {
-    	    	    //DONE: To allow "!! WikiWord link"
-    	    	    // Split heading into WikiWords and check against 
-    	    	    // joined content (after cached_plugininvocation).
-    	    	    // The first wikilink is the anchor then.
-                    $joined = '';
-                    for ($k=max($j-1,$start_index); $k < count($content); $k++) {
-                        $joined .= is_string($content[$k]) ? $content[$k] 
-                        				   : $content[$k]->asString();
-                    }
-                    if (preg_match("/<$h>$qheading<\/$h>/",$joined))
-                        return $j;
+            }
+            elseif (isa($content[$j], 'cached_link'))
+            {
+		if (method_exists($content[$j],'asXML')) {
+		    $content[$j]->_basepage = $basepage;
+		    $content[$j] = $content[$j]->asXML();
+		} else
+		    $content[$j] = $content[$j]->asString();
+		// shortcut for single wikiword or link headers
+		if ($content[$j] == $heading
+		    and substr($content[$j-1],-4,4) == "<$h>" 
+		    and substr($content[$j+1],0,5) == "</$h>") 
+		{
+		    $hstart = $j-1;
+		    $hend = $j+1;
+		    return $j; // single wikiword
+		} 
+		elseif (TOC_FULL_SYNTAX) {
+		    //DONE: To allow "!! WikiWord link" or !! http://anylink/
+		    // Check against joined content (after cached_plugininvocation).
+		    // The first link is the anchor then.
+		    if (preg_match("/<$h>(?!.*<\/$h>)/", $content[$j-1])) {
+			$hstart = $j-1;    	    	    
+			$joined = '';
+			for ($k=max($j-1,$start_index);$k<count($content);$k++) {
+			    if (is_string($content[$k]))
+			        $joined .= $content[$k];
+			    elseif (method_exists($content[$k],'asXML'))
+		                $joined .= $content[$k]->asXML();
+			    else
+		                $joined .= $content[$k]->asString();
+			    if (preg_match("/<$h>$qheading<\/$h>/",$joined)) {
+				$hend=$k;
+				return $k;
+			    }
+			}
+		    }
                 }
     	    }
     	}
@@ -134,8 +195,11 @@
     }
     
     // Feature request: proper nesting; multiple levels (e.g. 1,3)
-    function extractHeaders (&$content, &$markup, $backlink=0, $levels=false, $basepage='') {
+    function extractHeaders (&$content, &$markup, $backlink=0, 
+                             $counter=0, $levels=false, $basepage='') 
+    {
         if (!$levels) $levels = array(1,2);
+        $tocCounter = $this->_initTocCounter();        
         reset($levels);
         sort($levels);
         $headers = array();
@@ -143,36 +207,81 @@
         for ($i=0; $i<count($content); $i++) {
             foreach ($levels as $level) {
                 if ($level < 1 or $level > 3) continue;
-                if (preg_match('/^\s*(!{'.$level.','.$level.'})([^!].*)$/',$content[$i],$match)) {
+                if (preg_match('/^\s*(!{'.$level.','.$level.'})([^!].*)$/',
+                               $content[$i], $match)) 
+                {
+                    $this->_tocCounter($tocCounter, $level);                	
                     if (!strstr($content[$i],'#[')) {
                         $s = trim($match[2]);
                         $anchor = $this->_nextAnchor($s);
                         $manchor = MangleXmlIdentifier($anchor);
-                        $headers[] = array('text' => $s, 'anchor' => $anchor, 'level' => $level);
+                        $texts = $s;
+                        if($counter) {
+                            $texts = $this->_getCounter($tocCounter, $level).' '.$s; 
+                        }
+                        $headers[] = array('text' => $texts, 
+                                           'anchor' => $anchor, 
+                                           'level' => $level);
                         // Change original wikitext, but that is useless art...
                         $content[$i] = $match[1]." #[|$manchor][$s|#TOC]";
                         // And now change the to be printed markup (XmlTree):
                         // Search <hn>$s</hn> line in markup
-                        //Fixme: Find non-singleworded wikilink'ed headers also.
-                        $j = $this->searchHeader($markup->_content, $j, $s, $match[1]);
+                        /* Url for backlink */
+                        $url = WikiURL(new WikiPageName($basepage,false,"TOC"));
+                        $j = $this->searchHeader($markup->_content, $j, $s, 
+                                                 $match[1], $hstart, $hend, 
+                                                 $markup->_basepage);
                         if ($j and isset($markup->_content[$j])) {
                             $x = $markup->_content[$j];
-                            if (is_string($markup->_content[$j])) {
-                                $heading = preg_quote($s);
-                                if ($x = preg_replace('/(<h\d>)('.$heading.')(<\/h\d>)/',
-                                                      "\$1<a name=\"$manchor\"></a>\$2\$3",$x,1)) {
+			    $qheading = $this->_quote($s);
+			    if ($counter)
+				$counterString = $this->_getCounter($tocCounter, $level);
+                            if (($hstart === 0) && is_string($markup->_content[$j])) {
+                                if ($backlink) {
+                                    if ($counter)
+                                        $anchorString = "<a href=\"$url\" name=\"$manchor\">$counterString</a> - \$2";
+                                    else
+                                        $anchorString = "<a href=\"$url\" name=\"$manchor\">\$2</a>";
+                                } else {
+                                    $anchorString = "<a name=\"$manchor\"></a>";
+                                    if ($counter)
+                                        $anchorString .= "$counterString - ";
+                                }
+                                if ($x = preg_replace('/(<h\d>)('.$qheading.')(<\/h\d>)/',
+                                                      "\$1$anchorString\$2\$3",$x,1)) {
                                     if ($backlink) {
-                                        $url = WikiURL(new WikiPageName($basepage,false,"TOC"));
-                                        $x = preg_replace('/(<h\d>)('.$heading.')(<\/h\d>)/',
-                                                          "\$1<a href=\"$url\" name=\"$manchor\">\$2</a>\$3",
+                                        $x = preg_replace('/(<h\d>)('.$qheading.')(<\/h\d>)/',
+                                                          "\$1$anchorString\$3",
                                                           $markup->_content[$j],1);
                                     }
                                     $markup->_content[$j] = $x;
                                 }
-                            }
-                            elseif (isa($markup->_content[$j],'cached_wikilink')) {
-                                $label = isset($x->_label) ? $x->_label : false;
-                                $markup->_content[$j] = HTML::a(array('name'=>$manchor),WikiLink($x->_page, 'auto', $label));
+                            } else {
+                                $x = $markup->_content[$hstart];
+                                $h = $this->_getHeader($match[1]);
+
+                                if ($backlink) {
+                                    if ($counter)
+                                        $anchorString = "\$1<a href=\"$url\" name=\"$manchor\">$counterString</a> - ";
+                                    else {
+                                        /* Not possible to make a backlink on a
+                                         * title with a WikiWord */
+                                        $anchorString = "\$1<a name=\"$manchor\"></a>";
+                                    }
+                                }
+                                else {
+                                    $anchorString = "\$1<a name=\"$manchor\"></a>";
+                                    if ($counter)
+                                        $anchorString .= "$counterString - ";
+                                }
+                                $x = preg_replace("/(<$h>)(?!.*<\/$h>)/", 
+                                                  $anchorString, $x, 1);
+                                if ($backlink) {
+                                    $x =  preg_replace("/(<$h>)(?!.*<\/$h>)/", 
+                                                      $anchorString,
+                                                      $markup->_content[$hstart],1);
+                                }
+                                $markup->_content[$hstart] = $x;
                             }
                         }
                     }
@@ -208,11 +317,11 @@
         $content = $current->getContent();
         $html = HTML::div(array('class' => 'toc','align' => $align));
         if ($liststyle == 'dl')
-            $list = HTML::dl(array('name'=>'toclist','id'=>'toclist','class' => 'toc'));
+            $list = HTML::dl(array('id'=>'toclist','class' => 'toc'));
         elseif ($liststyle == 'ul')
-            $list = HTML::ul(array('name'=>'toclist','id'=>'toclist','class' => 'toc'));
+            $list = HTML::ul(array('id'=>'toclist','class' => 'toc'));
         elseif ($liststyle == 'ol')
-            $list = HTML::ol(array('name'=>'toclist','id'=>'toclist','class' => 'toc'));
+            $list = HTML::ol(array('id'=>'toclist','class' => 'toc'));
         if (!strstr($headers,",")) {
             $headers = array($headers);	
         } else {
@@ -230,10 +339,11 @@
                 $levels[] = $level;
             }
         }
-        if (defined('TOC_FULL_SYNTAX') and TOC_FULL_SYNTAX)
+        if (TOC_FULL_SYNTAX)
             require_once("lib/InlineParser.php");
         if ($headers = $this->extractHeaders($content, $dbi->_markup, 
-                                             $with_toclink, $levels, $basepage)) 
+                                             $with_toclink, $with_counter, 
+                                             $levels, $basepage)) 
         {
             foreach ($headers as $h) {
                 // proper heading indent
@@ -242,9 +352,11 @@
                 $link = new WikiPageName($pagename,$page,$h['anchor']);
                 $li = WikiLink($link,'known',$h['text']);
                 if ($liststyle == 'dl')
-                    $list->pushContent(HTML::dt(HTML::raw(str_repeat($indentstr,$indent)),$li));
+                    $list->pushContent(HTML::dt(HTML::raw
+                        (str_repeat($indentstr,$indent)),$li));
                 else
-                    $list->pushContent(HTML::li(HTML::raw(str_repeat($indentstr,$indent)),$li));
+                    $list->pushContent(HTML::li(HTML::raw
+                        (str_repeat($indentstr,$indent)),$li));
             }
         }
         if ($jshide) {
@@ -277,6 +389,15 @@
 };
 
 // $Log: CreateToc.php,v $
+// Revision 1.29  2006/04/15 12:26:54  rurban
+// need basepage for subpages like /Remove (within CreateTOC)
+//
+// Revision 1.28  2005/10/12 06:15:25  rurban
+// just aesthetics
+//
+// Revision 1.27  2005/10/10 19:50:45  rurban
+// fix the missing formatting problems, add with_counter arg by ?? (20050106), Thanks to ManuelVacelet for the testcase
+//
 // Revision 1.26  2004/09/20 14:07:16  rurban
 // fix Constant toc_full_syntax already defined warning
 //
diff -ruN 11p1/lib/plugin/Diff.php 12p3/lib/plugin/Diff.php
--- 11p1/lib/plugin/Diff.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/Diff.php	2006-06-18 06:19:21.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: Diff.php,v 1.2 2004/06/14 11:31:39 rurban Exp $');
+rcs_id('$Id: Diff.php,v 1.3 2005/09/30 18:53:10 uckelman Exp $');
 /**
  Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam
 
@@ -42,7 +42,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.2 $");
+                            "\$Revision: 1.3 $");
     }
 
     // Establish default values for each of this plugin's arguments.
@@ -284,7 +284,7 @@
         return $orig->getLines();
     }
 
-    function final () {
+    function _final () {
         $final = new _HWLDF_WordAccumulator;
 
         foreach ($this->edits as $edit) {
@@ -360,7 +360,7 @@
     function _changed($orig, $final) {
         $diff = new WordLevelDiff($orig, $final);
         $this->_lines($diff->orig(), 'original', '-');
-        $this->_lines($diff->final(), 'final', '+');
+        $this->_lines($diff->_final(), 'final', '+');
     }
 }
 
@@ -422,6 +422,10 @@
 }
 
 // $Log: Diff.php,v $
+// Revision 1.3  2005/09/30 18:53:10  uckelman
+// 'final' is a reserved keyword as of PHP5, so shouldn't be used as a
+//  function name here.
+//
 // Revision 1.2  2004/06/14 11:31:39  rurban
 // renamed global $Theme to $WikiTheme (gforge nameclash)
 // inherit PageList default options from PageList
diff -ruN 11p1/lib/plugin/FileInfo.php 12p3/lib/plugin/FileInfo.php
--- 11p1/lib/plugin/FileInfo.php	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/lib/plugin/FileInfo.php	2006-06-18 06:19:21.000000000 -0500
@@ -0,0 +1,303 @@
+<?php // -*-php-*-
+rcs_id('$Id: FileInfo.php,v 1.4 2005/10/29 14:18:47 rurban Exp $');
+/*
+ Copyright 2005 $ThePhpWikiProgrammingTeam
+ 
+ This file is part of PhpWiki.
+
+ PhpWiki 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.
+
+ PhpWiki 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 PhpWiki; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * This plugin displays the version, date, size, perms of an uploaded file.
+ * Only files relative and below to the uploads path can be handled.
+ *
+ * Usage:
+ *   <?plugin FileVersion file=uploads/setup.exe display=version,date ?>
+ *   <?plugin FileVersion file=uploads/setup.exe display=name,version,date 
+ *                        format="%s (version: %s, date: %s)" ?>
+ *
+ * @author: ReiniUrban
+ */
+
+class WikiPlugin_FileInfo
+extends WikiPlugin
+{
+    function getName () {
+        return _("FileInfo");
+    }
+
+    function getDescription () {
+        return _("Display file information like version,size,date,... of uploaded files.");
+    }
+
+    function getVersion() {
+        return preg_replace("/[Revision: $]/", '',
+                            "\$Revision: 1.4 $");
+    }
+
+    function getDefaultArguments() {
+        return array(
+                     'file'      => false, // relative path from PHPWIKI_DIR. (required)
+                     'display'   => false, // version,size,date,mtime,owner,name,path,dirname,link.  (required)
+                     'format'    => false, // printf format string with %s only, all display modes 
+		     			   // from above vars return strings (optional)
+                    );
+    }
+
+    function run($dbi, $argstr, &$request, $basepage) {
+        extract($this->getArgs($argstr, $request));
+        if (!$file)
+            return $this->error(sprintf(_("A required argument '%s' is missing."), 'file'));
+        if (!$display)
+            return $this->error(sprintf(_("A required argument '%s' is missing."), 'display'));
+
+        $dir = getcwd();
+        chdir(PHPWIKI_DIR);
+	// sanify $file name
+	if (!file_exists($file)) {
+	    trigger_error("file \"$file\" not found", E_USER_WARNING);
+	}
+	$realfile = realpath($file);
+	if (!string_starts_with($realfile, realpath(getUploadDataPath())))
+	    return $this->error("invalid path \"$file\"");
+	else 
+	    $isuploaded = 1;
+	$s = array();
+	$modes = explode(",", $display);
+	foreach ($modes as $mode) {
+	    switch ($mode) {
+	    case 'version':  $s[] = $this->exeversion($file); break;
+	    case 'size':     $s[] = filesize($file); break;
+	    case 'phonysize':$s[] = $this->phonysize(filesize($file)); break;
+	    case 'date':     $s[] = strftime("%x %X", filemtime($file)); break;
+	    case 'mtime':    $s[] = filemtime($file); break;
+	    case 'name':     $s[] = basename($file); break;
+	    case 'path':     $s[] = $file; break;
+	    case 'dirname':  $s[] = dirname($file); break;
+	    case 'magic':    $s[] = $this->magic($file); break;
+	    case 'mime-typ': $s[] = $this->mime_type($file); break;
+	    case 'link':    
+		if ($isuploaded) {
+		    $s[] = "[Upload:".basename($file)."]"; 
+		} else {
+		    $s[] = "[".basename($file)."]"; 
+		}
+		break;
+	    default:
+		return $this->error(sprintf(_("Unsupported argument: %s=%s"), 'display', $mode)); 
+		break;
+	    }
+	}
+        chdir($dir);
+	if (!$format) {
+	    $format = '';
+	    foreach ($s as $x) { $format .= " %s"; }
+	}
+	array_unshift($s, $format);
+	// $x, array($i,$j) => sprintf($x, $i, $j)
+        $result = call_user_func_array("sprintf", $s);
+	if (in_array('link', $modes)) {
+	    require_once("lib/InlineParser.php");
+	    return TransformInline($result);
+	} else {
+	    return $result;
+	}
+    }
+
+    function magic($file) {
+	if (function_exists('finfo_file') or loadPhpExtension('fileinfo')) {
+	    // Valid finfo_open (i.e. libmagic) options:
+	    // FILEINFO_NONE | FILEINFO_SYMLINK | FILEINFO_MIME | FILEINFO_COMPRESS | FILEINFO_DEVICES |
+	    // FILEINFO_CONTINUE | FILEINFO_PRESERVE_ATIME | FILEINFO_RAW
+	    $f = finfo_open(/*FILEINFO_MIME*/);
+	    $result = finfo_file(realpath($file));
+	    finfo_close($res);
+	    return $result;
+	}
+	return '';
+    }
+
+    function mime_type($file) {
+	return '';
+    }
+
+    function _formatsize ($n, $factor, $suffix = '') {
+        if ($n > $factor) {
+            $b = $n / $factor;
+            $n -= floor($factor * $b);
+            return number_format($b, $n ? 3 : 0). $suffix;
+        }
+    }
+    function phonysize ($a) {
+        $factor = 1024 * 1024 * 1000;
+        if ($a > $factor)
+            return $this->_formatsize($a, $factor, ' GB');
+        $factor = 1024 * 1000;
+        if ($a > $factor)
+            return $this->_formatsize($a, $factor, ' MB');
+        $factor = 1024;
+        if ($a > $factor)
+            return $this->_formatsize($a, $factor, ' KB');
+        if ($a > 1)
+            return $this->_formatsize($a, 1, ' byte');
+        else
+            return $a;
+    }
+
+    function exeversion($file) {
+    	if (!isWindows()) return "?";
+	if (class_exists('ffi') or loadPhpExtension('ffi'))
+	    return $this->exeversion_ffi($file);
+	if (function_exists('res_list_type') or loadPhpExtension('win32std'))
+	    return $this->exeversion_resopen($file);
+	return exeversion_showver($file);
+	return '';
+    }
+
+    // http://www.codeproject.com/dll/showver.asp
+    function exeversion_showver($file) {
+	$path = realpath($file);
+	$result = `showver $path`; 
+    	return "?";
+    }
+
+    function exeversion_ffi($file) {
+	if (!DEBUG)
+	    return "?"; // not yet stable
+    	
+	if (function_exists('ffi') or loadPhpExtension('ffi')) {
+	    $win32_idl = "
+struct VS_FIXEDFILEINFO {
+        DWORD dwSignature;
+        DWORD dwStrucVersion;
+        DWORD dwFileVersionMS;
+        DWORD dwFileVersionLS;
+        DWORD dwProductVersionMS;
+        DWORD dwProductVersionLS;
+        DWORD dwFileFlagsMask;
+        DWORD dwFileFlags;
+        DWORD dwFileOS;
+        DWORD dwFileType;
+        DWORD dwFileSubtype;
+        DWORD dwFileDateMS;
+        DWORD dwFileDateLS;
+};
+struct VS_VERSIONINFO { struct VS_VERSIONINFO
+  WORD  wLength; 
+  WORD  wValueLength; 
+  WORD  wType; 
+  WCHAR szKey[1]; 
+  WORD  Padding1[1]; 
+  VS_FIXEDFILEINFO Value; 
+  WORD  Padding2[1]; 
+  WORD  Children[1]; 
+};
+[lib='kernel32.dll'] DWORD GetFileVersionInfoSizeA(char *szFileName, DWORD *dwVerHnd);
+[lib='kernel32.dll'] int GetFileVersionInfoA(char *sfnFile, DWORD dummy, DWORD size, struct VS_VERSIONINFO *pVer);
+";
+            $ffi = new ffi($win32_idl);
+            $dummy = 0; // &DWORD
+ 	    $size = $ffi->GetFileVersionInfoSizeA($file, $dummy);
+	    //$pVer = str_repeat($size+1);
+	    $pVer = new ffi_struct($ffi, "VS_VERSIONINFO");
+	    if ($ffi->GetFileVersionInfoA($file, 0, $size, $pVer) 
+	        and $pVer->wValueLength) {
+		// analyze the VS_FIXEDFILEINFO(Value);
+		// $pValue = new ffi_struct($ffi, "VS_FIXEDFILEINFO");
+		$pValue =& $pVer->Value;
+		return sprintf("%d.%d.%d.%d",
+			       $pValue->dwFileVersionMS >> 16,
+			       $pValue->dwFileVersionMS & 0xFFFF,
+			       $pValue->dwFileVersionLS >> 16, 
+			       $pValue->dwFileVersionLS & 0xFFFF);
+	    }
+	}
+    }
+
+    // Read "RT_VERSION/VERSIONINFO" exe/dll resource info for MSWin32 binaries
+    // The "win32std" extension is not ready yet to pass back a VERSIONINFO struct
+    function exeversion_resopen($file) {
+	if (function_exists('res_list_type') or loadPhpExtension('win32std')) {
+	    // See http://msdn.microsoft.com/workshop/networking/predefined/res.asp
+	    $v = file_get_contents('res://'.realpath($file).urlencode('/RT_VERSION/#1'));
+	    if ($v) {
+	    	// This is really a binary VERSIONINFO block, with lots of
+	    	// nul bytes (widechar) which cannot be transported as string.
+	    	return "$v";
+	    }
+            else {
+		$h = res_open(realpath($file));
+		$v = res_get($h, 'RT_VERSION', 'FileVersion');
+		res_close($h);
+		if ($v) return $v;
+
+		$h = res_open(realpath($file));
+		$v = res_get($h, '#1', 'RT_VERSION', 1);
+		res_close($h);
+		if ($v) return $v;
+	    }
+	      
+	    /* The version consists of two 32-bit integers, defined by four 16-bit integers. 
+	       For example, "FILEVERSION 3,10,0,61" is translated into two doublewords: 
+	       0x0003000a and 0x0000003d, in that order. */
+/*	    
+	$h = res_open(realpath($file));
+	    
+	echo "Res list of '$file': \n";
+	$list= res_list_type($h, true);
+	if( $list===FALSE ) err( "Can't list type" );
+	
+	for( $i= 0; $i<count($list); $i++ ) {
+		echo $list[$i]."\n";
+		$res= res_list($h, $list[$i]);
+		for( $j= 0; $j<count($res); $j++ ) {
+			echo "\t".$res[$j]."\n";
+		}
+	}
+	echo "Res get: ".res_get( $h, 'A_TYPE', 'A_RC_NAME' )."\n\n";
+	res_close( $h );	    
+*/
+	    if ($v)
+	        return "$v";
+	    else 
+	        return "";
+	} else {
+	    return "";
+	}
+	
+    }
+};
+
+/* 
+ $Log: FileInfo.php,v $
+ Revision 1.4  2005/10/29 14:18:47  rurban
+ add display=phonysize
+
+ Revision 1.3  2005/10/29 13:35:00  rurban
+ fix Log:, add chdir() if not in PHPWIKI_DIR, fix ->warning
+
+
+*/
+
+// For emacs users
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
diff -ruN 11p1/lib/plugin/FullTextSearch.php 12p3/lib/plugin/FullTextSearch.php
--- 11p1/lib/plugin/FullTextSearch.php	2005-09-11 09:55:05.000000000 -0500
+++ 12p3/lib/plugin/FullTextSearch.php	2006-06-18 06:19:21.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: FullTextSearch.php,v 1.25 2005/09/11 14:55:05 rurban Exp $');
+rcs_id('$Id: FullTextSearch.php,v 1.26 2005/11/14 22:33:04 rurban Exp $');
 /*
 Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
 
@@ -45,7 +45,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.25 $");
+                            "\$Revision: 1.26 $");
     }
 
     function getDefaultArguments() {
@@ -106,6 +106,10 @@
         if (!$list->getContent())
             $list->pushContent(HTML::dd(_("<no matches>")));
 
+        if (!empty($pages->stoplisted))
+            $list = HTML(HTML::p(fmt(_("Ignored stoplist words '%s'"), 
+                                     join(', ', $pages->stoplisted))), 
+                         $list);
         if ($noheader)
             return $list;
         return HTML(HTML::p(fmt("Full text search results for '%s'", $s)),
@@ -136,6 +140,9 @@
 };
 
 // $Log: FullTextSearch.php,v $
+// Revision 1.26  2005/11/14 22:33:04  rurban
+// print ignored stoplist words
+//
 // Revision 1.25  2005/09/11 14:55:05  rurban
 // implement fulltext stoplist
 //
diff -ruN 11p1/lib/plugin/GoogleMaps.php 12p3/lib/plugin/GoogleMaps.php
--- 11p1/lib/plugin/GoogleMaps.php	2005-09-11 08:29:56.000000000 -0500
+++ 12p3/lib/plugin/GoogleMaps.php	2006-06-18 06:19:21.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: GoogleMaps.php,v 1.2 2005/09/11 13:29:56 rurban Exp $');
+rcs_id('$Id: GoogleMaps.php,v 1.3 2005/09/18 16:11:40 rurban Exp $');
 /**
  Copyright 2005 $ThePhpWikiProgrammingTeam
 
@@ -69,7 +69,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.2 $");
+                            "\$Revision: 1.3 $");
     }
 
     function getDefaultArguments() {
@@ -117,7 +117,7 @@
             if ($InfoText) {
                 include_once("lib/BlockParser.php");
                 $page = $dbi->getPage($request->getArg('pagename'));
-                $rev = $p->getCurrentRevision(false);
+                $rev  = $page->getCurrentRevision(false);
                 $markup = $rev->get('markup');
                 $markertext = TransformText($InfoText, $markup, $basepage);
             }
@@ -154,6 +154,9 @@
 };
 
 // $Log: GoogleMaps.php,v $
+// Revision 1.3  2005/09/18 16:11:40  rurban
+// fix syntax error
+//
 // Revision 1.2  2005/09/11 13:29:56  rurban
 // remove InfoLink, wiki parse Infotext instead
 //
diff -ruN 11p1/lib/plugin/GraphViz.php 12p3/lib/plugin/GraphViz.php
--- 11p1/lib/plugin/GraphViz.php	2005-05-06 11:54:59.000000000 -0500
+++ 12p3/lib/plugin/GraphViz.php	2006-06-18 06:19:21.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: GraphViz.php,v 1.4 2005/05/06 16:54:59 rurban Exp $');
+rcs_id('$Id: GraphViz.php,v 1.6 2005/10/12 06:19:07 rurban Exp $');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -35,7 +35,7 @@
    multiline dot script ...
 ?>
 
- * See also: VisualWiki, which also uses dot and WikiPluginCached.
+ * See also: VisualWiki, which depends on GraphViz and WikiPluginCached.
  *
  * TODO: 
  * - neato binary ?
@@ -122,7 +122,7 @@
     }
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.4 $");
+                            "\$Revision: 1.6 $");
     }
     function getDefaultArguments() {
         return array(
@@ -202,14 +202,15 @@
                                array(255, 255, 255));
     }
 
-    function createDotFile($tempfile='', $argarray=false) {
-        $source =& $this->source;
+    function processSource($argarray=false) {
+        $source = $this->source;
         if (empty($source)) {
             // create digraph from pages
             $source = "digraph GraphViz {\n";  // }
             foreach ($argarray['pages'] as $name) { // support <!plugin-list !> pagelists
                 // allow Page/SubPage
-                $url = str_replace(urlencode(SUBPAGE_SEPARATOR), SUBPAGE_SEPARATOR, rawurlencode($name));
+                $url = str_replace(urlencode(SUBPAGE_SEPARATOR), SUBPAGE_SEPARATOR, 
+				   rawurlencode($name));
                 $source .= "  \"$name\" [URL=\"$url\"];\n";
             }
             // {
@@ -227,21 +228,23 @@
              $source = $src;
         }
         */
+	return $source;
+    }
+
+    function createDotFile($tempfile='', $argarray=false) {
+        $this->source = $this->processSource($argarray);
         if (!$tempfile) {
             $tempfile = $this->tempnam($this->getName().".dot");
             unlink($tempfile);
         }
         if (!$fp = fopen($tempfile, 'w'))
             return false;
-        $ok = fwrite($fp, $source);
+        $ok = fwrite($fp, $this->source);
         $ok = fclose($fp) && $ok;  // close anyway
-        return $ok;
+        return $ok ? $tempfile : false;
     }
 
     function getImage($dbi, $argarray, $request) {
-        if (!($dotfile = $this->createDotFile($argarray)))
-            return $this->error(fmt("empty source"));
-
         $dotbin = GRAPHVIZ_EXE;
         $tempfiles = $this->tempnam($this->getName());
         $gif = $argarray['imgtype'];
@@ -257,22 +260,37 @@
             $tempdir = dirname($tempfiles);
             $tempout = $tempdir . "/.debug";
         }
+        $source = $this->processSource($argarray);
+        if (empty($source))
+            return $this->error(fmt("No dot graph given"));
         //$ok = $tempfiles;
-        $this->createDotFile($tempfiles.'.dot', $argarray);
-        $this->execute("$dotbin -T$gif $dotfile -o $outfile" . 
-                       ($debug ? " > $tempout 2>&1" : " 2>&1"), $outfile);
-        //$code = $this->filterThroughCmd($source, GRAPHVIZ_EXE . "$args");
-        //if (empty($code))
-        //    return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
-        sleep(1);
+        //$dotfile = $this->createDotFile($tempfiles.'.dot', $argarray);
+        //$args = "-T$gif $dotfile -o $outfile";
+        $args = "-T$gif -o $outfile";
+        $cmdline = "$dotbin $args";
+        if ($debug) $cmdline .= " > $tempout";
+        //if (!isWindows()) $cmdline .= " 2>&1";
+        //$this->execute($cmdline, $outfile);
+        $code = $this->filterThroughCmd($source, $cmdline);
+        if (!empty($code))
+            $this->complain(sprintf(_("Couldn't start commandline '%s'", $cmdline)));
+        sleep(0.1);
         if (! file_exists($outfile) ) {
-            $this->_errortext .= sprintf(_("%s error: outputfile '%s' not created"), 
-                                         "GraphViz", $outfile);
-            $this->_errortext .= ("\ncmd-line: $dotbin -T$gif $dotfile -o $outfile");
+            $this->complain(sprintf(_("%s error: outputfile '%s' not created"), 
+                                    "GraphViz", $outfile));
+            $this->complain("\ncmd-line: $cmdline");
             return false;
         }
-        if (function_exists($ImageCreateFromFunc))
-            return $ImageCreateFromFunc( $outfile );
+        if (function_exists($ImageCreateFromFunc)) {
+            $img = $ImageCreateFromFunc( $outfile );
+	    // clean up tempfiles
+	    if (!$argarray['debug'])
+		foreach (array('',".$gif",'.dot') as $ext) {
+		    //if (file_exists($tempfiles.$ext))
+		    @unlink($tempfiles.$ext);
+		}
+	    return $img;
+	}
         return $outfile;
     }
     
@@ -311,18 +329,29 @@
             $tempdir = dirname($tempfiles);
             $tempout = $tempdir . "/.debug";
         }
-        $ok = $tempfiles
-            && $this->createDotFile($tempfiles.'.dot',$argarray)
-            // && $this->filterThroughCmd('',"$dotbin -T$gif $tempfiles.dot -o $outfile")
-            // && $this->filterThroughCmd('',"$dotbin -Timap $tempfiles.dot -o ".$tempfiles.".map")
-            && $this->execute("$dotbin -T$gif $tempfiles.dot -o $outfile" . 
-                              ($debug ? " > $tempout 2>&1" : " 2>&1"), $outfile)
-            && $this->execute("$dotbin -Timap $tempfiles.dot -o ".$tempfiles.".map" . 
-                              ($debug ? " > $tempout 2>&1" : " 2>&1"), $tempfiles.".map")
-            && file_exists( $outfile )
-            && file_exists( $tempfiles.'.map' )
-            && ($img = $ImageCreateFromFunc($outfile))
-            && ($fp = fopen($tempfiles.'.map', 'r'));
+        $ok = $tempfiles;
+        $source = $this->processSource($argarray);
+        if (empty($source))
+            return $this->error(fmt("No dot graph given"));
+	//$ok = $ok and $this->createDotFile($tempfiles.'.dot', $argarray);
+
+        $args = "-T$gif $tempfiles.dot -o $outfile";
+        $cmdline1 = "$dotbin $args";
+        if ($debug) $cmdline1 .= " > $tempout";
+	$ok = $ok and $this->filterThroughCmd($source, $cmdline1);
+	// $this->execute("$dotbin -T$gif $tempfiles.dot -o $outfile" . 
+        //                    ($debug ? " > $tempout 2>&1" : " 2>&1"), $outfile)
+
+        $args = "-Timap $tempfiles.dot -o $tempfiles.map";
+        $cmdline2 = "$dotbin $args";
+        if ($debug) $cmdline2 .= " > $tempout";
+        $ok = $ok and $this->filterThroughCmd($source, $cmdline2);
+	// $this->execute("$dotbin -Timap $tempfiles.dot -o ".$tempfiles.".map" . 
+        //                    ($debug ? " > $tempout 2>&1" : " 2>&1"), $tempfiles.".map")
+	$ok = $ok and file_exists( $outfile );
+	$ok = $ok and file_exists( $tempfiles.'.map' );
+	$ok = $ok and ($img = $ImageCreateFromFunc($outfile));
+        $ok = $ok and ($fp = fopen($tempfiles.'.map', 'r'));
 
         $map = HTML();
         if ($debug == 'static') {
@@ -367,20 +396,22 @@
             fclose($fp);
             //trigger_error("url=".$url);
         } else {
-            $this->_errortext = 
-                ("$outfile: ".(file_exists($outfile) ? filesize($outfile):'missing')."\n".
-                 "$tempfiles.map: ".(file_exists("$tempfiles.map") ? filesize("$tempfiles.map"):'missing'));
-            $this->_errortext .= ("\ncmd-line: $dotbin -T$gif $tempfiles.dot -o $outfile");
-            $this->_errortext .= ("\ncmd-line: $dotbin -Timap $tempfiles.dot -o ".$tempfiles.".map");
-            trigger_error($this->_errortext, E_USER_WARNING);
+            $this->complain("$outfile: "
+                            . (file_exists($outfile) ? filesize($outfile):'missing')
+                            ."\n"
+                            . "$tempfiles.map: "
+                            . (file_exists("$tempfiles.map") ? filesize("$tempfiles.map"):'missing'));
+            $this->complain("\ncmd-line: $cmdline1");
+            $this->complain("\ncmd-line: $cmdline2");
+            trigger_error($this->GetError(), E_USER_WARNING);
             return array(false, false);
         }
 
         // clean up tempfiles
         if ($ok and !$argarray['debug'])
             foreach (array('',".$gif",'.map','.dot') as $ext) {
-                if (file_exists($tempfiles.$ext))
-                    unlink($tempfiles.$ext);
+                //if (file_exists($tempfiles.$ext))
+		        @unlink($tempfiles.$ext);
             }
 
         if ($ok)
@@ -389,40 +420,15 @@
             return array(false, false);
     }
 
-    /**
-     * Execute system command.
-     * TODO: better use invokeDot for imagemaps, linking to the pages.
-     *
-     * @param  cmd string   command to be invoked
-     * @return     boolean  error status; true=ok; false=error
-     */
-    function execute($cmd, $until = false) {
-        // cmd must redirect stderr to stdout though!
-        $errstr = exec($cmd); //, $outarr, $returnval); // normally 127
-        //$errstr = join('',$outarr);
-        $ok = empty($errstr);
-        if (!$ok) {
-            trigger_error("\n".$cmd." failed: $errstr", E_USER_WARNING);
-        } elseif ($GLOBALS['request']->getArg('debug'))
-            trigger_error("\n".$cmd.": success\n", E_USER_NOTICE);
-        if (!isWindows()) {
-            if ($until) {
-                $loop = 100000;
-                while (!file_exists($until) and $loop > 0) {
-                    $loop -= 100;
-                    usleep(100);
-                }
-            } else {
-                usleep(5000);
-            }
-        }
-        if ($until)
-            return file_exists($until);
-        return $ok;
-    }
 };
 
 // $Log: GraphViz.php,v $
+// Revision 1.6  2005/10/12 06:19:07  rurban
+// protect unsafe calls
+//
+// Revision 1.5  2005/09/26 06:39:14  rurban
+// use cached img and map - again. Remove execute from here
+//
 // Revision 1.4  2005/05/06 16:54:59  rurban
 // add failing cmdline for .map
 //
diff -ruN 11p1/lib/plugin/Imdb.php 12p3/lib/plugin/Imdb.php
--- 11p1/lib/plugin/Imdb.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/Imdb.php	1969-12-31 18:00:00.000000000 -0600
@@ -1,120 +0,0 @@
-<?php // -*-php-*-
-rcs_id('$Id: SqlResult.php,v 1.2 2004/05/03 21:57:47 rurban Exp $');
-/*
- Copyright 2004 $ThePhpWikiProgrammingTeam
- 
- This file is (not yet) part of PhpWiki.
-
- PhpWiki 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.
-
- PhpWiki 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 PhpWiki; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/**
- * Query results from a local imdb copy.
- * see amdbfront for the conversion.
- * "imdb = mysql://user:pass@localhost/imdb" in lib/plugin/SqlResult.ini
- *
- * Queries:
- * <?plugin Imdb query=movie_main title||="Sample Movie (2002)" ?>
- * <?plugin Imdb query=movie_combined title||="Sample Movie (2002)" ?>
- * <?plugin Imdb query=movie_full title||="Sample Movie (2002)" ?>
- * <?plugin Imdb query=movie_company_credits title||="Sample Movie (2002)" ?>
- * <?plugin Imdb query=name name||="Lastname, Firstname (I)" ?>
- * More title queries:
- *  business, moviebudgets, colorinfo, mpaaratingsreasons,
- *  akatitles, alternateversions, miscellaneouscompanies, moviecountries,
- *  certificates, completecast, completecrew, crazycredits, genres, goofs,
- *  keywords, movielinks, plot, quotes, ratings, soundtracks, specialeffectscompanies,
- *  taglines, trivia, distributors, language, laserdisc, literature, locations,
- *  miscellaneouscompanies, productioncompanies, releasedates, runningtimes, soundmix,
- *  technical
- * More name queries:
- *   akanames, guestappearances, biographies
- *   job.descriptions
- *
- * @author: ReiniUrban
- */
-
-include_once("lib/plugin/SqlResult.php");
-include_once("themes/film/lib/imdb.php");
-
-class WikiPlugin_Imdb
-extends WikiPlugin_SqlResult
-{
-    function getDescription () {
-        return _("Query a local imdb database");
-    }
-
-    function getVersion() {
-        return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.2 $");
-    }
-
-    function getDefaultArguments() {
-        return array(
-                     'query'       => false, // what
-                     'template'    => false, // use a custom <theme>/template.tmpl
-                     'where'       => false, // custom filter for the query
-                     'title'       => false, // custom filter for the query
-                     'name'        => false, // custom filter for the query
-                     'sortby'      => false, // for paging, default none
-                     'limit'       => false, // for paging, default: only the first 50 
-                    );
-    }
-
-    function run($dbi, $argstr, &$request, $basepage) {
-        $args = $this->getArgs($argstr, $request);
-        extract($args);
-        $imdb = new imdb();
-
-        if (method_exists($imdb, $query)) {
-            $SqlResult = $imdb->$query($title ? $title : $name);
-        } else {
-            $SqlResult = array();
-        }
-
-        // if ($limit) ; // TODO: fill paging vars (see PageList)
-        if ($ordered) {
-            $html = HTML::ol(array('class'=>'sqlresult'));
-            foreach ($SqlResult as $row) {
-                $html->pushContent(HTML::li(array('class'=> $i++ % 2 ? 'evenrow' : 'oddrow'), $row[0]));
-            }
-        } else {
-            $html = HTML::table(array('class'=>'sqlresult'));
-            $i = 0;
-            foreach ($SqlResult as $row) {
-                $tr = HTML::tr(array('class'=> $i++ % 2 ? 'evenrow' : 'oddrow'));
-                foreach ($row as $col) {
-                    $tr->pushContent(HTML::td($col));
-                }
-                $html->pushContent($tr);
-            }
-        }
-        // if ($limit) ; // do paging via pagelink template
-        return $html;
-    }
-};
-
-// $Log: SqlResult.php,v $
-//
-
-// For emacs users
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
-?>
\ No newline at end of file
diff -ruN 11p1/lib/plugin/IncludePages.php 12p3/lib/plugin/IncludePages.php
--- 11p1/lib/plugin/IncludePages.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/IncludePages.php	2006-06-18 06:19:21.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: IncludePages.php,v 1.1 2004/09/06 08:37:31 rurban Exp $');
+rcs_id('$Id: IncludePages.php,v 1.2 2005/09/30 18:41:39 uckelman Exp $');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -41,7 +41,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.1 $");
+                            "\$Revision: 1.2 $");
     }
 
     function getDefaultArguments() {
@@ -74,7 +74,7 @@
         
     	foreach ($args['pages'] as $page) {
             if (empty($args['exclude']) or !in_array($page, $args['exclude'])) {
-                $html = HTML($html, $include->run($dbi, "page='$page' ".$argstr, &$request, $basepage));
+                $html = HTML($html, $include->run($dbi, "page='$page' ".$argstr, $request, $basepage));
             }
     	}
         return $html;
@@ -82,6 +82,9 @@
 };
 
 // $Log: IncludePages.php,v $
+// Revision 1.2  2005/09/30 18:41:39  uckelman
+// Fixed more passes-by-reference.
+//
 // Revision 1.1  2004/09/06 08:37:31  rurban
 // plugin-list support for pages and exclude args
 //
diff -ruN 11p1/lib/plugin/ListPages.php 12p3/lib/plugin/ListPages.php
--- 11p1/lib/plugin/ListPages.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/ListPages.php	2006-06-18 06:19:22.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: ListPages.php,v 1.9 2004/11/23 15:17:19 rurban Exp $');
+rcs_id('$Id: ListPages.php,v 1.10 2005/09/27 17:34:19 rurban Exp $');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -44,7 +44,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.9 $");
+                            "\$Revision: 1.10 $");
     }
 
     function getDefaultArguments() {
@@ -53,7 +53,7 @@
              PageList::supportedArgs(),
              array('pages'    => false,
                    //'exclude'  => false,
-                   'info'     => 'pagename,top3recs',
+                   'info'     => 'pagename',
                    'dimension' => 0,
                    ));
     }
@@ -68,12 +68,15 @@
     function run($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
         extract($args);
+        // If the ratings table does not exist, or on dba it will break otherwise. 
+        // Check if Theme isa 'wikilens'
+	if ($info == 'pagename' and isa($GLOBALS['WikiTheme'], 'wikilens'))
+	    $info .= ",top3recs";
         if ($info)
             $info = split(',', $info);
         else
             $info = array();
-        // Fixme: if the ratings table does not exist it will break. 
-        // check if Theme isa 'wikilens'?
+
         if (in_array('top3recs', $info)) {
             require_once('lib/wikilens/Buddy.php');
             require_once('lib/wikilens/PageListColumns.php');
@@ -85,7 +88,10 @@
             if (!isset($userids) || !is_array($userids) || !count($userids)) {
                 // TKL: moved getBuddies call inside if statement because it was
                 // causing the userids[] parameter to be ignored
-                if (is_string($active_userid) && strlen($active_userid) && $active_user->isSignedIn()) {
+                if (is_string($active_userid) 
+		    and strlen($active_userid) 
+		    and $active_user->isSignedIn()) 
+		{
                     $userids = getBuddies($active_userid, $dbi);
                 } else {
                     $userids = array();
@@ -140,6 +146,9 @@
 }
 
 // $Log: ListPages.php,v $
+// Revision 1.10  2005/09/27 17:34:19  rurban
+// fix ListPages for non-SQL backends. Add top3recs as default only if ratings are available
+//
 // Revision 1.9  2004/11/23 15:17:19  rurban
 // better support for case_exact search (not caseexact for consistency),
 // plugin args simplification:
diff -ruN 11p1/lib/plugin/PageTrail.php 12p3/lib/plugin/PageTrail.php
--- 11p1/lib/plugin/PageTrail.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/PageTrail.php	2006-06-18 06:19:22.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PageTrail.php,v 1.7 2005/02/28 21:24:34 rurban Exp $');
+rcs_id('$Id: PageTrail.php,v 1.8 2005/08/06 13:23:14 rurban Exp $');
 /**
  Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam
 
@@ -52,7 +52,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.7 $");
+                            "\$Revision: 1.8 $");
     }
 
     // default values
@@ -80,13 +80,13 @@
             $request->session->set("PageTrail", $Pages);
         }
 
-        if (! $invisible) {
-            $numberlinks = min(count($Pages)-1, $numberlinks);
+        $numberlinks = min(count($Pages), $numberlinks);
+        if (! $invisible and $numberlinks) {
             $html = HTML::tt(WikiLink($Pages[$numberlinks-1], 'auto'));
             for ($i = $numberlinks - 2; $i >= 0; $i--) {
                 if (!empty($Pages[$i]))
                     $html->pushContent(PAGETRAIL_ARROW, 
-                                       WikiLink($Pages[$i],'auto'));
+                                       WikiLink($Pages[$i], 'auto'));
             }
             return $html;
         } else
@@ -95,6 +95,9 @@
 };
 
 // $Log: PageTrail.php,v $
+// Revision 1.8  2005/08/06 13:23:14  rurban
+// improved empty cookie
+//
 // Revision 1.7  2005/02/28 21:24:34  rurban
 // ignore forbidden ini_set warnings. Bug #1117254 by Xavier Roche
 //
diff -ruN 11p1/lib/plugin/PasswordReset.php 12p3/lib/plugin/PasswordReset.php
--- 11p1/lib/plugin/PasswordReset.php	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/lib/plugin/PasswordReset.php	2006-06-18 06:19:22.000000000 -0500
@@ -0,0 +1,200 @@
+<?php // -*-php-*-
+rcs_id('$Id: PasswordReset.php,v 1.1 2006/03/19 16:31:57 rurban Exp $');
+/**
+ Copyright (C) 2006 $ThePhpWikiProgrammingTeam
+
+ This file is part of PhpWiki.
+
+ PhpWiki 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.
+
+ PhpWiki 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 PhpWiki; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * 1. User forgot password but has email in the prefs.
+ *    => action=email&user=username will send the password per email in plaintext.
+ *
+ *    If no email is stored, because user might not exist, 
+ *    => "No email stored for user %s.
+ *        You need to ask an Administrator to reset this password."
+ *       Problem: How to contact Admin? Present a link to ADMIN_USER
+
+ *    If no email exists but is not verified, 
+ *    => "Warning: This users email address is unverified!"
+ *
+ * 2. Admin may reset any users password, with verification.
+ *    => action=reset&user=username
+ */
+class WikiPlugin_PasswordReset
+extends WikiPlugin
+{
+    function getName () {
+        return _("PasswordReset");
+    }
+
+    function getVersion() {
+        return preg_replace("/[Revision: $]/", '',
+                            "\$Revision: 1.1 $");
+    }
+
+    function getDefaultArguments() {
+	return array('user' => 0);
+    }
+
+    /* reset password, verified */
+    function doReset($userid) {
+ 
+	$user = WikiUser($userid);
+	$prefs = $user->getPreferences();
+	$prefs->set('passwd','');
+	if ($user->setPreferences($prefs)) {
+	    $alert = new Alert(_("Message"),
+			       fmt("The password for user %s has been deleted.", $userid));
+	} else {
+	    $alert = new Alert(_("Error"),
+			       fmt("The password for user %s could not be deleted.", $userid));
+	}
+	$alert->show();
+    }
+
+    function doEmail(&$request, $userid) {
+ 
+	$thisuser = WikiUser($userid);
+	$prefs = $thisuser->getPreferences();
+	$email = $prefs->get('email');
+	$passwd = $prefs->get('passwd'); // plain?
+	$from = $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
+	if (mail($email,
+		 "[".WIKI_NAME."] PasswortReset", 
+		 "PasswortReset requested by $from\r\n".
+		 "Password for ".WIKI_NAME.": $passwd",
+		 "From: $from"))
+	    $alert = new Alert(_("Message"),
+			       fmt("Email sent to the stored email address for user %s", $userid));
+	else
+	    $alert = new Alert(_("Error"),
+			       fmt("Error sending email with password for user %s.", $userid));
+	$alert->show();
+    }
+
+    function doForm(&$request, $header = '', $footer = '') { 
+	$post_args = $request->getArg('admin_reset');
+	$userid = $request->getArg('user');
+	if (!$header) {
+	    $header = HTML::p(_("Reset password of user: "),
+			      HTML::Raw('&nbsp;'),
+			      HTML::input(array('type' => 'text',
+						'name' => "user",
+						'value' => $userid))
+			      );
+	}
+	if (!$footer) {
+	    $isadmin = $request->_user->isAdmin();
+	    $footer = HTML::p(Button('submit:admin_reset[reset]', 
+				      $isadmin ? _("Yes") : _("Send email"), 
+				      $isadmin ? 'wikiadmin' : 'button'),
+			       HTML::Raw('&nbsp;'),
+			       Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
+	}
+        return HTML::form(array('action' => $request->getPostURL(),
+                                'method' => 'post'),
+                          $header,
+                          HiddenInputs($request->getArgs(), false, array('admin_reset', 'user')),
+                          ENABLE_PAGEPERM ? '' : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)),
+			  $footer );
+    }
+
+    function run($dbi, $argstr, &$request, $basepage) {
+        $args = $this->getArgs($argstr, $request);
+        if (isa($request,'MockRequest'))
+            return '';
+
+        $user =& $request->_user;
+	$post_args = $request->getArg('admin_reset');
+        $userid = $request->getArg('user');
+	$isadmin = $user->isAdmin();
+	if ($request->isPost()) {
+	    if (!$userid) {
+		$alert = new Alert(_("Warning:"),
+				   _("You need to specify the userid!"));
+		$alert->show();
+		return $this->doForm($request);
+	    }
+	    @$reset = $post_args['reset'];
+	    if ($reset and $userid and !empty($post_args['verify'])) {
+		if ($user->isAdmin()) {
+		    return $this->doReset($userid);
+		} else {
+		    return $this->doEmail($request, $userid);
+		}
+	    } elseif ($reset and empty($post_args['verify'])) {
+		$buttons = HTML::p(Button('submit:admin_reset[reset]', 
+					  $isadmin ? _("Yes") : _("Send email"), 
+					  $isadmin ? 'wikiadmin' : 'button'),
+				   HTML::Raw('&nbsp;'),
+				   Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
+		$header = HTML::strong("Verify");
+		if (!$user->isAdmin()) {
+		    // check for email
+		    if ($userid == $user->UserName() and $user->isAuthenticated()) {
+			$alert = new Alert(_("Already logged in"),
+					   HTML(fmt("Changing passwords is done at "), WikiLink(_("UserPreferences"))));
+			$alert->show();
+			return;
+		    }
+		    $thisuser = WikiUser($userid);
+		    $prefs = $thisuser->getPreferences();
+		    $email = $prefs->get('email');
+		    if (!$email) {
+			$alert = new Alert(_("Error"),
+					   HTML(fmt("No email stored for user %s.", $userid),
+						HTML::br(),
+						fmt("You need to ask an Administrator to reset this password. See below: "),
+						HTML::br(), WikiLink(ADMIN_USER)));
+			$alert->show();
+			return;
+		    }
+		    $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified');
+		    if (!$verified)
+			$header->pushContent(HTML::br(), "Warning: This users email address is unverified!");
+		}
+		return $this->doForm($request,
+				     $header,
+				     HTML(HTML::hr(),
+					  fmt("Do you really want to reset the password of user %s?", $userid),
+					  $isadmin ? '' : _("An email will be sent."),
+					  HiddenInputs(array('admin_reset[verify]' => 1, 'user' => $userid)),
+					  $buttons));
+	    } else {
+		return $this->doForm($request);
+	    }
+	} else {
+	    return $this->doForm($request);
+        }
+    }
+};
+
+// $Log: PasswordReset.php,v $
+// Revision 1.1  2006/03/19 16:31:57  rurban
+// I would have needed that very often
+//
+
+// For emacs users
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>
diff -ruN 11p1/lib/plugin/PhotoAlbum.php 12p3/lib/plugin/PhotoAlbum.php
--- 11p1/lib/plugin/PhotoAlbum.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/PhotoAlbum.php	2006-06-18 06:19:22.000000000 -0500
@@ -1,7 +1,7 @@
 <?php // -*-php-*-
-rcs_id('$Id: PhotoAlbum.php,v 1.11 2004/12/06 19:50:05 rurban Exp $');
+rcs_id('$Id: PhotoAlbum.php,v 1.14 2005/10/12 06:19:07 rurban Exp $');
 /*
- Copyright 2003, 2004 $ThePhpWikiProgrammingTeam
+ Copyright 2003, 2004, 2005 $ThePhpWikiProgrammingTeam
  
  This file is part of PhpWiki.
 
@@ -25,23 +25,28 @@
  *
  * @author: Ted Vinke <teddy@jouwfeestje.com>
  *          Reini Urban (local fs)
+ *          Thomas Harding (slides mode, real thumbnails)
  *
  * Usage:
  * <?plugin PhotoAlbum
  *          src="http://server/textfile" or localfile or localdir
- *          mode=[column|row]
+ *          mode=[normal|column|row|thumbs|tiles|list|slide]
  *          desc=true
- *          sort=false
+ *          numcols=3
  *          height=50%
  *          width=50%
+ *          thumbswidth=80
+ *          align=[center|left|right]
+ *          duration=6
+ * ?>
  *
- * "src": textfile of images or directory of images (local or remote)
+ * "src": textfile of images or directory of images or a single image (local or remote)
  *      Local or remote e.g. http://myserver/images/MyPhotos.txt or http://myserver/images/
  *      Possible content of a valid textfile:
- * 	photo-01.jpg; Me and my girlfriend
- * 	photo-02.jpg
- * 	christmas.gif; Merry Christmas!
-
+ *     photo-01.jpg; Me and my girlfriend
+ *     photo-02.jpg
+ *     christmas.gif; Merry Christmas!
+ *
  *     Inside textfile, filenames and optional descriptions are seperated by
  *     semi-colon on each line. Listed files must be in same directory as textfile 
  *     itself, so don't use relative paths inside textfile.
@@ -51,10 +56,10 @@
 
 /**
  * TODO:
- * - implement WinXP style 'slide' mode, javascript tricks
  * - specify picture(s) as parameter(s)
  * - limit amount of pictures on one page
  * - use PHP to really resize or greyscale images (only where GD library supports it)
+ *   (quite done for resize with "ImageTile.php")
  *
  * KNOWN ISSUES:
  * - reading height and width from images with spaces in their names fails.
@@ -62,6 +67,26 @@
  * Fixed album location idea by Philip J. Hollenback. Thanks!
  */
 
+class ImageTile extends HtmlElement
+{
+    function image_tile (/*...*/) {
+        $el = new HTML ('img');
+        $tag = func_get_args();
+        $params = "<img src='../ImageTile.php?url=". $tag[0]['src'];
+        if (!@empty($tag[0]['width']))
+            $params .= "&width=" . $tag[0]['width'];
+        if (!@empty($tag[0]['height']))
+            $params .= "&height=" . $tag[0]['height'];
+        if (!@empty($tag[0]['width']))
+            $params .= "' width='" . $tag[0]['width'];
+        if (!@empty($tag[0]['height']))
+            $params .= "' height='" . $tag[0]['height'];
+        
+        $params .= "' alt='" . $tag[0]['alt'] . "' />";
+        return $el->raw ($params);
+    }
+}
+
 class WikiPlugin_PhotoAlbum
 extends WikiPlugin
 {
@@ -75,7 +100,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.11 $");
+                            "\$Revision: 1.14 $");
     }
 
 // Avoid nameclash, so it's disabled. We allow any url.
@@ -87,24 +112,26 @@
     function getDefaultArguments() {
         return array('src'      => '',          // textfile of image list, or local dir.
                      'url'      => '',          // if src=localfs, url prefix (webroot for the links)
-                     'mode'	=> 'normal', 	// normal|thumbs|tiles|list
-                     	// "normal" - Normal table which shows photos full-size
-                     	// "thumbs" - WinXP thumbnail style
-                     	// "tiles"  - WinXP tiles style
-                     	// "list"   - WinXP list style
-                     	// "slide"  - Not yet implemented
-                     'numcols'	=> 3,		// photos per row, columns
-                     'showdesc'	=> 'both',	// none|name|desc|both
-                     	// "none"   - No descriptions next to photos
-                     	// "name"   - Only filename shown
-                     	// "desc"   - Only description (from textfile) shown
-                     	// "both"	 - If no description found, then filename will be used
-                     'link'	=> true, 	// show link to original sized photo
-                     	// If true, each image will be hyperlinked to a page where the single 
-                     	// photo will be shown full-size. Only works when mode != 'normal'
-                     'attrib'	=> '',		// 'sort, nowrap, alt'
-                     	// attrib arg allows multiple attributes: attrib=sort,nowrap,alt
-                     	// 'sort' sorts alphabetically, 'nowrap' for cells, 'alt' to use
+                     'mode'    => 'normal',     // normal|thumbs|tiles|list
+                         // "normal" - Normal table which shows photos full-size
+                         // "thumbs" - WinXP thumbnail style
+                         // "tiles"  - WinXP tiles style
+                         // "list"   - WinXP list style
+                         // "row"    - inline thumbnails
+                         // "column" - photos full-size, displayed in 1 column
+                         // "slide"  - slideshow mode, needs javascript on client
+                     'numcols'    => 3,        // photos per row, columns
+                     'showdesc'    => 'both',    // none|name|desc|both
+                         // "none"   - No descriptions next to photos
+                         // "name"   - Only filename shown
+                         // "desc"   - Only description (from textfile) shown
+                         // "both"     - If no description found, then filename will be used
+                     'link'    => true,     // show link to original sized photo
+                         // If true, each image will be hyperlinked to a page where the single 
+                         // photo will be shown full-size. Only works when mode != 'normal'
+                     'attrib'    => '',        // 'sort, nowrap, alt'
+                         // attrib arg allows multiple attributes: attrib=sort,nowrap,alt
+                         // 'sort' sorts alphabetically, 'nowrap' for cells, 'alt' to use
                         // descs instead of filenames in image ALT-tags
                      'bgcolor'  => '#eae8e8',	// cell bgcolor (lightgrey)
                      'hlcolor'	=> '#c0c0ff',	// highlight color (lightblue)
@@ -119,20 +146,23 @@
                      // style percentage, "auto" (no special action), "equal" (where
                      // all columns are equally sized) or "image" (take height and
                      // width of the photo in that cell).
-                     'tablewidth'=> false,	// table (75|100%)
-                     'p'	=> false, 	// "displaythissinglephoto.jpg"
-                     'h'	=> false, 	// "highlightcolorofthisphoto.jpg"
+                     'tablewidth'=> false,    // table (75|100%)
+                     'p'    => false,     // "displaythissinglephoto.jpg"
+                     'h'    => false,     // "highlightcolorofthisphoto.jpg"
+                     'duration' => 6, // in slide mode, in seconds
+                     'thumbswidth' => 80 //width of thumbnails
                      );
     }
     // descriptions (instead of filenames) for image alt-tags
 
     function run($dbi, $argstr, &$request, $basepage) {
+    
         extract($this->getArgs($argstr, $request));
 
         $attributes = $attrib ? explode(",", $attrib) : array();
         $photos = array();
         $html = HTML();
-
+        $count = 0;
         // check all parameters
         // what type do we have?
         if (!$src) {
@@ -150,201 +180,327 @@
         if ($align != 'left' && $align != 'center' && $align != 'right') {
             $align = 'center';
         }
-	if (count($photos) == 0) return;
+        if (count($photos) == 0) return;
 
-	if (in_array("sort", $attributes))
-	    sort($photos);
-
-	if ($p) {
-	    $mode = "normal";
-	}
-
-	// set some fixed properties for each $mode
-	if ($mode == 'thumbs' || $mode == 'tiles') {
-	    $attributes = array_merge($attributes, "alt");
-	    $attributes = array_merge($attributes, "nowrap");
-	    $cellwidth  = 'auto'; // else cell won't nowrap
-	    $showdesc   = 'name';
-	    $width      = 50;
-	} elseif ($mode == 'list') {
-	    $numcols    = 1;
-	    $cellwidth  = "auto";
-	    if ($showdesc != "none") {
-	    	$showdesc = "desc";
-	    }
-	}
-
-	$row = HTML();
-	while (list($key, $value) = each($photos))  {
-	    if ($p && basename($value["name"]) != "$p") {
-	    	continue;
-	    }
-	    if ($h && basename($value["name"]) == "$h") {
-	    	$color = $hlcolor ? $hlcolor : $bgcolor;
-	    } else {
-	    	$color = $bgcolor;
-	    }
-	    // $params will be used for each <img > tag
+        if (in_array("sort", $attributes))
+            sort($photos);
+        
+        if ($p) {
+            $mode = "normal";
+        }
+    
+        if ($mode == "column") {
+            $mode="normal";
+            $numcols="1";
+        }
+
+        // set some fixed properties for each $mode
+        if ($mode == 'thumbs' || $mode == 'tiles') {
+            $attributes = array_merge($attributes, "alt");
+            $attributes = array_merge($attributes, "nowrap");
+            $cellwidth  = 'auto'; // else cell won't nowrap
+            $width      = 50;
+        } elseif ($mode == 'list') {
+            $numcols    = 1;
+            $cellwidth  = "auto";
+            $width = 50;
+        } elseif ($mode == 'slide' ) {
+            $tableheight = 0; 
+            $cell_width = 0;
+            $numcols = count($photos);
+            $keep = $photos;
+            while (list($key, $value) = each($photos)) {
+                list($x,$y,$s,$t) = @getimagesize($value['src']);
+                if ($height != 'auto') $y = $this->newSize($y, $height);
+                if ($width != 'auto') $y = round($y * $this->newSize($x, $width) / $x);
+                if ($x > $cell_width) $cell_width = $x;
+                if ($y > $tableheight) $tableheight = $y;
+            }
+            $tableheight += 50;
+            $photos = $keep;
+            unset ($x,$y,$s,$t,$key,$value,$keep);
+        }
+    
+        $row = HTML();
+        $duration = 1000 * $duration;
+        if ($mode == 'slide') 
+            $row->pushContent(JavaScript("
+i = 0;
+function display_slides() {
+  j = i - 1;
+  cell0 = document.getElementsByName('wikislide' + j);
+  cell = document.getElementsByName('wikislide' + i);
+  if (cell0.item(0) != null)
+    cell0.item(0).style.display='none';
+  if (cell.item(0) != null)
+    cell.item(0).style.display='block';
+  i += 1;
+  if (cell.item(0) == null) i = 0;
+  setTimeout('display_slides()',$duration);
+}
+display_slides();"));
+
+        while (list($key, $value) = each($photos))  {
+            if ($p && basename($value["name"]) != "$p") {
+                continue;
+            }
+            if ($h && basename($value["name"]) == "$h") {
+                $color = $hlcolor ? $hlcolor : $bgcolor;
+            } else {
+                $color = $bgcolor;
+            }
+            // $params will be used for each <img > tag
             $params = array('src'    => $value["name"],
-	                    'border' => "0",
-	                    'alt'    => ($value["desc"] != "" and in_array("alt", $attributes))
+                            'src_tile' => $value["name_tile"],
+                            'border' => "0",
+                            'alt'    => ($value["desc"] != "" and in_array("alt", $attributes))
                             		? $value["desc"]
-                            		: basename($value["name"]));
-	    // check description
-	    switch ($showdesc) {
-	    	case 'none':
-	    	    $value["desc"] = '';
-	    	    break;
-	    	case 'name':
-	    	    $value["desc"] = basename($value["name"]);
-	    	    break;
-	    	case 'desc':
-	    	    break;
-	    	default: // 'both'
-	    	    if (!$value["desc"]) $value["desc"] = basename($value["name"]);
-	    	    break;
-	    }
-
-	    // FIXME: get getimagesize to work with names with spaces in it.
+    		                        : basename($value["name"]));
+            if (!@empty($value['location'])) 
+                $params = array_merge($params, array("location" => $value['location']));
+            // check description
+            switch ($showdesc) {
+            case 'none':
+                $value["desc"] = '';
+                break;
+            case 'name':
+                $value["desc"] = basename($value["name"]);
+                break;
+            case 'desc':
+                break;
+            default: // 'both'
+                if (!$value["desc"]) $value["desc"] = basename($value["name"]);
+                break;
+            }
+    
+            // FIXME: get getimagesize to work with names with spaces in it.
             // convert $value["name"] from webpath to local path
-	    $size = @getimagesize($value["name"]); // try " " => "\\ "
-	    if (!$size and !empty($value["src"])) {
-		$size = @getimagesize($value["src"]);
-		if (!$size) {
-	    	    trigger_error("Unable to getimagesize(".$value["name"].")", 
+            $size = @getimagesize($value["name"]); // try " " => "\\ "
+            if (!$size and !empty($value["src"])) {
+                $size = @getimagesize($value["src"]);
+                if (!$size) {
+                    trigger_error("Unable to getimagesize(".$value["name"].")", 
                                   E_USER_NOTICE);
-		}
-	    }
-
-	    $newwidth = $this->newSize($size[0], $width);
-	    $newheight = $this->newSize($size[1], $height);
-
-	    if ($width != 'auto' && $newwidth > 0) {
-	        $params = array_merge($params, array("width" => $newwidth));
-	    }
-	    if ($height != 'auto' && $newheight > 0) {
-	        $params = array_merge($params, array("height" => $newheight));
-	    }
-
-	    // cell operations
-	    $cell = array('align'   => "center",
+                }
+            }
+    
+            $newwidth = $this->newSize($size[0], $width);
+            if (($mode == 'thumbs' || $mode == 'tiles' || $mode == 'list')) {
+                if (!empty($size[0]))
+                    $newheight = round (50 * $size[1] / $size[0]);
+                else  $newheight = '';
+                if ($height == 'auto') $height=150;
+            }
+            else
+                $newheight = $this->newSize($size[1], $height);
+                  
+            if ($width != 'auto' && $newwidth > 0) {
+                $params = array_merge($params, array("width" => $newwidth));
+            }
+            if ($height != 'auto' && $newheight > 0) {
+                $params = array_merge($params, array("height" => $newheight));
+            }
+    
+            // cell operations
+            $cell = array('align'   => "center",
                           'valign'  => "top",
                           'bgcolor' => "$color");
-	    if ($cellwidth != 'auto') {
-	    	if ($cellwidth == 'equal') {
-	            $newcellwidth = round(100/$numcols)."%";
-	        } else if ($cellwidth == 'image') {
-	            $newcellwidth = $newwidth;
-	        } else {
-	            $newcellwidth = $cellwidth;
-	        }
+            if ($cellwidth != 'auto') {
+                if ($cellwidth == 'equal') {
+                    $newcellwidth = round(100/$numcols)."%";
+                } else if ($cellwidth == 'image') {
+                    $newcellwidth = $newwidth;
+                } else {
+                    $newcellwidth = $cellwidth;
+                }
                 $cell = array_merge($cell, array("width" => $newcellwidth));
-	    }
-	    if (in_array("nowrap", $attributes)) {
-	        $cell = array_merge($cell, array("nowrap" => "nowrap"));
-	    }
-	    //create url to display single larger version of image on page
-	    $url 	= WikiURL($request->getPage(),
-	                  array("p" => basename($value["name"])));
-	    $b_url	= WikiURL($request->getPage(),
-	                  array("h" => basename($value["name"]))).
-	                                        "#".
-	                                        basename($value["name"]);
-	    $url_text 	= $link ? HTML::a(array("href" => "$url"),
-	                                        basename($value["name"])) :
-	                                        basename($value["name"]);
-	    if (! $p) {
-	        $url_image = $link ? HTML::a(array("href" => "$url"),
-	                                           HTML::img($params)) :
-	                                           HTML::img($params);
-	    } else {
-	        $url_image = $link ? HTML::a(array("href" => "$b_url"),
-	                                           HTML::img($params)) :
-	                                           HTML::img($params);
-	    }
-	    $url_text = HTML::a(array("name" => basename($value["name"])),
-	                              $url_text);
-	    // here we use different modes
-	    if ($mode == 'tiles') {
-	    	$row->pushContent(HTML::td($cell,
-	             HTML::table(array("cellpadding" => 1, "border" => 0),
-	             HTML::tr(
-	             	   HTML::td(array("valign" => "top", "rowspan" => 2),
-	             	                   $url_image),
-	            	   HTML::td(array("valign" => "top", "nowrap" => 0),
-	            	                  HTML::small(HTML::strong($url_text)),
-	            	                  HTML::br(),
-	            	                  HTML::small($size[0].
-	            	                              " x ".
-	            	                              $size[1].
-	            	                              " pixels"))
-			      ))));
+            }
+            if (in_array("nowrap", $attributes)) {
+                $cell = array_merge($cell, array("nowrap" => "nowrap"));
+            }
+            //create url to display single larger version of image on page
+            $url     = WikiURL($request->getPage(),
+                               array("p" => basename($value["name"])))
+                . "#"
+                . basename($value["name"]);
+ 
+            $b_url    = WikiURL($request->getPage(),
+                                array("h" => basename($value["name"])))
+                . "#"
+                . basename($value["name"]);
+            $url_text   = $link 
+                ? HTML::a(array("href" => "$url"), basename($value["desc"])) 
+                : basename($value["name"]);
+            if (! $p) {
+                if ($mode == 'normal' || $mode == 'slide') {
+                    if(!@empty($params['location'])) $params['src'] = $params['location'];
+                    unset ($params['location'],$params['src_tile']);
+                    $url_image = $link ? HTML::a(array("id" => basename($value["name"])),
+                                         HTML::a(array("href" => "$url"), HTML::img($params))) :  HTML::img($params);
+                } else {
+                    $keep = $params; 
+                    if (!@empty ($params['src_tile']))
+                        $params['src'] = $params['src_tile'] ;
+                    unset ($params['location'],$params['src_tile']);
+                    $url_image = $link ? HTML::a(array("id" => basename($value["name"])),
+                                         HTML::a(array("href" => "$url"),
+                                                 ImageTile::image_tile($params))) : HTML::img($params);
+                    $params = $keep;
+                    unset ($keep);
+                }
+            } else {
+                if(!@empty($params['location'])) $params['src'] = $params['location'];
+                unset ($params['location'],$params['src_tile']);
+                $url_image = $link ? HTML::a(array("id" =>  basename($value["name"])),
+                                     HTML::a(array("href" => "$b_url"), HTML::img($params))) : HTML::img($params);
+            }
+            if ($mode == 'list')
+            $url_text = HTML::a(array("id" => basename($value["name"])),
+                                      $url_text);
+            // here we use different modes
+            if ($mode == 'tiles') {
+                $row->pushContent(
+                    HTML::td($cell,
+                    HTML::table(array("cellpadding" => 1, "border" => 0),
+                    HTML::tr(
+                             HTML::td(array("valign" => "top", "rowspan" => 2),
+                                            $url_image),
+                             HTML::td(array("valign" => "top", "nowrap" => 0),
+                                            HTML::span(array('class'=>'boldsmall'),
+                                                      ($url_text)),
+                                            HTML::br(),
+                                            HTML::span(array('class'=>'gensmall'),
+                                                       ($size[0].
+                                                       " x ".
+                                                       $size[1].
+                                                       " pixels")))
+                    ))));
             } elseif ($mode == 'list') {
-            	$desc = ($showdesc != 'none') ? $value["desc"] : '';
-	        $row->pushContent(
-	            HTML::td(array("valign"  => "top",
-	                           "nowrap"  => 0,
-	                           "bgcolor" => $color),
-	                           HTML::small(HTML::strong($url_text))));
-	        $row->pushContent(
-	            HTML::td(array("valign"  => "top",
-	                           "nowrap"  => 0,
-	                           "bgcolor" => $color),
-	                           HTML::small($size[0].
-	                                       " x ".
-	                                       $size[1].
-	                                       " pixels")));
-
-	        if ($desc != '') {
-	            $row->pushContent(HTML::td(array("valign"  => "top",
-	                                             "nowrap"  => 0,
-	                                             "bgcolor" => $color),
-	                                             HTML::small($desc)));
-	        }
-	    } elseif ($mode == 'thumbs') {
-	        $desc = ($showdesc != 'none') ?
-	                HTML::p(HTML::a(array("href" => "$url"),
-	                                $url_text)) :
-	                                '';
+                $desc = ($showdesc != 'none') ? $value["desc"] : '';
+                $row->pushContent(
+                    HTML::td(array("valign"  => "top",
+                                   "nowrap"  => 0,
+                                   "bgcolor" => $color),
+                                   HTML::span(array('class'=>'boldsmall'),($url_text))));
+                $row->pushContent(
+                    HTML::td(array("valign"  => "top",
+                                   "nowrap"  => 0,
+                                   "bgcolor" => $color),
+                                   HTML::span(array('class'=>'gensmall'),
+                                              ($size[0].
+                                               " x ".
+                                               $size[1].
+                                               " pixels"))));
+    
+                if ($desc != '')
+                    $row->pushContent(
+                        HTML::td(array("valign"  => "top",
+                                       "nowrap"  => 0,
+                                       "bgcolor" => $color),
+                                       HTML::span(array('class'=>'gensmall'),$desc)));
+    
+            } elseif ($mode == 'thumbs') {
+                $desc = ($showdesc != 'none') ?
+                            HTML::p(HTML::a(array("href" => "$url"),
+                                    $url_text)) : '';
+                $row->pushContent(
+                        (HTML::td($cell,
+                                  $url_image,
+                                  // FIXME: no HtmlElement for fontsizes?
+                                  // rurban: use ->setAttr("style","font-size:small;")
+                                  //         but better use a css class
+                                  HTML::span(array('class'=>'gensmall'),$desc)
+                                  )));
+            } elseif ($mode == 'normal') {
+                $desc = ($showdesc != 'none') ? HTML::p($value["desc"]) : '';
+                $row->pushContent(
+                        (HTML::td($cell,
+                                  $url_image,
+                                  // FIXME: no HtmlElement for fontsizes?
+                                  HTML::span(array('class'=>'gensmall'),$desc)
+                                  )));
+            } elseif ($mode == 'slide') {
+                if ($newwidth == 'auto' || !$newwidth) 
+                    $newwidth = $this->newSize($size[0],$width);
+                if ($newwidth == 'auto' || !$newwidth) 
+                    $newwidth = $size[0];
+                if ($newheight != 'auto') $newwidth = round($size[0] *  $newheight / $size[1]);
+                $desc = ($showdesc != 'none') ? HTML::p($value["desc"]) : '';
+                if ($count == 0)
+                    $cell=array('style' => 'display: block; '
+                                . 'position: absolute; '
+                                . 'left: 50% ; '
+                                . 'margin-left: -'.round($newwidth / 2).'px;'
+                                . 'text-align: center; '
+                                . 'vertical-align: top',
+                                'name' => "wikislide".$count);
+                else
+                    $cell=array('style' => 'display: none; '
+                                . 'position: absolute ;'
+                                . 'left: 50% ;'
+                                . 'margin-left: -'.round($newwidth / 2).'px;'
+                                . 'text-align: center; '
+                                . 'vertical-align: top',
+                                'name' => "wikislide".$count);
+                if ($align == 'left' || $align == 'right') {
+                    if ($count == 0)
+                        $cell=array('style' => 'display: block; '
+                                              .'position: absolute; '
+                                              . $align.': 50px; '
+                                              .'vertical-align: top',
+                                    'name' => "wikislide".$count);
+                    else
+                        $cell=array('style' => 'display: none; '
+                                              .'position: absolute; '
+                                              . $align.': 50px; '
+                                              .'vertical-align: top',
+                                    'name' => "wikislide".$count);
+                    }
                 $row->pushContent(
-                    (HTML::td($cell,
-                              $url_image,
-                              // FIXME: no HtmlElement for fontsizes?
-                              // rurban: use ->setAttr("style","font-size:small;")
-                              //         but better use a css class
-                              HTML::span(array('class'=>'gensmall'),$desc)
-                              )));
-	    } elseif ($mode == 'normal') {
-	        $desc = ($showdesc != 'none') ? HTML::p($value["desc"]) : '';
+                                  (HTML::td($cell,
+                                            $url_image,
+                                            HTML::span(array('class'=>'gensmall'), $desc)
+                                            )));
+                $count ++;
+            } elseif ($mode == 'row') {
+                $desc = ($showdesc != 'none') ? HTML::p($value["desc"]) : '';
                 $row->pushContent(
-                    (HTML::td($cell,
-                              $url_image,
-                              // FIXME: no HtmlElement for fontsizes?
-                              HTML::span(array('class'=>'gensmall'),$desc)
-                              )));
-            //} elseif ($mode == 'slide') {
-            //}
-	    } else {
+                        HTML::table(array("style" => "display: inline"),
+                              HTML::tr(HTML::td($url_image)),
+                              HTML::tr(HTML::td(array("class" => "gensmall",
+                                                      "style" => "text-align: center; "
+                                                                ."background-color: $color"),
+                                                $desc))
+                                    ));
+            } else {
                 return $this->error(fmt("Invalid argument: %s=%s", 'mode', $mode));
             }
-
-	    // no more images in one row as defined by $numcols
+    
+            // no more images in one row as defined by $numcols
             if ( ($key + 1) % $numcols == 0 ||
                  ($key + 1) == count($photos) ||
-                  $p) {
-             	$html->pushcontent(HTML::tr($row));
-             	$row->setContent('');
+                 $p) {
+                    if ($mode == 'row')
+                        $html->pushcontent(HTML::span($row));
+                    else
+                        $html->pushcontent(HTML::tr($row));
+                    $row->setContent('');
             }
         }
 
         //create main table
-        $html = HTML::table(array("border"      => 0,
-	               	          "cellpadding" => 5,
-		       		  "cellspacing" => 2,
-		                  "width"       => $tablewidth),
-		                  $html);
+        $table_attributes = array("border"      => 0,
+                                  "cellpadding" => 5,
+                                  "cellspacing" => 2,
+                                  "width"       => $tablewidth);
+        
+        if (!@empty($tableheight))
+            $table_attributes = array_merge($table_attributes,
+                                            array("height"  => $tableheight));
+        if ($mode != 'row')
+            $html = HTML::table($table_attributes, $html);
         // align all
-	return HTML::div(array("align" => $align), $html);
+        return HTML::div(array("align" => $align), $html);
     }
 
     /**
@@ -356,11 +512,11 @@
      * @return integer New size in pixels
      */
     function newSize($oldSize, $value) {
-    	if (trim(substr($value,strlen($value)-1)) != "%") {
-    	    return $value;
-    	}
-    	$value = str_replace("%", "", $value);
-    	return round(($oldSize*$value)/100);
+        if (trim(substr($value,strlen($value)-1)) != "%") {
+            return $value;
+        }
+        $value = str_replace("%", "", $value);
+        return round(($oldSize*$value)/100);
     }
 
     /**
@@ -392,14 +548,20 @@
      * @return string Error when bad url or file couldn't be opened
      */
     function fromFile($src, &$photos, $webpath='') {
-    	$src_bak = $src;
+        $src_bak = $src;
+        //there has a big security hole... as loading config/config.ini !
+        if (!preg_match('/(\.csv|\.jpg|\.jpeg|\.png|\.gif|\/)$/',$src)) {
+           return $this->error(_("File extension for csv file has to be '.csv'"));
+        }
         if (! IsSafeURL($src)) {
             return $this->error(_("Bad url in src: remove all of <, >, \""));
         }
         if (preg_match('/^(http|ftp|https):\/\//i', $src)) {
-            $src = url_get_contents($src);
-        }
-        if (!file_exists($src) and file_exists(PHPWIKI_DIR . "/$src")) {
+            $contents = url_get_contents($src);
+            $web_location = 1;
+        } else 
+            $web_location = 0;
+        if (!file_exists($src) and @file_exists(PHPWIKI_DIR . "/$src")) {
             $src = PHPWIKI_DIR . "/$src";
         }
         // check if src is a directory
@@ -418,29 +580,92 @@
             }
             foreach ($list as $file) {
                 // convert local path to webpath
-                $photos[] = array ("name" => $webpath . "/$file",
+                $photos[] = array ("src" => $file,
+                                   "name" => $webpath . "/$file",
+                                   "name_tile" =>  $src . "/$file",
                                    "src"  => $src . "/$file",
-                                   "desc" => "",
-                                   );
+                                   "desc" => "");
             }
             return;
         }
-    	@$fp = fopen ($src, "r");
-        if (!$fp) {
-            return $this->error(fmt("Unable to read src='%s'", $src));
-        }
-    	while ($data = fgetcsv ($fp, 1024, ';')) {
-    	    if (count($data) == 0 || empty($data[0]))
-    	        continue;
-    	    if (empty($data[1])) $data[1] = '';
-	    $photos[] = array ("name" => dirname($src)."/".trim($data[0]),
-                               "desc" => trim($data[1]));
+        // check if $src is an image
+        foreach (array('jpeg','jpg','png','gif') as $ext) {
+            if (preg_match("/\.$ext$/", $src)) {
+                if (!file_exists($src) and @file_exists(PHPWIKI_DIR . "/$src"))
+                    $src = PHPWIKI_DIR . "/$src";
+                if ($web_location == 1 and !empty($contents)) {
+                    $photos[] = array ("src" => $src,
+                                       "name" => $src,
+                                       "name_tile" => $src,
+                                       "src"  => $src,
+                                       "desc" => "");
+                    return;
+                }
+                if (!file_exists($src))
+                    return $this->error(fmt("Unable to find src='%s'", $src));
+                $photos[] = array ("src" => $src,
+                                   "name" => "../".$src,
+                                   "name_tile" =>  $src,
+                                   "src"  => $src,
+                                   "desc" => "");
+                return;
+            }
+        }
+        if ($web_location == 0) {
+            $fp = @fopen($src, "r");
+            if (!$fp) {
+                return $this->error(fmt("Unable to read src='%s'", $src));
+            }
+            while ($data = fgetcsv($fp, 1024, ';')) {
+                if (count($data) == 0 || empty($data[0]) 
+                                      || preg_match('/^#/',$data[0])
+                                      || preg_match('/^[[:space:]]*$/',$data[0]))
+                    continue;
+                if (empty($data[1])) $data[1] = '';
+                $photos[] = array ("name" => dirname($src)."/".trim($data[0]),
+                                   "location" => "../".dirname($src)."/".trim($data[0]),
+                                   "desc" => trim($data[1]),
+                                   "name_tile" => dirname($src)."/".trim($data[0]));
+            }
+            fclose ($fp);
+        
+        } elseif ($web_location == 1) {
+            //TODO: checks if the file is an image
+            $contents = preg_split('/\n/',$contents);
+            while (list($key,$value) = each($contents)) {
+                $data = preg_split('/\;/',$value);
+                if (count($data) == 0 || empty($data[0]) 
+                                      || preg_match('/^#/',$data[0]) 
+                                      || preg_match('/^[[:space:]]*$/',$data[0]))
+                    continue;
+                if (empty($data[1])) $data[1] = '';
+                $photos[] = array ("name" => dirname($src)."/".trim($data[0]),
+                                   "src" => dirname($src)."/".trim($data[0]),
+                                   "desc" => trim($data[1]),
+                                   "name_tile" => dirname($src)."/".trim($data[0]));
+            }
         }
-        fclose ($fp);
     }
 };
 
 // $Log: PhotoAlbum.php,v $
+// Revision 1.14  2005/10/12 06:19:07  rurban
+// protect unsafe calls
+//
+// Revision 1.13  2005/09/26 06:39:55  rurban
+// re-add lost mode=column|row. by Thomas Harding
+//
+// Revision 1.12  2005/09/20 19:34:51  rurban
+// slide and thumbs mode by Thomas Harding
+//
+//
+// Revision 1.14  2005/09/19 23:49:00 tharding
+// added slide mode, correct url retrieving with url_get_contents
+//
+// Revision 1.13  2005/09/17 18:17:00 tharding
+// add resized thumbnails (see ImageTile.php at top-level)
+// comment url_get_contents (fopen can open a web location)
+//
 // Revision 1.11  2004/12/06 19:50:05  rurban
 // enable action=remove which is undoable and seeable in RecentChanges: ADODB ony for now.
 // renamed delete_page to purge_page.
diff -ruN 11p1/lib/plugin/PluginManager.php 12p3/lib/plugin/PluginManager.php
--- 11p1/lib/plugin/PluginManager.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/PluginManager.php	2006-06-18 06:19:22.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PluginManager.php,v 1.17 2005/01/25 06:58:22 rurban Exp $');
+rcs_id('$Id: PluginManager.php,v 1.19 2005/10/12 06:15:25 rurban Exp $');
 /**
  Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
 
@@ -37,7 +37,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.17 $");
+                            "\$Revision: 1.19 $");
     }
 
     function getDefaultArguments() {
@@ -126,24 +126,9 @@
             }
             $desc = $p->getDescription();
             $ver = $p->getVersion();
-            $args = $p->getDefaultArguments();
+            $arguments = $p->getArgumentsDescription();
             unset($p); //done querying plugin object, release from memory
 
-            $arguments = HTML();
-            foreach ($args as $arg => $default) {
-                // Word around UserPreferences plugin to avoid error
-                if ((is_array($default))) {
-                    $default = '(array)';
-                    // This is a bit flawed with UserPreferences object
-                    //$default = sprintf("array('%s')",
-                    //                   implode("', '", array_keys($default)));
-                }
-                else
-                    if (stristr($default, ' '))
-                        $default = "'$default'";
-                $arguments->pushcontent("$arg=$default", HTML::br());
-            }
-
             // This section was largely improved by Pierrick Meignen:
             // make a link if an actionpage exists
             $pluginNamelink = $pluginName;
@@ -203,6 +188,12 @@
 };
 
 // $Log: PluginManager.php,v $
+// Revision 1.19  2005/10/12 06:15:25  rurban
+// just aesthetics
+//
+// Revision 1.18  2005/09/26 06:38:00  rurban
+// use the new method
+//
 // Revision 1.17  2005/01/25 06:58:22  rurban
 // reformatting
 //
diff -ruN 11p1/lib/plugin/RateIt.php 12p3/lib/plugin/RateIt.php
--- 11p1/lib/plugin/RateIt.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/RateIt.php	2006-06-18 06:19:22.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: RateIt.php,v 1.19 2004/11/15 16:00:01 rurban Exp $');
+rcs_id('$Id: RateIt.php,v 1.20 2006/03/04 13:57:28 rurban Exp $');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -94,7 +94,7 @@
     }
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.19 $");
+                            "\$Revision: 1.20 $");
     }
 
     function RatingWidgetJavascript() {
@@ -226,7 +226,7 @@
             $dbi->touch();
             //fake validators without args
             $request->appendValidators(array('wikiname' => WIKI_NAME,
-                                             'args'     => hash('')));
+                                             'args'     => wikihash('')));
             header('Content-type: image/png');
             readfile($actionImg);
             exit();
@@ -243,7 +243,7 @@
             $dbi->touch();
             //fake validators without args
             $request->appendValidators(array('wikiname' => WIKI_NAME,
-                                             'args'     => hash('')));
+                                             'args'     => wikihash('')));
             header('Content-type: image/png');
             readfile($actionImg);
             exit();
@@ -402,6 +402,9 @@
 
 
 // $Log: RateIt.php,v $
+// Revision 1.20  2006/03/04 13:57:28  rurban
+// rename hash for php-5.1
+//
 // Revision 1.19  2004/11/15 16:00:01  rurban
 // enable RateIt imgPrefix: '' or 'Star' or 'BStar',
 // enable blue prediction icons,
diff -ruN 11p1/lib/plugin/RecentChanges.php 12p3/lib/plugin/RecentChanges.php
--- 11p1/lib/plugin/RecentChanges.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/RecentChanges.php	2006-06-18 06:19:22.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: RecentChanges.php,v 1.108 2005/04/01 16:09:35 rurban Exp $');
+rcs_id('$Id: RecentChanges.php,v 1.109 2006/03/19 14:26:29 rurban Exp $');
 /**
  Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
 
@@ -125,7 +125,9 @@
 {
     function diffLink ($rev) {
         global $WikiTheme;
-        return $WikiTheme->makeButton(_("(diff)"), $this->diffURL($rev), 'wiki-rc-action');
+        $button = $WikiTheme->makeButton(_("(diff)"), $this->diffURL($rev), 'wiki-rc-action');
+        $button->setAttr('rel', 'nofollow');
+        return $button;
     }
 
     function historyLink ($rev) {
@@ -415,6 +417,7 @@
     function diffLink ($rev) {
         $linkurl = parent::diffLink($rev);
         $linkurl->setAttr('target', '_content');
+        $linkurl->setAttr('rel', 'nofollow');
         // FIXME: Smelly hack to get smaller diff buttons in sidebar
         $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', asXML($linkurl)));
         return $linkurl;
@@ -736,7 +739,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.108 $");
+                            "\$Revision: 1.109 $");
     }
 
     function managesValidators() {
@@ -924,6 +927,9 @@
 }
 
 // $Log: RecentChanges.php,v $
+// Revision 1.109  2006/03/19 14:26:29  rurban
+// sf.net patch by Matt Brown: Add rel=nofollow to more actions
+//
 // Revision 1.108  2005/04/01 16:09:35  rurban
 // fix defaults in RecentChanges plugins: e.g. invalid pagenames for PageHistory
 //
diff -ruN 11p1/lib/plugin/SiteMap.php 12p3/lib/plugin/SiteMap.php
--- 11p1/lib/plugin/SiteMap.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/SiteMap.php	2006-06-18 06:19:23.000000000 -0500
@@ -1,7 +1,7 @@
 <?php // -*-php-*-
-rcs_id('$Id: SiteMap.php,v 1.13 2004/12/14 21:36:06 rurban Exp $');
+rcs_id('$Id: SiteMap.php,v 1.15 2006/03/07 21:09:16 rurban Exp $');
 /**
- Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
+ Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
 
  This file is part of PhpWiki.
 
@@ -57,7 +57,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.13 $");
+                            "\$Revision: 1.15 $");
     }
 
     function getDefaultArguments() {
@@ -96,7 +96,8 @@
         while ($link = $pagelinks->next()) {
             $linkpagename = $link->getName();
             if (($linkpagename != $startpagename)
-                && !preg_match("/$this->ExcludedPages/", $linkpagename)) {
+                and (!$this->ExcludedPages or !preg_match("/".$this->ExcludedPages."/", $linkpagename)))
+            {
                 $pagearr[$level . " [$linkpagename]"] = $link;
                 $pagearr = $this->recursivelyGetBackLinks($link, $pagearr,
                                                           $level . '*',
@@ -123,10 +124,10 @@
         $pagelinks = $startpage->getLinks($reversed);
         while ($link = $pagelinks->next()) {
             $linkpagename = $link->getName();
-            if (($linkpagename != $startpagename)
-                && !preg_match("/$this->ExcludedPages/", $linkpagename)) {
-                if (!$this->excludeunknown
-                    || $this->dbi->isWikiPage($linkpagename)) {
+            if (($linkpagename != $startpagename) and 
+                (!$this->ExcludedPages or !preg_match("/$this->ExcludedPages/", $linkpagename)))
+            {
+                if (!$this->excludeunknown or $this->dbi->isWikiPage($linkpagename)) {
                     $pagearr[$level . " [$linkpagename]"] = $link;
                     $pagearr = $this->recursivelyGetLinks($link, $pagearr,
                                                           $level . '*',
@@ -151,7 +152,7 @@
         if (empty($exclude)) $exclude = array();
         if (!$include_self)
             $exclude[] = $page;
-        $this->ExcludedPages = "^(?:" . join("|", $exclude) . ")";
+        $this->ExcludedPages = empty($exclude) ? "" : ("^(?:" . join("|", $exclude) . ")");
         $this->_default_limit = str_pad('', 3, '*');
         if (is_numeric($reclimit)) {
             if ($reclimit < 0)
@@ -202,7 +203,8 @@
                 $a = substr_count($key, '*');
                 $indenter = str_pad($nothing, $a);
                 //$request->setArg('IncludePage', 1);
-                $plugin_args = 'page=' . $link->getName() . ' ' . $includepages;
+                // quote linkname, by Stefan Schorn
+                $plugin_args = 'page=\'' . $link->getName() . '\' ' . $includepages;
                 $pagehtml = $plugin->run($dbi, $plugin_args, $request, $basepage);
                 $html->pushContent($pagehtml); 
                 //$html->pushContent( HTML(TransformText($indenter, 1.0, $page), $pagehtml)); 
@@ -221,6 +223,9 @@
 };
 
 // $Log: SiteMap.php,v $
+// Revision 1.15  2006/03/07 21:09:16  rurban
+// fix syntax error
+//
 // Revision 1.13  2004/12/14 21:36:06  rurban
 // exclude is already handled by getArgs
 //
@@ -272,4 +277,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
+?>
\ No newline at end of file
diff -ruN 11p1/lib/plugin/SystemInfo.php 12p3/lib/plugin/SystemInfo.php
--- 11p1/lib/plugin/SystemInfo.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/SystemInfo.php	2006-06-18 06:19:23.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: SystemInfo.php,v 1.22 2004/12/26 17:10:44 rurban Exp $');
+rcs_id('$Id: SystemInfo.php,v 1.23 2005/10/03 16:48:09 rurban Exp $');
 /**
  Copyright (C) 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
 
@@ -36,14 +36,13 @@
  *
  * In spirit to http://www.ecyrd.com/JSPWiki/SystemInfo.jsp
  *
- * Todo: Some calculations are heavy (~5-8 secs), so we should cache
+ * Done: Some calculations are heavy (~5-8 secs), so we should cache
  *       the result. In the page or with WikiPluginCached?
  */
 
 require_once "lib/WikiPluginCached.php";
 class WikiPlugin_SystemInfo
 extends WikiPluginCached
-//extends WikiPlugin
 {
     function getPluginType() {
         return PLUGIN_CACHED_HTML;
@@ -58,9 +57,17 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.22 $");
+                            "\$Revision: 1.23 $");
+    }
+    /* From lib/WikiPlugin.php:
+     * If the plugin can deduce a modification time, or equivalent
+     * sort of tag for it's content, then the plugin should
+     * call $request->appendValidators() with appropriate arguments,
+     * and should override this method to return true.
+     */
+    function managesValidators() {
+        return true;
     }
-
     function getExpire($dbi, $argarray, $request) {
         return '+1800'; // 30 minutes
     }
@@ -79,38 +86,42 @@
     */
 
     function database() {
-        global $DBParams, $request;
-        $s  = _("db type:") . " {$DBParams['dbtype']}, ";
-        switch ($DBParams['dbtype']) {
+        global $request;
+        $s  = "DATABASE_TYPE: " . DATABASE_TYPE . ", ";
+        switch (DATABASE_TYPE) {
         case 'SQL':     // pear
         case 'ADODB':
-            $dsn = $DBParams['dsn'];
-            $s .= _("db backend:") . " ";
-            $s .= ($DBParams['dbtype'] == 'SQL') ? 'PearDB' : 'ADODB';
+        case 'PDO':
+            $dsn = DATABASE_DSN;
+            $s .= "DATABASE BACKEND:" . " ";
+            $s .= (DATABASE_TYPE == 'SQL') ? 'PearDB' : 'ADODB';
             if (preg_match('/^(\w+):/', $dsn, $m)) {
                 $backend = $m[1];
                 $s .= " $backend, ";
             }
+            $s .= "DATABASE_PREFIX: \"".DATABASE_PREFIX."\", ";
             break;
         case 'dba':
-            $s .= _("dba handler:") . " {$DBParams['dba_handler']}, ";
+            $s .= "DATABASE_DBA_HANDLER: ".DATABASE_DBA_HANDLER.", ";
+            $s .= "DATABASE_DIRECTORY: \"".DATABASE_DIRECTORY."\", ";
             break;
         case 'cvs':
+            $s .= "DATABASE_DIRECTORY: \"".DATABASE_DIRECTORY."\", ";
             // $s .= "cvs stuff: , ";
             break;
         case 'flatfile':
-            // $s .= "flatfile stuff: , ";
+            $s .= "DATABASE_DIRECTORY: ".DATABASE_DIRECTORY.", ";
             break;
         }
         // hack: suppress error when using sql, so no timeout
-        @$s .= _("timeout:") . " {$DBParams['timeout']}";
+        @$s .= "DATABASE_TIMEOUT: " . DATABASE_TIMEOUT . ", ";
         return $s;
     }
     function cachestats() {
-        global $DBParams, $request;
+        global $request;
         if (! defined('USECACHE') or !USECACHE)
             return _("no cache used");
-        $dbi = $request->getDbh();
+        $dbi =& $this->_dbi;
         $cache = $dbi->_cache;
         $s  = _("cached pagedata:") . " " . count($cache->_pagedata_cache);
         $s .= ", " . _("cached versiondata:");
@@ -161,7 +172,7 @@
     //   easy. related to the view/edit rate in accessstats.
     function userstats() {
         global $request;
-        $dbi = $request->getDbh();
+        $dbi =& $this->_dbi;
         $h = 0;
         $page_iter = $dbi->getAllPages(true);
         while ($page = $page_iter->next()) {
@@ -185,44 +196,24 @@
         return $s;
     }
 
-    // only absolute numbers, not for any time interval. see accessstats
-    //  some useful number derived from the curve of the hit stats.
-    //  total, max, mean, median, stddev;
-    //  %d pages less than 3 hits (<10%)    <10% percent of the leastpopular
-    //  %d pages more than 100 hits (>90%)  >90% percent of the mostpopular
-    function hitstats() {
-        global $request;
-        $dbi = $request->getDbh();
-        $total = 0;
-        $max = 0;
-        $hits = array();
-        $page_iter = $dbi->getAllPages(true);
-        while ($page = $page_iter->next()) {
-            if (($current = $page->getCurrentRevision())
-                && (! $current->hasDefaultContents())) {
-                $h = $page->get('hits');
-                $hits[] = $h;
-                $total += $h;
-                $max = max($h, $max);
-            }
-        }
+    // numeric array
+    function _stats($hits, $treshold = 10.0) {
         sort($hits);
         reset($hits);
         $n = count($hits);
+        $max = 0; $min = 9999999999999; $sum = 0;
+        foreach ($hits as $h) {
+            $sum += $h;
+            $max = max($h, $max);
+            $min = min($h, $min);
+        }
         $median_i = (int) $n / 2;
         if (! ($n / 2))
             $median = $hits[$median_i];
         else
             $median = $hits[$median_i];
-        $stddev = stddev($hits, $total);
-
-        $s  = sprintf(_("total hits: %d"), $total);
-        $s .= ", " . sprintf(_("max: %d"), $max);
-        $s .= ", " . sprintf(_("mean: %2.3f"), $total / $n);
-        $s .= ", " . sprintf(_("median: %d"), $median);
-        $s .= ", " . sprintf(_("stddev: %2.3f"), $stddev);
-        $percentage = 10;
-        $mintreshold = $max * $percentage / 100.0;   // lower than 10% of the hits
+        $treshold = 10;
+        $mintreshold = $max * $treshold / 100.0;   // lower than 10% of the hits
         reset($hits);
         $nmin = $hits[0] < $mintreshold ? 1 : 0;
         while (next($hits) < $mintreshold)
@@ -232,50 +223,184 @@
         $nmax = 1;
         while (prev($hits) > $maxtreshold)
             $nmax++;
+        return array('n'     => $n,
+                     'sum'   => $sum,
+                     'min'   => $min,
+                     'max'   => $max,
+                     'mean'  => $sum / $n,
+                     'median'=> $median,
+                     'stddev'=> stddev($hits, $sum),
+                     'treshold'    => $treshold,
+                     'nmin'        => $nmin,
+                     'mintreshold' => $mintreshold,
+                     'nmax'        => $nmax, 
+                     'maxtreshold' => $maxtreshold);
+    }
+
+    // only absolute numbers, not for any time interval. see accessstats
+    //  some useful number derived from the curve of the hit stats.
+    //  total, max, mean, median, stddev;
+    //  %d pages less than 3 hits (<10%)    <10% percent of the leastpopular
+    //  %d pages more than 100 hits (>90%)  >90% percent of the mostpopular
+    function hitstats() {
+        global $request;
+        $dbi =& $this->_dbi;
+        $hits = array();
+        $page_iter = $dbi->getAllPages(true);
+        while ($page = $page_iter->next()) {
+            if (($current = $page->getCurrentRevision())
+                && (! $current->hasDefaultContents())) {
+                $hits[] = $page->get('hits');
+            }
+        }
+        $treshold = 10.0;
+        $stats = $this->_stats($hits, $treshold);
+
+        $s  = sprintf(_("total hits: %d"), $stats['sum']);
+        $s .= ", " . sprintf(_("max: %d"), $stats['max']);
+        $s .= ", " . sprintf(_("mean: %2.3f"), $stats['mean']);
+        $s .= ", " . sprintf(_("median: %d"), $stats['median']);
+        $s .= ", " . sprintf(_("stddev: %2.3f"), $stats['stddev']);
         $s .= "; " . sprintf(_("%d pages with less than %d hits (<%d%%)."),
-                             $nmin, $mintreshold, $percentage);
+                             $stats['nmin'], $stats['mintreshold'], $treshold);
         $s .= " " . sprintf(_("%d page(s) with more than %d hits (>%d%%)."),
-                            $nmax, $maxtreshold, 100 - $percentage);
+                            $stats['nmax'], $stats['maxtreshold'], 100 - $treshold);
         return $s;
     }
+    /* not yet ready
+     */
     function revisionstats() {
-        global $request;
-        $dbi = $request->getDbh();
-        $total = 0;
-        $max = 0;
-        $hits = array();
+        global $request, $LANG;
+
+        include_once("lib/WikiPluginCached.php");
+        $cache = WikiPluginCached::newCache();
+        $id = $cache->generateId('SystemInfo::revisionstats_' . $LANG);
+        $cachedir = 'plugincache';
+        $content = $cache->get($id, $cachedir);
+
+        if (!empty($content))
+            return $content;
+
+        $dbi =& $this->_dbi;
+        $stats = array();
         $page_iter = $dbi->getAllPages(true);
+        $stats['empty'] = $stats['latest']['major'] = $stats['latest']['minor'] = 0;
         while ($page = $page_iter->next()) {
-            if ($current = $page->getCurrentRevision()
-                && (! $current->hasDefaultContents())) {
-                //$ma = $page->get('major');
-                //$mi = $page->get('minor');
-                ;
+            if (!$page->exists()) {
+                $stats['empty']++;
+                continue;
+            }
+            $current = $page->getCurrentRevision();
+            // is the latest revision a major or minor one?
+            //   latest revision: numpages 200 (100%) / major (60%) / minor (40%)
+            if ($current->get('is_minor_edit'))
+                $stats['latest']['major']++;
+            else
+                $stats['latest']['minor']++;
+/*
+            // FIXME: This needs much too long to be acceptable.
+            // overall:
+            //   number of revisions: all (100%) / major (60%) / minor (40%)
+            // revs per page:
+            //   per page: mean 20 / major (60%) / minor (40%)
+            $rev_iter = $page->getAllRevisions();
+            while ($rev = $rev_iter->next()) {
+                if ($rev->get('is_minor_edit'))
+                    $stats['page']['major']++;
+                else
+                    $stats['page']['minor']++;
             }
+            $rev_iter->free();
+            $stats['page']['all'] = $stats['page']['major'] + $stats['page']['minor'];
+            $stats['perpage'][]       = $stats['page']['all'];
+            $stats['perpage_major'][] = $stats['page']['major'];
+            $stats['sum']['all'] += $stats['page']['all'];
+            $stats['sum']['major'] += $stats['page']['major'];
+            $stats['sum']['minor'] += $stats['page']['minor'];
+            $stats['page'] = array();
+*/            
         }
-        return 'not yet';
+        $page_iter->free();
+        $stats['numpages'] = $stats['latest']['major'] + $stats['latest']['minor'];
+        $stats['latest']['major_perc'] = $stats['latest']['major'] * 100.0 / $stats['numpages'];
+        $stats['latest']['minor_perc'] = $stats['latest']['minor'] * 100.0 / $stats['numpages'];
+        $empty = sprintf("empty pages: %d (%02.1f%%) / %d (100%%)\n", 
+                         $stats['empty'], $stats['empty'] * 100.0 / $stats['numpages'],
+                         $stats['numpages']);
+        $latest = sprintf("latest revision: major %d (%02.1f%%) / minor %d (%02.1f%%) / all %d (100%%)\n", 
+                          $stats['latest']['major'], $stats['latest']['major_perc'], 
+                          $stats['latest']['minor'], $stats['latest']['minor_perc'], $stats['numpages']);
+/*                          
+        $stats['sum']['major_perc'] = $stats['sum']['major'] * 100.0 / $stats['sum']['all'];
+        $stats['sum']['minor_perc'] = $stats['sum']['minor'] * 100.0 / $stats['sum']['all'];
+        $sum = sprintf("number of revisions: major %d (%02.1f%%) / minor %d (%02.1f%%) / all %d (100%%)\n", 
+                       $stats['sum']['major'], $stats['sum']['major_perc'],
+                       $stats['sum']['minor'], $stats['sum']['minor_perc'], $stats['sum']['all']);
+
+        $stats['perpage']       = $this->_stats($stats['perpage']);
+        $stats['perpage_major'] = $this->_stats($stats['perpage_major']);
+        $stats['perpage']['major_perc'] = $stats['perpage_major']['sum'] * 100.0 / $stats['perpage']['sum'];
+        $stats['perpage']['minor_perc'] = 100 - $stats['perpage']['major_perc'];
+        $stats['perpage_minor']['sum']  = $stats['perpage']['sum'] - $stats['perpage_major']['sum'];
+        $stats['perpage_minor']['mean'] = $stats['perpage_minor']['sum'] / ($stats['perpage']['n'] - $stats['perpage_major']['n']);
+        $perpage = sprintf("revisions per page: all %d, mean %02.1f / major %d (%02.1f%%) / minor %d (%02.1f%%)\n", 
+                           $stats['perpage']['sum'], $stats['perpage']['mean'],
+                           $stats['perpage_major']['mean'], $stats['perpage']['major_perc'],
+                           $stats['perpage_minor']['mean'], $stats['perpage']['minor_perc']);
+        $perpage .= sprintf("  %d page(s) with less than %d revisions (<%d%%)\n",
+                            $stats['perpage']['nmin'], $stats['perpage']['maintreshold'], $treshold);
+        $perpage .= sprintf("  %d page(s) with more than %d revisions (>%d%%)\n",
+                            $stats['perpage']['nmax'], $stats['perpage']['maxtreshold'], 100 - $treshold);
+        $content = $empty . $latest . $sum . $perpage;
+*/
+        $content = $empty . $latest;
+
+        // regenerate cache every 30 minutes
+        $cache->save($id, $content, '+1800', $cachedir); 
+        return $content;
     }
     // Size of databases/files/cvs are possible plus the known size of the app.
-    // Todo: cache this costly operation!
+    // Cache this costly operation. 
+    // Even if the whole plugin call is stored internally, we cache this 
+    // seperately with a seperate key.
     function discspace() {
-        global $DBParams;
-        $dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : '.';
-        $appsize = `du -s $dir | cut -f1`;
-
-        if (in_array($DBParams['dbtype'], array('SQL', 'ADODB'))) {
-            $pagesize = 0;
-        } elseif ($DBParams['dbtype'] == 'dba') {
-            $pagesize = 0;
-            $dbdir = $DBParams['directory'];
-            if ($DBParams['dba_handler'] == 'db3')
-                $pagesize = filesize($DBParams['directory']
-                                     . "/wiki_pagedb.db3") / 1024;
-            // if issubdirof($dbdir, $dir) $appsize -= $pagesize;
-        } else { // flatfile, cvs
-            $dbdir = $DBParams['directory'];
-            $pagesize = `du -s $dbdir`;
-            // if issubdirof($dbdir, $dir) $appsize -= $pagesize;
+        global $DBParams, $request;
+
+        include_once("lib/WikiPluginCached.php");
+        $cache = WikiPluginCached::newCache();
+        $id = $cache->generateId('SystemInfo::discspace');
+        $cachedir = 'plugincache';
+        $content = $cache->get($id, $cachedir);
+
+        if (empty($content)) {
+            $dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : '.';
+            //TODO: windows only (no cygwin)
+            $appsize = `du -s $dir | cut -f1`;
+
+            if (in_array($DBParams['dbtype'], array('SQL', 'ADODB'))) {
+                //TODO: where is the data is actually stored? see phpMyAdmin
+                $pagesize = 0;
+            } elseif ($DBParams['dbtype'] == 'dba') {
+                $pagesize = 0;
+                $dbdir = $DBParams['directory'];
+                if ($DBParams['dba_handler'] == 'db3')
+                    $pagesize = filesize($DBParams['directory']
+                                         . "/wiki_pagedb.db3") / 1024;
+                // if issubdirof($dbdir, $dir) $appsize -= $pagesize;
+            } else { // flatfile, cvs
+                $dbdir = $DBParams['directory'];
+                $pagesize = `du -s $dbdir`;
+                // if issubdirof($dbdir, $dir) $appsize -= $pagesize;
+            }
+            $content = array('appsize' => $appsize,
+                             'pagesize' => $pagesize);
+            // regenerate cache every 30 minutes
+            $cache->save($id, $content, '+1800', $cachedir); 
+        } else {
+            $appsize = $content['appsize'];
+            $pagesize = $content['pagesize'];
         }
+
         $s  = sprintf(_("Application size: %d Kb"), $appsize);
         if ($pagesize)
             $s  .= ", " . sprintf(_("Pagedata size: %d Kb", $pagesize));
@@ -341,6 +466,7 @@
     function run($dbi, $argstr, &$request, $basepage) {
         // don't parse argstr for name=value pairs. instead we use just 'name'
         //$args = $this->getArgs($argstr, $request);
+        $this->_dbi =& $dbi;
         $args['seperator'] = ' ';
         $availableargs = // name => callback + 0 args
             array ('appname' => create_function('',"return 'PhpWiki';"),
@@ -368,7 +494,7 @@
                              'userstats'        => _("User statistics"),
                              //'accessstats'      => _("Access statistics"),
                              'hitstats'         => _("Hit statistics"),
-                             //'discspace'        => _("Harddisc usage"),
+                             'discspace'        => _("Harddisc usage"),
                              'expireparams'     => _("Expiry parameters"),
                              'wikinameregexp'   => _("Wikiname regexp"),
                              'allowedprotocols' => _("Allowed protocols"),
@@ -446,6 +572,9 @@
 }
 
 // $Log: SystemInfo.php,v $
+// Revision 1.23  2005/10/03 16:48:09  rurban
+// add revstats and arg caching
+//
 // Revision 1.22  2004/12/26 17:10:44  rurban
 // just docs or whitespace
 //
@@ -527,4 +656,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
+?>
\ No newline at end of file
diff -ruN 11p1/lib/plugin/UserPreferences.php 12p3/lib/plugin/UserPreferences.php
--- 11p1/lib/plugin/UserPreferences.php	2005-06-05 00:07:54.000000000 -0500
+++ 12p3/lib/plugin/UserPreferences.php	2006-06-18 06:19:23.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: UserPreferences.php,v 1.35 2004/10/13 14:13:55 rurban Exp $');
+rcs_id('$Id: UserPreferences.php,v 1.37 2006/03/07 21:06:56 rurban Exp $');
 /**
  Copyright (C) 2001,2002,2003,2004,2005 $ThePhpWikiProgrammingTeam
 
@@ -40,7 +40,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.35 $");
+                            "\$Revision: 1.37 $");
     }
 
     function getDefaultArguments() {
@@ -69,9 +69,9 @@
             return '';
         if ((!$request->isActionPage($request->getArg('pagename')) 
              and (!isset($user->_prefs->_method) 
-                  or !in_array($user->_prefs->_method,array('ADODB','SQL'))))
-            or (in_array($request->getArg('action'),array('zip','ziphtml','dumphtml')))
-            or (isa($user,'_ForbiddenUser'))) 
+                  or !in_array($user->_prefs->_method, array('ADODB','SQL','PDO'))))
+            or (in_array($request->getArg('action'), array('zip','ziphtml','dumphtml')))
+            or (isa($user,'_ForbiddenUser')))
         {
             $no_args = $this->getDefaultArguments();
 // ?
@@ -169,6 +169,12 @@
 };
 
 // $Log: UserPreferences.php,v $
+// Revision 1.37  2006/03/07 21:06:56  rurban
+// add PdoDbPassUser
+//
+// Revision 1.36  2005/06/30 05:17:14  rurban
+// update (c) date
+//
 // Revision 1.35  2004/10/13 14:13:55  rurban
 // fix cannot edit prefs
 //
diff -ruN 11p1/lib/plugin/UserRatings.php 12p3/lib/plugin/UserRatings.php
--- 11p1/lib/plugin/UserRatings.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/UserRatings.php	2006-06-18 06:19:23.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: UserRatings.php,v 1.3 2004/11/07 16:02:52 rurban Exp $');
+rcs_id('$Id: UserRatings.php,v 1.4 2005/09/30 18:41:39 uckelman Exp $');
 /**
  Copyright 2004 Dan Frankowski
 
@@ -53,7 +53,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.3 $");
+                            "\$Revision: 1.4 $");
     }
 
     function getDefaultArguments() {
@@ -187,10 +187,10 @@
             $user = & RatingsUserFactory::getUser($userid);
             if($user->allow_view_ratings($active_user))
             {
-                array_push($allowed_users_toshow, &$user);
+                array_push($allowed_users_toshow, $user);
             }
             // all users should be allowed in calculation
-            array_push($allowed_users, &$user);
+            array_push($allowed_users, $user);
             // This line ensures $user is not a reference type after this loop
             // If it is a reference type, that can produce very unexpected behavior!
             unset($user);
@@ -205,7 +205,7 @@
             while($people_array = $people_iter->next()){
                 $userid = $people_array['pagename']; 
                 $user = & RatingsUserFactory::getUser($userid);
-                array_push($allowed_users, &$user);
+                array_push($allowed_users, $user);
             }
             
          }
diff -ruN 11p1/lib/plugin/VisualWiki.php 12p3/lib/plugin/VisualWiki.php
--- 11p1/lib/plugin/VisualWiki.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/VisualWiki.php	2006-06-18 06:19:23.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: VisualWiki.php,v 1.18 2004/12/17 16:49:52 rurban Exp $');
+rcs_id('$Id: VisualWiki.php,v 1.19 2005/10/12 06:19:31 rurban Exp $');
 /*
  Copyright (C) 2002 Johannes Groe (Johannes Gro&szlig;e)
 
@@ -55,7 +55,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.18 $");
+                            "\$Revision: 1.19 $");
     }
 
     /**
@@ -162,7 +162,8 @@
         /* ($dbi,  $large, $recent, $refined, $backlink,
             $neighbour, $excludelist, $includelist, $color); */
         return $this->invokeDot($argarray);
-        /* ($width, $height, $color, $shape, $text); */
+        /* => ($width, $height, $color, $shape, $text); */
+	
     }
 
     // ------------------------------------------------------------------------------------------
@@ -274,7 +275,7 @@
     *                              should not be displayed (like PhpWiki, for
     *                              example)
     * @param  INCLUDELIST string   colon separated list of pages which are
-    *                              allways included (for example your own
+    *                              always included (for example your own
     *                              page :)
     * @param  COLOR       string   'age', 'revtime' or 'none'; Selects which
     *                              page feature is used to determine the
@@ -288,20 +289,25 @@
 
         extract($argarray);
         // FIXME: gettextify?
-        $exclude_list   = explode(':', $exclude_list);
-        $include_list   = explode(':', $include_list);
-        $neighbour_list = explode(':', $neighbour_list);
-
-        // FIXME remove INCLUDED from EXCLUDED
+        $exclude_list   = $exclude_list ? explode(':', $exclude_list) : array();
+        $include_list   = $include_list ? explode(':', $include_list) : array();
+        $neighbour_list = $neighbour_list ? explode(':', $neighbour_list) : array();
+
+        // remove INCLUDED from EXCLUDED, includes override excludes.
+        if ($exclude_list and $include_list) {
+        	$diff = array_diff($exclude_list, $include_list);
+        	if ($diff)
+        	    $exclude_list = $diff;
+        }
 
         // collect all pages
-        $allpages = $dbi->getAllPages();
+        $allpages = $dbi->getAllPages(false, false, false, $exclude_list);
         $pages = &$this->pages;
         $countpages = 0;
         while ($page = $allpages->next()) {
             $name = $page->getName();
 
-            // skip exluded pages
+            // skip excluded pages
             if (in_array($name, $exclude_list)) {
             	$page->free();	
                 continue;
@@ -331,12 +337,12 @@
                 unset($con);
             }
 
-            unset($currev);
-            $currev = $page->getCurrentRevision();
+            unset($rev);
+            $rev = $page->getCurrentRevision();
 
             $pages[$name] = array(
-                'age'         => $now - $currev->get('mtime'),
-                'revnr'       => $currev->getVersion(),
+                'age'         => $now - $rev->get('mtime'),
+                'revnr'       => $rev->getVersion(),
                 'links'       => array(),
                 'backlink_nb' => count($bconnection),
                 'backlinks'   => $bconnection,
@@ -375,7 +381,7 @@
 
         // remove dead links and collect links
         reset($pages);
-        while( list($name,$page) = each($pages) ) {
+        while( list($name, $page) = each($pages) ) {
             if (is_array($page['backlinks'])) {
                 reset($page['backlinks']);
                 while ( list($index, $link) = each( $page['backlinks'] ) ) {
@@ -421,7 +427,7 @@
         $ok = true;
         $names = &$this->names;
         $pages = &$this->pages;
-	if ($names)
+        if ($names)
             $nametonumber = array_flip($names);
 
         $dot = "digraph VisualWiki {\n" // }
@@ -498,13 +504,13 @@
                 $legend[] = $name;
             }
             $dot .= '        '. join(' -> ', $legend)
-                 . ";\n    }\n";
-
+		. ";\n    }\n";
         }
 
         // {
         $dot .= "}\n";
-
+        $this->source = $dot;
+        // write a temp file
         $ok = fwrite($fp, $dot);
         $ok = fclose($fp) && $ok;  // close anyway
 
@@ -611,6 +617,9 @@
 }
 
 // $Log: VisualWiki.php,v $
+// Revision 1.19  2005/10/12 06:19:31  rurban
+// remove INCLUDED from EXCLUDED, includes override excludes.
+//
 // Revision 1.18  2004/12/17 16:49:52  rurban
 // avoid Invalid username message on Sign In button click
 //
@@ -684,4 +693,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/plugin/WikiAdminMarkup.php 12p3/lib/plugin/WikiAdminMarkup.php
--- 11p1/lib/plugin/WikiAdminMarkup.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/WikiAdminMarkup.php	2006-06-18 06:19:23.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: WikiAdminChown.php,v 1.8 2005/01/29 19:48:14 rurban Exp $');
+rcs_id('$Id: WikiAdminMarkup.php,v 1.1 2005/09/18 13:06:24 rurban Exp $');
 /*
  Copyright 2005 $ThePhpWikiProgrammingTeam
 
@@ -43,7 +43,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.8 $");
+                            "\$Revision: 1.1 $");
     }
 
     function getDefaultArguments() {
@@ -185,7 +185,10 @@
     }
 }
 
-// $Log: WikiAdminChown.php,v $
+// $Log: WikiAdminMarkup.php,v $
+// Revision 1.1  2005/09/18 13:06:24  rurban
+// already added to 1.3.11
+//
 //
 
 // Local Variables:
diff -ruN 11p1/lib/plugin/WikiAdminUtils.php 12p3/lib/plugin/WikiAdminUtils.php
--- 11p1/lib/plugin/WikiAdminUtils.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/WikiAdminUtils.php	2006-06-18 06:19:24.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: WikiAdminUtils.php,v 1.17 2005/02/12 17:24:24 rurban Exp $');
+rcs_id('$Id: WikiAdminUtils.php,v 1.19 2006/04/15 12:27:40 rurban Exp $');
 /**
  Copyright 2003, 2004 $ThePhpWikiProgrammingTeam
 
@@ -42,7 +42,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.17 $");
+                            "\$Revision: 1.19 $");
     }
 
     function getDefaultArguments() {
@@ -129,7 +129,7 @@
         while (($page = $pages->next())) {
             $pagename = $page->getName();
             $wpn = new WikiPageName($pagename);
-            if (! $wpn->isValid()) {
+            if (! $wpn->isValid() ) {
                 $dbi->purgePage($pagename);
                 $list->pushContent(HTML::li($pagename));
                 $count++;
@@ -137,7 +137,7 @@
         }
         $pages->free();
         if (!$count)
-            return _("No pages with bad names were found.");
+            return _("No pages with bad names had to be deleted.");
         else {
             return HTML(fmt("Deleted %s pages with invalid names:", $count),
                         HTML::div(array('align'=>'left'), $list));
@@ -228,7 +228,10 @@
             if ($prefs->get('email')) {
             	if (!$prefs->get('userid'))
             	    $prefs->set('userid',$username);
-                $group = (int)(count($pagelist->_rows) / $pagelist->_group_rows);
+                if (!empty($pagelist->_rows))
+                    $group = (int)(count($pagelist->_rows) / $pagelist->_group_rows);
+                else 
+                    $group = 0;
                 $class = ($group % 2) ? 'oddrow' : 'evenrow';
                 $row = HTML::tr(array('class' => $class));
                 $page_handle = $dbi->getPage($username);
diff -ruN 11p1/lib/plugin/WikiBlog.php 12p3/lib/plugin/WikiBlog.php
--- 11p1/lib/plugin/WikiBlog.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/WikiBlog.php	2006-06-18 06:19:24.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: WikiBlog.php,v 1.22 2004/12/15 15:33:18 rurban Exp $');
+rcs_id('$Id: WikiBlog.php,v 1.23 2005/10/29 09:06:37 rurban Exp $');
 /*
  Copyright 2002, 2003 $ThePhpWikiProgrammingTeam
  
@@ -81,7 +81,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.22 $");
+                            "\$Revision: 1.23 $");
     }
 
     // Arguments:
@@ -356,9 +356,38 @@
         return new Template($template, $request,
                             array('PAGENAME' => $args['pagename']));
     }
+
+    // "2004-12" => "December 2004"
+    function _monthTitle($month){
+        //list($year,$mon) = explode("-",$month);
+        return strftime("%B %Y", strtotime($month."-01"));
+    }
+
+    // "User/Blog/2004-12-13/12:28:50+01:00" => array('month' => "2004-12", ...)
+    function _blog($rev_or_page) {
+    	$pagename = $rev_or_page->getName();
+        if (preg_match("/^(.*Blog)\/(\d\d\d\d-\d\d)-(\d\d)\/(.*)/", $pagename, $m))
+            list(,$prefix,$month,$day,$time) = $m;
+        return array('pagename' => $pagename,
+                     // page (list pages per month) or revision (list months)?
+                     //'title' => isa($rev_or_page,'WikiDB_PageRevision') ? $rev_or_page->get('summary') : '',
+                     //'monthtitle' => $this->_monthTitle($month),
+                     'month'   => $month,
+                     'day'     => $day,
+                     'time'    => $time,
+                     'prefix'  => $prefix);
+    }
+
+    function _nonDefaultArgs($args) {
+    	return array_diff_assoc($args, $this->getDefaultArguments());
+    }
+
 };
 
 // $Log: WikiBlog.php,v $
+// Revision 1.23  2005/10/29 09:06:37  rurban
+// move common blog methods to WikiBlog
+//
 // Revision 1.22  2004/12/15 15:33:18  rurban
 // Blogs => Blog
 //
diff -ruN 11p1/lib/plugin/WikiFormRich.php 12p3/lib/plugin/WikiFormRich.php
--- 11p1/lib/plugin/WikiFormRich.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/WikiFormRich.php	2006-06-18 06:19:24.000000000 -0500
@@ -28,7 +28,8 @@
  * - editbox[] 		name=.. value=.. text=..
  * - checkbox[] 	name=.. value=0|1 checked text=..
  * - radio[] 	        name=.. value=.. text=..
- * - pulldown[]		name=.. values=.. selected=.. text=..
+ * - pulldown[]		name=.. value=.. selected=.. text=..
+ * - combobox[]		name=.. method=.. value=.. selected=.. text=..
  * - hidden[]		name=.. value=..
  * - submit[]
  * - action, submit buttontext, optional cancel button (bool)
@@ -108,7 +109,7 @@
      */
     function handle_plugin_args_cruft($argstr, $args) {
     	$allowed = array("editbox", "hidden", "checkbox", "radiobutton"/*deprecated*/,
-    			 "radio", "pulldown", "submit", "reset");
+    			 "radio", "pulldown", "submit", "reset", "combobox");
     	// no editbox[] = array(...) allowed (space)
     	$arg_array = preg_split("/\n/", $argstr);
     	// for security we should check this better
@@ -126,7 +127,7 @@
                     $curargs = substr($curargs, strlen($m[0]));
                     if (preg_match("/^\"(.*)\"$/", $value, $m))
                         $value = $m[1];
-                    if (in_array($name, array("pulldown","checkbox","radio","radiobutton"))
+                    if (in_array($name, array("pulldown","checkbox","radio","radiobutton","combobox"))
                             and preg_match('/^<!plugin-list.+!>$/', $value, $m))
             	    // like pulldown[] name=test value=<!plugin-list BackLinks page=HomePage!>
                     {
@@ -225,6 +226,36 @@
                   else
                       $form->pushContent(HTML::div(array('class' => $class), HTML::input($input), $text));
                   break;
+              case 'combobox':
+                  // TODO: moACDROPDOWN
+                  $values = $input['value'];
+                  unset($input['value']);
+                  $input['type'] = 'text';
+                  if (is_string($values)) $values = explode(",", $values);
+                  if (empty($values)) {
+                      if ($input['method'])
+                          $input['value'] = xmlrequest($input['method']);
+                       elseif ($s = $request->getArg($input['name']))
+                           $input['value'] = $s;
+                  } elseif (is_array($values)) {
+                      $name = $input['name'];
+                      unset($input['name']);
+                      foreach ($values as $val) {
+                          $input = array('value' => $val);
+                          if ($request->getArg($name)) {
+                              if ($request->getArg($name) == $val)
+                                  $input['selected'] = 'selected';
+                              else
+                                  unset($input['selected']);
+                          }
+                          //$select->pushContent(HTML::option($input, $val));
+                      }
+                  }
+                  if ($nobr)
+                      $form->pushContent(HTML::input($input), $nbsp, $text, $nbsp);
+                  else
+                      $form->pushContent(HTML::div(array('class' => $class), HTML::input($input), $text));
+                  break;
               case 'pulldown':
                   $values = $input['value'];
                   unset($input['value']);
@@ -237,7 +268,7 @@
                       $name = $input['name'];
                       unset($input['name']);
                       foreach ($values as $val) {
-                          $input = array('value'=> $val);
+                          $input = array('value' => $val);
                           if ($request->getArg($name)) {
                               if ($request->getArg($name) == $val)
                                   $input['selected'] = 'selected';
diff -ruN 11p1/lib/plugin/_WikiTranslation.php 12p3/lib/plugin/_WikiTranslation.php
--- 11p1/lib/plugin/_WikiTranslation.php	2005-04-25 15:41:59.000000000 -0500
+++ 12p3/lib/plugin/_WikiTranslation.php	2006-06-18 06:19:24.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: _WikiTranslation.php,v 1.16 2005/02/12 17:24:24 rurban Exp $');
+rcs_id('$Id: _WikiTranslation.php,v 1.17 2005/09/10 11:31:16 rurban Exp $');
 /*
  Copyright 2004,2005 $ThePhpWikiProgrammingTeam
 
@@ -138,7 +138,7 @@
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.16 $");
+                            "\$Revision: 1.17 $");
     }
 
     function getDefaultArguments() {
@@ -288,7 +288,7 @@
             // But here we cannot change the header anymore. So we can decide to ignore them, 
             // or display them with all the errors.
             //FIXME: do iconv the ob
-            if ($GLOBALS['charset'] != 'utf-8') {
+            if ($GLOBALS['charset'] != 'utf-8' and !defined('NEED_ICONV_TO')) {
             	define('NEED_ICONV_TO', 'utf-8');
             	//either the extension or external 
                 //$GLOBALS['charset'] = 'utf-8';
@@ -459,6 +459,9 @@
 }
 
 // $Log: _WikiTranslation.php,v $
+// Revision 1.17  2005/09/10 11:31:16  rurban
+// protect against 2x define
+//
 // Revision 1.16  2005/02/12 17:24:24  rurban
 // locale update: missing . : fixed. unified strings
 // proper linebreaks
diff -ruN 11p1/lib/prepend.php 12p3/lib/prepend.php
--- 11p1/lib/prepend.php	2005-09-14 01:06:43.000000000 -0500
+++ 12p3/lib/prepend.php	2006-06-18 06:19:24.000000000 -0500
@@ -12,7 +12,7 @@
 rcs_id('$Id: prepend.php,v 1.43 2005/09/14 06:06:43 rurban Exp $');
 
 // see lib/stdlib.php: phpwiki_version()
-define('PHPWIKI_VERSION', '1.3.11p1');
+define('PHPWIKI_VERSION', '1.3.12p3');
 
 /** 
  * Returns true if current php version is at mimimum a.b.c 
diff -ruN 11p1/lib/Request.php 12p3/lib/Request.php
--- 11p1/lib/Request.php	2005-09-14 00:58:17.000000000 -0500
+++ 12p3/lib/Request.php	2006-06-18 06:19:24.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: Request.php,v 1.97 2005/09/14 05:58:17 rurban Exp $');
+rcs_id('$Id: Request.php,v 1.105 2006/04/17 17:25:19 rurban Exp $');
 /*
  Copyright (C) 2002,2004,2005 $ThePhpWikiProgrammingTeam
  
@@ -251,7 +251,7 @@
         $validators = &$this->_validators;
         
         // Set validator headers
-        if ($this->_is_buffering_output or !headers_sent()) {
+        if (!empty($this->_is_buffering_output) or !headers_sent()) {
             if (($etag = $validators->getETag()) !== false)
                 header("ETag: " . $etag->asString());
             if (($mtime = $validators->getModificationTime()) !== false)
@@ -269,7 +269,7 @@
         if ($status) {
             // Return short response due to failed conditionals
             $this->setStatus($status);
-            print "\n\n";
+            echo "\n\n";
             $this->discardOutput();
             $this->finish();
             exit();
@@ -336,6 +336,7 @@
             
         if ($this->getArg('start_debug'))
             $compress = false;
+        
         // Should we compress even when apache_note is not available?
         // sf.net bug #933183 and http://bugs.php.net/17557
         // This effectively eliminates CGI, but all other servers also. hmm.
@@ -343,7 +344,9 @@
             and (!function_exists('ob_gzhandler') 
                  or !function_exists('apache_note'))) 
             $compress = false;
-        // http://www.php.net/ob_gzhandler "output handler 'ob_gzhandler' cannot be used twice"
+            
+        // "output handler 'ob_gzhandler' cannot be used twice"
+        // http://www.php.net/ob_gzhandler
         if ($compress and ini_get("zlib.output_compression"))
             $compress = false;
 
@@ -365,7 +368,11 @@
             $compress = false;
 
         if ($compress) {
-            ob_start('ob_gzhandler');
+            ob_start('phpwiki_gzhandler');
+            
+            // TODO: dont send a length or get the gzip'ed data length.
+            $this->_is_compressing_output = true; 
+            header("Content-Encoding: gzip");
             /*
              * Attempt to prevent Apache from doing the dreaded double-gzip.
              *
@@ -382,6 +389,7 @@
             // at any point.
             // FIXME: change the name of this method.
             ob_start();
+            $this->_is_compressing_output = false;
         }
         $this->_is_buffering_output = true;
         $this->_ob_get_length = 0;
@@ -419,13 +427,13 @@
     	$this->_finishing = true;
         if (!empty($this->_accesslog)) {
             $this->_accesslog->push($this);
-            if (empty($this->_do_chunked_output))
+            if (empty($this->_do_chunked_output) and empty($this->_ob_get_length))
                 $this->_ob_get_length = ob_get_length();
             $this->_accesslog->setSize($this->_ob_get_length);
             global $RUNTIMER;
             if ($RUNTIMER) $this->_accesslog->setDuration($RUNTIMER->getTime());
             // sql logging must be done before the db is closed.
-            if ($this->_accesslog->logtable)
+            if (isset($this->_accesslog->logtable))
                 $this->_accesslog->write_sql();
         }
         
@@ -441,16 +449,22 @@
                 echo $html;
             } else {
             */
-	    if (!headers_sent()) {
-		if (empty($this->_do_chunked_output)) {
-		    $this->_ob_get_length = ob_get_length();
-		}
-		header(sprintf("Content-Length: %d", $this->_ob_get_length));
+            // if _is_compressing_output then ob_get_length() returns 
+            // the uncompressed length, not the gzip'ed as required.
+	    if (!headers_sent() and !$this->_is_compressing_output) {
+                // php url-rewriting miscalculates the ob length. fixes bug #1376007
+                if (ini_get('use_trans_sid') == 'off') {
+                    if (empty($this->_do_chunked_output)) {
+                        $this->_ob_get_length = ob_get_length();
+                    }
+                    header(sprintf("Content-Length: %d", $this->_ob_get_length));
+                }
             }
             $this->_is_buffering_output = false;
-	}
-
-        while (@ob_end_flush()); // hmm. there's some error in redirect
+            ob_end_flush();
+	} elseif (function_exists('ob_get_level') and @ob_get_level()) {
+            ob_end_flush();
+        }
         session_write_close();
         if (!empty($this->_dbi)) {
             $this->_dbi->close();
@@ -617,7 +631,7 @@
 
     function set($key, $val, $persist_days = false, $path = false) {
     	// if already defined, ignore
-    	if (defined('MAIN_setUser') and $key = 'WIKI_ID') return;
+    	if (defined('MAIN_setUser') and $key = getCookieName()) return;
         if (defined('WIKI_XMLRPC') and WIKI_XMLRPC) return;
 
         $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
@@ -1158,7 +1172,7 @@
 
 class HTTP_ETag {
     function HTTP_ETag($val, $is_weak=false) {
-        $this->_val = hash($val);
+        $this->_val = wikihash($val);
         $this->_weak = $is_weak;
     }
 
@@ -1336,6 +1350,34 @@
 
 
 // $Log: Request.php,v $
+// Revision 1.105  2006/04/17 17:25:19  rurban
+// make the flush error go away. die
+//
+// Revision 1.104  2006/04/16 11:42:16  rurban
+// php url-rewriting miscalculates the ob length. fixes bug #1376007
+//
+// do not flush a not existing buffer to avoid Pragma: no-cache on @ error.
+// fixes bug #1438448
+//
+// Revision 1.103  2006/04/15 12:23:32  rurban
+// silence $this->_is_buffering_output warning
+//
+// Revision 1.102  2006/03/19 15:01:00  rurban
+// sf.net patch #1333957 by Matt Brown: Authentication cookie identical across all wikis on a host
+//
+// Revision 1.101  2006/03/07 20:45:43  rurban
+// wikihash for php-5.1
+//
+// Revision 1.100  2006/01/17 18:57:09  uckelman
+// _accesslog->logtable is not set when using non-SQL logging; check should
+//  be isset to avoid a PHP warning
+//
+// Revision 1.99  2005/09/18 16:01:09  rurban
+// trick to send the correct gzipped Content-Length
+//
+// Revision 1.98  2005/09/18 15:15:53  rurban
+// add a proper Content-Encoding: gzip if compressed, and omit Content-Length then.
+//
 // Revision 1.97  2005/09/14 05:58:17  rurban
 // protect against Content-Length if headers_sent(), fixed writing unwanted accesslog sql entries
 //
@@ -1618,4 +1660,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:   
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/SpamBlocklist.php 12p3/lib/SpamBlocklist.php
--- 11p1/lib/SpamBlocklist.php	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/lib/SpamBlocklist.php	2006-06-18 06:19:24.000000000 -0500
@@ -0,0 +1,136 @@
+<?php
+rcs_id('$Id: SpamBlocklist.php,v 1.1 2005/10/29 08:21:58 rurban Exp $');
+/* Copyright (C) 2005 Reini Urban
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki 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.
+ * 
+ * PhpWiki 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 PhpWiki; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 
+ */
+
+/** 
+ * See http://www.surbl.org/
+ *
+ * Perform a name lookup (A) for any link tld against multi.surbl.org and bl.spamcop.net,
+ * like: domainundertest.com.multi.surbl.org
+ *     or 40.30.20.10.multi.surbl.org (for http://10.20.30.40/)
+ * This is the same, but a bit lighter than PEAR::Net_DNSBL_SURBL
+ */
+
+/*
+ * Strip domain prefixes so that either the last two name parts are returned, 
+ * or if it's a known tld (like "co.uk") the last three.
+ */
+function stripDomainPrefixes($host) {
+    static $twoleveltlds = array();
+    $host_elements = explode('.', $host);
+    while (count($host_elements) > 3) {
+	array_shift($host_elements);
+    }
+    $host_3_elements = implode('.', $host_elements);
+    if (count($host_elements) > 2) {
+	array_shift($host_elements);
+    }
+    $host_2_elements = implode('.', $host_elements);
+    if (empty($twoleveltlds)) {
+	$data = @file(dirname(__FILE__)."/../cfg/two-level-tlds");
+	$twoleveltlds = $data ? array_flip($data) : array();
+    }
+    if (array_key_exists($host_2_elements, $twoleveltlds))
+	//IS_IN_2LEVEL: we want the last three names
+	$host = $host_3_elements;
+    else
+	// IS_NOT_2LEVEL: we want the last two names
+	$host = $host_2_elements;
+    return $host;
+}
+
+function IsBlackListed($uri) {
+    static $blacklists = array("multi.surbl.org", "bl.spamcop.net");
+    	                      /* "sbl-xbl.spamhaus.net" */
+    static $whitelist = array();
+    if (empty($whitelist)) { // list of domains
+	$data = @file(dirname(__FILE__)."/../cfg/whitelist");
+	$whitelist = $data ? array_flip($data) : array();
+    }
+
+    $parsed_uri = parse_url($uri);
+    if (!empty($parsed_uri['host']))
+        $host = $parsed_uri['host'];
+    else
+        $host = $parsed_uri['path'];
+    if (array_key_exists($host, $whitelist))
+	return 0;
+    if (preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/", $host)) {
+	$host = implode('.', array_reverse(explode('.', $host))); 
+	$revip = 1;
+    } else {
+	$revip = 0;
+    }
+    foreach ($blacklists as $bl) {
+	if (!$revip and $bl == "multi.surbl.org") {
+	    $host = stripDomainPrefixes($host); // strip domain prefixes
+	    if (array_key_exists($host, $whitelist))
+		return 0;
+	} elseif (!$revip) {
+	    // convert to IP addr and revert it.
+	    $host = implode('.', array_reverse(explode('.', gethostbyname($host)))); 
+	}
+	//echo "($host.$bl)";
+	$res = gethostbyname($host . "." . $bl);
+	if (preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/", $res))
+	    return array($bl, $res, $host);
+    }
+    return 0;
+}
+
+
+/*
+if (defined('SPAMBLOCKLIST_TEST') and SPAMBLOCKLIST_TEST) {
+    BlackListDebug("10.20.30.40");
+    BlackListDebug("spammer.org");
+    BlackListDebug("www.ricoruca.com");
+    BlackListDebug("ricoruca.com");
+    BlackListDebug("soft-sky.org");
+    BlackListDebug("lovers.lv");
+    BlackListDebug("wumort.net");
+    BlackListDebug("bibleinayear.org");
+    BlackListDebug("p50927464.dip.t-dialin.net");
+}
+function BlackListDebug($host) {
+    $res = IsBlackListed($host);
+    echo sprintf("%12s", $host), "\tis";
+    if ($res)
+	echo " listed at $res[0] - $res[1]\n";
+    else
+	echo " not blacklisted.\n";
+}
+*/
+
+// $Log: SpamBlocklist.php,v $
+// Revision 1.1  2005/10/29 08:21:58  rurban
+// ENABLE_SPAMBLOCKLIST:
+//   Check for links to blocked external tld domains in new edits, against
+//   multi.surbl.org and bl.spamcop.net.
+//
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:   
+?>
\ No newline at end of file
diff -ruN 11p1/lib/stdlib.php 12p3/lib/stdlib.php
--- 11p1/lib/stdlib.php	2005-09-11 08:24:33.000000000 -0500
+++ 12p3/lib/stdlib.php	2006-06-18 06:19:24.000000000 -0500
@@ -1,4 +1,4 @@
-<?php //rcs_id('$Id: stdlib.php,v 1.244 2005/09/11 13:24:33 rurban Exp $');
+<?php //rcs_id('$Id: stdlib.php,v 1.251 2006/03/19 15:01:00 rurban Exp $');
 /*
  Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam
 
@@ -54,8 +54,10 @@
 
     file_mtime ($filename)
     sort_file_mtime ($a, $b)
-    class fileSet {fileSet($directory, $filepattern = false), getFiles($exclude=false, $sortby=false, $limit=false) }
-    class ListRegexExpand { listMatchCallback($item, $key),  expandRegex ($index, &$pages) }
+    class fileSet {fileSet($directory, $filepattern = false), 
+                   getFiles($exclude=false, $sortby=false, $limit=false) }
+    class ListRegexExpand { listMatchCallback($item, $key),  
+                            expandRegex ($index, &$pages) }
 
     glob_to_pcre ($glob)
     glob_match ($glob, $against, $case_sensitive = true)
@@ -64,7 +66,7 @@
     isa ($object, $class)
     can ($object, $method)
     function_usable ($function_name)
-    hash ($x)
+    wikihash ($x)
     better_srand ($seed = '')
     count_all ($arg)
     isSubPage ($pagename)
@@ -136,6 +138,16 @@
 }
 
 /**
+ * Returns a name for the WIKI_ID cookie that should be unique on the host.
+ * But for it to be unique you must have set a unique WIKI_NAME in your
+ * configuration file.
+ * @return string The name of the WIKI_ID cookie to use for this wiki.
+ */
+function GetCookieName() {
+    return preg_replace("/[^\d\w]/", "_", WIKI_NAME) . "_WIKI_ID";
+}
+
+/**
  * Generates a valid URL for a given Wiki pagename.
  * @param mixed $pagename If a string this will be the name of the Wiki page to link to.
  * 			  If a WikiDB_Page object function will extract the name to link to.
@@ -462,7 +474,7 @@
  * $alt may be an alternate img
  * TODO: Need to unify with WikiPluginCached::embedObject()
  *
- * Note that Safari 1.0 will crash with <object>, use only <embed>
+ * Note that Safari 1.0 will crash with <object>, so use only <embed>
  *   http://www.alleged.org.uk/pdc/2002/svg-object.html
  */
 function ImgObject($img, $url) {
@@ -1535,7 +1547,8 @@
 /** 
  * Determine whether object is of a specified type.
  * In PHP builtin since 4.2.0 as is_a()
- *
+ * is_a() deprecated in PHP 5, in favor of instanceof operator
+
  * @param $object object An object.
  * @param $class string Class name.
  * @return bool True iff $object is a $class
@@ -1597,7 +1610,7 @@
  *
  * This is used for generating ETags.
  */
-function hash ($x) {
+function wikihash ($x) {
     if (is_scalar($x)) {
         return $x;
     }
@@ -1645,6 +1658,24 @@
     return $s;
 }
 
+/* by Dan Frankowski.
+ */
+function rand_ascii_readable ($length = 6) {
+    // Pick a few random letters or numbers
+    $word = "";
+    better_srand();
+    // Don't use 1lI0O, because they're hard to read
+    $letters = "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+    $letter_len = strlen($letters);
+    for ($i=0; $i < $length; $i++) {
+        if (function_exists('mt_rand'))
+            $word .= $letters[mt_rand(0, $letter_len-1)];
+        else
+            $word .= $letters[rand(0, $letter_len-1)];
+    }
+    return $word;
+}
+
 /**
  * Recursively count all non-empty elements 
  * in array of any dimension or mixed - i.e. 
@@ -1739,18 +1770,29 @@
 // 1.3.9-p1  => 1030.091
 // 1.3.10pre => 1030.099
 // 1.3.11pre-20041120 => 1030.1120041120
+// 1.3.12-rc1 => 1030.119
 function phpwiki_version() {
     static $PHPWIKI_VERSION;
     if (!isset($PHPWIKI_VERSION)) {
         $arr = explode('.',preg_replace('/\D+$/','', PHPWIKI_VERSION)); // remove the pre
         $arr[2] = preg_replace('/\.+/','.',preg_replace('/\D/','.',$arr[2]));
         $PHPWIKI_VERSION = $arr[0]*1000 + $arr[1]*10 + 0.01*$arr[2];
-        if (strstr(PHPWIKI_VERSION, 'pre'))
+        if (strstr(PHPWIKI_VERSION, 'pre') or strstr(PHPWIKI_VERSION, 'rc'))
             $PHPWIKI_VERSION -= 0.01;
     }
     return $PHPWIKI_VERSION;
 }
 
+function phpwiki_gzhandler($ob) {
+    if (function_exists('gzencode'))
+        $ob = gzencode($ob);
+        $GLOBALS['request']->_ob_get_length = strlen($ob);
+    if (!headers_sent()) {
+        header(sprintf("Content-Length: %d", $GLOBALS['request']->_ob_get_length));
+    }
+    return $ob;
+}
+
 function isWikiWord($word) {
     global $WikiNameRegexp;
     //or preg_match('/\A' . $WikiNameRegexp . '\z/', $word) ??
@@ -2010,15 +2052,22 @@
     } elseif (function_exists('getrusage') and ($u = getrusage()) and !empty($u['ru_maxrss'])) {
         $mem = $u['ru_maxrss'];
     } elseif (substr(PHP_OS,0,3) == 'WIN') { // requires a newer cygwin
-        // what we want is the process memory only: apache or php
+        // what we want is the process memory only: apache or php (if CGI)
         $pid = getmypid();
         $memstr = '';
-        // This works only if it's a cygwin process (apache or php)
-        //$memstr = exec("cat /proc/$pid/statm |cut -f1");
-
-        // if it's native windows use something like this: 
-        //   (requires pslist from sysinternals.com)
-        //$memstr = exec("pslist $pid|grep -A1 Mem|sed 1d|perl -ane\"print \$"."F[5]\"");
+	// win32_ps_stat_proc, win32_ps_stat_mem
+ 	if (function_exists('win32_ps_list_procs')) {
+	    $info = win32_ps_stat_proc($pid);
+	    $memstr = $info['mem']['working_set_size'];
+	} else {
+	    // This works only if it's a cygwin process (apache or php).
+	    // Requires a newer cygwin
+	    //$memstr = exec("cat /proc/$pid/statm |cut -f1");
+
+	    // if it's native windows use something like this: 
+	    //   (requires pslist from sysinternals.com)
+	    $memstr = exec("pslist $pid|grep -A1 Mem|sed 1d|perl -ane\"print \$"."F[5]\"");
+        }
         return (integer) trim($memstr);
     } elseif (1) {
         $pid = getmypid();
@@ -2033,6 +2082,27 @@
 }
 
 // $Log: stdlib.php,v $
+// Revision 1.251  2006/03/19 15:01:00  rurban
+// sf.net patch #1333957 by Matt Brown: Authentication cookie identical across all wikis on a host
+//
+// Revision 1.250  2006/03/07 20:45:44  rurban
+// wikihash for php-5.1
+//
+// Revision 1.249  2005/10/30 14:24:33  rurban
+// move rand_ascii_readable from Captcha to stdlib
+//
+// Revision 1.248  2005/10/29 14:18:30  uckelman
+// Added is_a() deprecation note.
+//
+// Revision 1.247  2005/10/10 20:31:21  rurban
+// fix win32ps call
+//
+// Revision 1.246  2005/10/10 19:38:48  rurban
+// add win32ps
+//
+// Revision 1.245  2005/09/18 16:01:09  rurban
+// trick to send the correct gzipped Content-Length
+//
 // Revision 1.244  2005/09/11 13:24:33  rurban
 // fix shortname, dont quote twice in ListRegexExpand
 //
@@ -2396,4 +2466,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:   
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/TextSearchQuery.php 12p3/lib/TextSearchQuery.php
--- 11p1/lib/TextSearchQuery.php	2005-09-14 00:59:48.000000000 -0500
+++ 12p3/lib/TextSearchQuery.php	2006-06-18 06:19:24.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: TextSearchQuery.php,v 1.21 2005/09/14 05:59:48 rurban Exp $');
+<?php rcs_id('$Id: TextSearchQuery.php,v 1.23 2006/04/13 19:30:44 rurban Exp $');
 /**
  * A text search query, converting queries to PCRE and SQL matchers.
  *
@@ -55,7 +55,7 @@
 // regex-style: 'auto', 'none', 'glob', 'posix', 'pcre', 'sql'
 define ('TSQ_REGEX_NONE', 0);
 define ('TSQ_REGEX_AUTO', 1);
-define ('TSQ_REGEX_POSIX', 2);
+define ('TSQ_REGEX_POSIX',2);
 define ('TSQ_REGEX_GLOB', 4);
 define ('TSQ_REGEX_PCRE', 8);
 define ('TSQ_REGEX_SQL', 16);
@@ -83,7 +83,10 @@
         $parser = new TextSearchQuery_Parser;
         $this->_tree = $parser->parse($search_query, $case_exact, $this->_regex);
         $this->_optimize(); // broken under certain circumstances: "word -word -word"
-        $this->_stoplist = '(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)';
+        if (defined("FULLTEXTSEARCH_STOPLIST"))
+            $this->_stoplist = FULLTEXTSEARCH_STOPLIST;
+        else // default stoplist, localizable.
+            $this->_stoplist = _("(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)");
     }
 
     function _optimize() {
@@ -185,7 +188,7 @@
                 $subclauses[] = "(" . $this->_sql_clause($leaf) . ")";
             return join(" $node->op ", $subclauses);
         default:
-            assert($node->op == VOID);
+            assert($node->op == 'VOID');
             return '1=1';
         }
     }
@@ -217,6 +220,38 @@
         }
     }
 
+    /*
+     postgresql tsearch2 uses no WHERE operators, just & | and ! in the searchstring
+     */
+    function makeTsearch2SqlClauseObj(&$sql_search_cb) {
+        $this->_sql_clause_cb = $sql_search_cb;
+        return $this->_Tsearch2Sql_clause_obj($this->_tree);
+    }
+
+    function _Tsearch2Sql_clause_obj($node) {
+        // TODO: "such a phrase"
+        switch ($node->op) {
+        case 'NOT':
+            return "!" . $node->leaves[0];
+        case 'AND':
+            $subclauses = array();
+            foreach ($node->leaves as $leaf)
+                $subclauses[] = $this->_Tsearch2Sql_clause_obj($leaf);
+            return join("&", $subclauses);
+        case 'OR':
+            $subclauses = array();
+            foreach ($node->leaves as $leaf)
+                $subclauses[] = $this->_Tsearch2Sql_clause_obj($leaf);
+            return join("|", $subclauses);
+        case 'VOID':
+            return '';
+        case 'ALL':
+            return '1';
+        default:
+            return $this->_sql_clause_cb->call($node);
+        }
+    }
+
     function sql() { return '%'.$this->_sql_quote($this->word).'%'; }
 
     /**
@@ -319,7 +354,7 @@
     function regexp() {
         return '(?=.*' . preg_quote($this->word, '/') . ')';
     }
-    function highlight_words($negated = false) {
+    function highlight_words ($negated = false) {
         return $negated ? array() : array($this->word);
     }
     function _sql_quote() {
@@ -339,28 +374,28 @@
 extends TextSearchQuery_node_word {
     var $op = "STARTS_WITH";
     function regexp() { return '(?=.*\b' . preg_quote($this->word, '/') . ')'; }
-    function sql()    { return $this->_sql_quote($this->word).'%'; }
+    function sql ()   { return $this->_sql_quote($this->word).'%'; }
 }
 
 class TextSearchQuery_node_ends_with
 extends TextSearchQuery_node_word {
     var $op = "ENDS_WITH";
     function regexp() { return '(?=.*' . preg_quote($this->word, '/') . '\b)'; }
-    function sql()    { return '%'.$this->_sql_quote($this->word); }
+    function sql ()   { return '%'.$this->_sql_quote($this->word); }
 }
 
 class TextSearchQuery_node_exact
 extends TextSearchQuery_node_word {
     var $op = "EXACT";
     function regexp() { return '(?=\b' . preg_quote($this->word, '/') . '\b)'; }
-    function sql()    { return $this->_sql_squote($this->word); }
+    function sql ()   { return $this->_sql_squote($this->word); }
 }
 
 class TextSearchQuery_node_regex // posix regex. FIXME!
 extends TextSearchQuery_node_word {
     var $op = "REGEX"; // using REGEXP or ~ extension
     function regexp() { return '(?=.*\b' . $this->word . '\b)'; }
-    function sql()    { return $this->_sql_quote($this->word); }
+    function sql ()   { return $this->_sql_quote($this->word); }
 }
 
 class TextSearchQuery_node_regex_glob
@@ -407,7 +442,7 @@
         return '(?!' . $leaf->regexp() . ')';
     }
 
-    function highlight_words($negated = false) {
+    function highlight_words ($negated = false) {
         return $this->leaves[0]->highlight_words(!$negated);
     }
 }
@@ -831,6 +866,11 @@
     }
 }
 
+// $Log: TextSearchQuery.php,v $
+// Revision 1.23  2006/04/13 19:30:44  rurban
+// make TextSearchQuery->_stoplist localizable and overridable within config.ini
+// 
+
 // Local Variables:
 // mode: php
 // tab-width: 8
diff -ruN 11p1/lib/Theme.php 12p3/lib/Theme.php
--- 11p1/lib/Theme.php	2005-06-10 01:09:06.000000000 -0500
+++ 12p3/lib/Theme.php	2006-06-18 06:19:24.000000000 -0500
@@ -199,14 +199,15 @@
         $this->_path  = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : "";
         $this->_theme = "themes/$theme_name";
 
+        if ($theme_name != 'default')
+            $this->_default_theme = new Theme;
+
         // by pixels
-        if ($GLOBALS['request']->getPref('doubleClickEdit')
+        if ((is_object($GLOBALS['request']) // guard against unittests
+             and $GLOBALS['request']->getPref('doubleClickEdit'))
             or ENABLE_DOUBLECLICKEDIT)
             $this->initDoubleClickEdit();
 
-        if ($theme_name != 'default')
-            $this->_default_theme = new Theme;
-
         // will be replaced by acDropDown
         if (ENABLE_LIVESEARCH) { // by bitflux.ch
             $this->initLiveSearch();
@@ -1095,7 +1096,7 @@
 
     var $_MoreHeaders = array();
     function addMoreHeaders ($element) {
-        array_push($this->_MoreHeaders,$element);
+        array_push($this->_MoreHeaders, $element);
     }
     function getMoreHeaders () {
         if (empty($this->_MoreHeaders))
@@ -1176,8 +1177,8 @@
             $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\""));
     }
 
-    // Immediate title search results via XMLHttpRequest
-    // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js seperately
+    // Immediate title search results via XMLHTML(HttpRequest
+    // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js seperately.
     // Google's or acdropdown is better.
     function initLiveSearch() {
         if (!$this->HTML_DUMP_SUFFIX) {
@@ -1442,6 +1443,9 @@
 }
 
 // $Log: Theme.php,v $
+// Revision 1.132  2005/07/24 09:51:22  rurban
+// guard doubleClickEdit for unittests
+//
 // Revision 1.131  2005/06/10 06:09:06  rurban
 // enable getPref('doubleClickEdit')
 //
diff -ruN 11p1/lib/upgrade.php 12p3/lib/upgrade.php
--- 11p1/lib/upgrade.php	2005-02-27 13:13:27.000000000 -0600
+++ 12p3/lib/upgrade.php	2006-06-18 06:19:25.000000000 -0500
@@ -168,7 +168,7 @@
  */
 function installTable(&$dbh, $table, $backend_type) {
     global $DBParams;
-    if (!in_array($DBParams['dbtype'],array('SQL','ADODB','PDO'))) return;
+    if (!$dbh->_backend->isSQL()) return;
     echo _("MISSING")," ... \n";
     $backend = &$dbh->_backend->_dbh;
     /*
@@ -352,10 +352,10 @@
  */
 function CheckDatabaseUpdate(&$request) {
     global $DBParams, $DBAuthParams;
-    if (!in_array($DBParams['dbtype'], array('SQL','ADODB','PDO'))) return;
-    echo "<h3>",_("check for necessary database updates"), " - ", $DBParams['dbtype'], "</h3>\n";
-
     $dbh = $request->getDbh(); 
+    if (!$dbh->_backend->isSQL()) return;
+    echo "<h3>",_("check for necessary database updates"), " - ", DATABASE_TYPE, "</h3>\n";
+
     $dbadmin = $request->getArg('dbadmin');
     _upgrade_db_init($dbh);
     if (isset($dbadmin['cancel'])) {
@@ -403,7 +403,9 @@
   	assert(!empty($DBParams['db_session_table']));
         $session_tbl = $prefix . $DBParams['db_session_table'];
         $sess_fields = $dbh->_backend->listOfFields($database, $session_tbl);
-        if (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) {
+        if (!$sess_fields) {
+            echo _("SKIP");
+        } elseif (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) {
             // TODO: postgres test (should be able to add columns at the end, but not in between)
             echo "<b>",_("ADDING"),"</b>"," ... ";		
             $dbh->genericSqlQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL");
@@ -417,12 +419,12 @@
             // sess_id => varchar(10), sess_data => varchar(5). For others obviously also.
   	    echo _("check for mysql session.sess_id sanity")," ... ";
             $result = $dbh->genericSqlQuery("DESCRIBE $session_tbl");
-            if ($DBParams['dbtype'] == 'SQL') {
+            if (DATABASE_TYPE == 'SQL') {
             	$iter = new WikiDB_backend_PearDB_generic_iter($backend, $result);
-            } elseif ($DBParams['dbtype'] == 'ADODB') {
+            } elseif (DATABASE_TYPE == 'ADODB') {
             	$iter = new WikiDB_backend_ADODB_generic_iter($backend, $result, 
             		        array("Field", "Type", "Null", "Key", "Default", "Extra"));
-            } elseif ($DBParams['dbtype'] == 'PDO') {
+            } elseif (DATABASE_TYPE == 'PDO') {
             	$iter = new WikiDB_backend_PDO_generic_iter($backend, $result);
             }
             while ($col = $iter->next()) {
@@ -441,8 +443,13 @@
         }
     }
 
+    /* TODO:
+     ALTER TABLE link ADD relation INT DEFAULT 0;
+     CREATE INDEX linkrelation ON link (relation);
+    */
+
     // mysql >= 4.0.4 requires LOCK TABLE privileges
-    if (substr($backend_type,0,5) == 'mysql'/* and $DBParams['dbtype'] != 'PDO' */) {
+    if (0 and substr($backend_type,0,5) == 'mysql') {
   	echo _("check for mysql LOCK TABLE privilege")," ...";
         $mysql_version = $dbh->_backend->_serverinfo['version'];
         if ($mysql_version > 400.40) {
@@ -496,7 +503,7 @@
     // 1.3.10 mysql requires page.id auto_increment
     // mysql, mysqli or mysqlt
     if (phpwiki_version() >= 1030.099 and substr($backend_type,0,5) == 'mysql' 
-        and $DBParams['dbtype'] != 'PDO') {
+        and DATABASE_TYPE != 'PDO') {
   	echo _("check for mysql page.id auto_increment flag")," ...";
         assert(!empty($page_tbl));
   	$database = $dbh->_backend->database();
@@ -557,7 +564,7 @@
                     " <b>",_("FIXED"),"</b>",
                     "<br />\n";
             }
-        } elseif ($DBParams['dbtype'] != 'PDO') {
+        } elseif (DATABASE_TYPE != 'PDO') {
             // check if already fixed
             extract($dbh->_backend->_table_names);
             assert(!empty($page_tbl));
@@ -607,12 +614,12 @@
 
 function _upgrade_db_init (&$dbh) {
     global $request, $DBParams, $DBAuthParams;
-    if (!in_array($DBParams['dbtype'], array('SQL','ADODB','PDO'))) return;
+    if (!$dbh->_backend->isSQL()) return;
 
     if (DBADMIN_USER) {
         // if need to connect as the root user, for CREATE and ALTER privileges
         $AdminParams = $DBParams;
-        if ($DBParams['dbtype'] == 'SQL')
+        if (DATABASE_TYPE == 'SQL')
             $dsn = DB::parseDSN($AdminParams['dsn']);
         else // ADODB or PDO
             $dsn = parseDSN($AdminParams['dsn']);
@@ -622,7 +629,7 @@
                                       DBADMIN_PASSWD,
                                       $dsn['hostspec'],
                                       $dsn['database']);
-        if (DEBUG & _DEBUG_SQL and $DBParams['dbtype'] == 'PDO') {
+        if (DEBUG & _DEBUG_SQL and DATABASE_TYPE == 'PDO') {
             echo "<br>\nDBParams['dsn']: '", $DBParams['dsn'], "'";
             echo "<br>\ndsn: '", print_r($dsn), "'";
             echo "<br>\nAdminParams['dsn']: '", $AdminParams['dsn'], "'";
@@ -633,7 +640,7 @@
             $dbh = &$request->_dbi;
         else {
             $AdminParams = $DBParams;
-            if ($DBParams['dbtype'] == 'SQL')
+            if (DATABASE_TYPE == 'SQL')
                 $dsn = DB::parseDSN($AdminParams['dsn']);
             else
                 $dsn = parseDSN($AdminParams['dsn']);
@@ -654,7 +661,8 @@
 HTML::p(_("Upgrade requires database privileges to CREATE and ALTER the phpwiki database."),
                                    HTML::br(),
 _("And on windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")),
-                           HiddenInputs(array('action' => 'upgrade')),
+                           HiddenInputs(array('action' => 'upgrade',
+                                              'overwrite' => $request->getArg('overwrite'))),
                            HTML::table(array("cellspacing"=>4),
                                        HTML::tr(HTML::td(array('align'=>'right'),
                                                          _("DB admin user:")),
@@ -691,7 +699,8 @@
  */
 function _upgrade_cached_html (&$dbh, $verbose=true) {
     global $DBParams;
-    if (!in_array($DBParams['dbtype'], array('SQL','ADODB'))) return;
+    if (!$dbh->_backend->isSQL()) return;
+    //if (!in_array(DATABASE_TYPE, array('SQL','ADODB','PDO'))) return;
     $count = 0;
     if (phpwiki_version() >= 1030.10) {
         if ($verbose)
@@ -699,6 +708,10 @@
   	$database = $dbh->_backend->database();
         extract($dbh->_backend->_table_names);
         $fields = $dbh->_backend->listOfFields($database, $page_tbl);
+        if (!$fields) {
+            echo _("SKIP"), "<br />\n";
+            return 0;
+        }
         if (!strstr(strtolower(join(':', $fields)), "cached_html")) {
             if ($verbose)
                 echo "<b>",_("ADDING"),"</b>"," ... ";
@@ -726,7 +739,8 @@
  */
 function _convert_cached_html (&$dbh) {
     global $DBParams;
-    if (!in_array($DBParams['dbtype'], array('SQL','ADODB'))) return;
+    if (!$dbh->_backend->isSQL()) return;
+    //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
 
     $pages = $dbh->getAllPages();
     $cache =& $dbh->_cache;
@@ -884,6 +898,12 @@
 
 /*
  $Log: upgrade.php,v $
+ Revision 1.49  2006/05/18 06:03:39  rurban
+ use $dbh->_backend->isSQL
+
+ Revision 1.48  2005/11/14 22:32:38  rurban
+ remove user, SKIP on !session
+
  Revision 1.47  2005/02/27 19:13:27  rurban
  latin1 mysql fix
 
diff -ruN 11p1/lib/WikiDB/ADODB.php 12p3/lib/WikiDB/ADODB.php
--- 11p1/lib/WikiDB/ADODB.php	2004-12-10 16:15:00.000000000 -0600
+++ 12p3/lib/WikiDB/ADODB.php	2006-06-18 06:19:26.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: ADODB.php,v 1.11 2004/12/10 22:15:00 rurban Exp $');
+rcs_id('$Id: ADODB.php,v 1.13 2005/10/30 15:49:00 rurban Exp $');
 
 require_once('lib/WikiDB.php');
 
@@ -14,19 +14,25 @@
 class WikiDB_ADODB extends WikiDB
 {
     function WikiDB_ADODB ($dbparams) {
+        $backend = 'ADODB';
         if (is_array($dbparams['dsn']))
             $backend = $dbparams['dsn']['phptype'];
         elseif (preg_match('/^(\w+):/', $dbparams['dsn'], $m))
             $backend = $m[1];
-        // Do we have a override? (currently: mysql, sqlite, oracle, mssql)
-        // TODO: pgsql, mysqlt (innodb or bdb)
-        if (FindFile("lib/WikiDB/backend/ADODB_$backend.php",true)) {
+        // Do we have a override? (currently: mysql, sqlite, oracle, mssql, oci8po, postgres7)
+        // TODO: mysqlt (innodb or bdb)
+	if ($backend == 'pgsql') { // PearDB DSN cross-compatiblity hack (for unit testing)
+	    $backend = 'postgres7';
+	    if (is_string($dbparams['dsn']))
+		$dbparams['dsn'] = $backend . ':' . substr($dbparams['dsn'], 6);
+	}
+        if (FindFile("lib/WikiDB/backend/ADODB_".$backend.".php",true)) {
             $backend = 'ADODB_' . $backend;
         } else {
             $backend = 'ADODB';
         }
-        include_once("lib/WikiDB/backend/$backend.php");
-        $backend_class = "WikiDB_backend_$backend";
+        include_once("lib/WikiDB/backend/".$backend.".php");
+        $backend_class = "WikiDB_backend_".$backend;
         $backend = new $backend_class($dbparams);
         $this->WikiDB($backend, $dbparams);
     }
@@ -100,4 +106,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/WikiDB/backend/ADODB_mysql.php 12p3/lib/WikiDB/backend/ADODB_mysql.php
--- 11p1/lib/WikiDB/backend/ADODB_mysql.php	2005-09-11 08:25:12.000000000 -0500
+++ 12p3/lib/WikiDB/backend/ADODB_mysql.php	2006-06-18 06:19:26.000000000 -0500
@@ -151,6 +151,77 @@
         return;
     }
 
+    function _get_pageid($pagename, $create_if_missing = false) {
+
+        // check id_cache
+        global $request;
+        $cache =& $request->_dbi->_cache->_id_cache;
+        if (isset($cache[$pagename])) {
+            if ($cache[$pagename] or !$create_if_missing) {
+                return $cache[$pagename];
+            }
+        }
+        
+        $dbh = &$this->_dbh;
+        $page_tbl = $this->_table_names['page_tbl'];
+        $query = sprintf("SELECT id FROM $page_tbl WHERE pagename=%s",
+                         $dbh->qstr($pagename));
+        if (! $create_if_missing ) {
+            $row = $dbh->GetRow($query);
+            return $row ? $row[0] : false;
+        }
+        $row = $dbh->GetRow($query);
+        if (! $row ) {
+	    // have auto-incrementing, atomic version
+	    $rs = $dbh->Execute(sprintf("INSERT INTO $page_tbl"
+					. " (id,pagename)"
+					. " VALUES(NULL,%s)",
+					$dbh->qstr($pagename)));
+	    $id = $dbh->_insertid();
+        } else {
+            $id = $row[0];
+        }
+        assert($id);
+        return $id;
+    }
+
+    /**
+     * Create a new revision of a page.
+     */
+    function set_versiondata($pagename, $version, $data) {
+        $dbh = &$this->_dbh;
+        $version_tbl = $this->_table_names['version_tbl'];
+        
+        $minor_edit = (int) !empty($data['is_minor_edit']);
+        unset($data['is_minor_edit']);
+        
+        $mtime = (int)$data['mtime'];
+        unset($data['mtime']);
+        assert(!empty($mtime));
+
+        @$content = (string) $data['%content'];
+        unset($data['%content']);
+        unset($data['%pagedata']);
+        
+        $this->lock(array('page','recent','version','nonempty'));
+        $dbh->BeginTrans( );
+        $dbh->CommitLock($version_tbl);
+        $id = $this->_get_pageid($pagename, true);
+        $backend_type = $this->backendType();
+        // optimize: mysql can do this with one REPLACE INTO.
+	$rs = $dbh->Execute(sprintf("REPLACE INTO $version_tbl"
+				    . " (id,version,mtime,minor_edit,content,versiondata)"
+				    . " VALUES(%d,%d,%d,%d,%s,%s)",
+				    $id, $version, $mtime, $minor_edit,
+				    $dbh->qstr($content),
+				    $dbh->qstr($this->_serialize($data))));
+        $this->_update_recent_table($id);
+        $this->_update_nonempty_table($id);
+        if ($rs) $dbh->CommitTrans( );
+        else $dbh->RollbackTrans( );
+        $this->unlock(array('page','recent','version','nonempty'));
+    }
+    
 };
 
 // (c-file-style: "gnu")
diff -ruN 11p1/lib/WikiDB/backend/ADODB_oci8po.php 12p3/lib/WikiDB/backend/ADODB_oci8po.php
--- 11p1/lib/WikiDB/backend/ADODB_oci8po.php	2005-09-11 08:25:12.000000000 -0500
+++ 12p3/lib/WikiDB/backend/ADODB_oci8po.php	2006-06-18 06:19:26.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: ADODB_oci8po.php,v 1.3 2005/01/18 20:55:47 rurban Exp $');
+rcs_id('$Id: ADODB_oci8po.php,v 1.4 2005/11/14 22:24:33 rurban Exp $');
 
 /**
  * Oracle extensions for the ADODB DB backend.
@@ -130,8 +130,10 @@
     // Intermedia Text option, so let's stick to the 'simple' thing
     // Note that this does only an exact fulltext search, not using MATCH or LIKE.
     function _fulltext_match_clause($node) { 
-        $page = $node->sql($word);
-        $exactword = $node->_sql_quote();
+        if ($this->isStoplisted($node))
+            return "1=1";
+        $page = $node->sql();
+        $exactword = $node->_sql_quote($node->word);
         return ($this->_case_exact
                 ? "pagename LIKE '$page' OR DBMS_LOB.INSTR(content, '$exactword') > 0"
                 : "LOWER(pagename) LIKE '$page' OR DBMS_LOB.INSTR(content, '$exactword') > 0");
diff -ruN 11p1/lib/WikiDB/backend/ADODB.php 12p3/lib/WikiDB/backend/ADODB.php
--- 11p1/lib/WikiDB/backend/ADODB.php	2005-09-14 01:04:43.000000000 -0500
+++ 12p3/lib/WikiDB/backend/ADODB.php	2006-06-18 06:19:26.000000000 -0500
@@ -2,7 +2,7 @@
 rcs_id('$Id: ADODB.php,v 1.78 2005/09/14 06:04:43 rurban Exp $');
 
 /*
- Copyright 2002,2004 $ThePhpWikiProgrammingTeam
+ Copyright 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
 
  This file is part of PhpWiki.
 
@@ -26,7 +26,7 @@
  * Based on PearDB.php. 
  * @author: Lawrence Akka, Reini Urban
  *
- * Now (phpwiki-1.3.10) with adodb-4.22, by Reini Urban:
+ * Now (since phpwiki-1.3.10) with adodb-4.22, by Reini Urban:
  * 1) Extended to use all available database backends, not only mysql.
  * 2) It uses the ultra-fast binary adodb extension if loaded.
  * 3) We use FETCH_NUM instead of FETCH_ASSOC (faster and more generic)
@@ -39,6 +39,8 @@
  *
  * phpwiki-1.3.11, by Philippe Vanhaesendonck
  * - pass column list to iterators so we can FETCH_NUM in all cases
+ * phpwiki-1.3.12: get rid of ISNULL
+ * phpwiki-1.3.13: tsearch2 and stored procedures
  *
  * ADODB basic differences to PearDB: It pre-fetches the first row into fields, 
  * is dirtier in style, layout and more low-level ("worse is better").
@@ -107,7 +109,8 @@
         $page_tbl = $this->_table_names['page_tbl'];
         $version_tbl = $this->_table_names['version_tbl'];
         $this->page_tbl_fields = "$page_tbl.id AS id, $page_tbl.pagename AS pagename, "
-            . "$page_tbl.hits hits";
+            . "$page_tbl.hits AS hits";
+        $this->links_field_list = array('id', 'pagename');
         $this->page_tbl_field_list = array('id', 'pagename', 'hits');
         $this->version_tbl_fields = "$version_tbl.version AS version, "
             . "$version_tbl.mtime AS mtime, "
@@ -184,7 +187,7 @@
         // Note that this will fail silently if the page does not
         // have a record in the page table.  Since it's just the
         // hit count, who cares?
-        $dbh->Execute(sprintf("UPDATE %s SET hits=hits+1 WHERE pagename=%s LIMIT 1",
+        $dbh->Execute(sprintf("UPDATE %s SET hits=hits+1 WHERE pagename=%s",
                               $this->_table_names['page_tbl'],
                               $dbh->qstr($pagename)));
         return;
@@ -217,7 +220,7 @@
             // Note that this will fail silently if the page does not
             // have a record in the page table.  Since it's just the
             // hit count, who cares?
-            $dbh->Execute(sprintf("UPDATE $page_tbl SET hits=%d WHERE pagename=%s LIMIT 1",
+            $dbh->Execute(sprintf("UPDATE $page_tbl SET hits=%d WHERE pagename=%s",
                                   $newdata['hits'], $dbh->qstr($pagename)));
             return;
         }
@@ -244,8 +247,8 @@
         }
         if ($dbh->Execute("UPDATE $page_tbl"
                           . " SET hits=?, pagedata=?"
-                          . " WHERE pagename=? LIMIT 1",
-                          array($hits, $this->_serialize($data),$pagename))) {
+                          . " WHERE pagename=?",
+                          array($hits, $this->_serialize($data), $pagename))) {
             $dbh->CommitTrans( );
             return true;
         } else {
@@ -268,8 +271,7 @@
         if (empty($data)) $data = '';
         $rs = $dbh->Execute("UPDATE $page_tbl"
                             . " SET cached_html=?"
-                            . " WHERE pagename=?"
-                            . " LIMIT 1",
+                            . " WHERE pagename=?",
                             array($data, $pagename));
     }
 
@@ -294,31 +296,21 @@
         }
         $row = $dbh->GetRow($query);
         if (! $row ) {
-            //mysql, mysqli or mysqlt
-            if (substr($dbh->databaseType,0,5) == 'mysql') {
-                // have auto-incrementing, atomic version
-                $rs = $dbh->Execute(sprintf("INSERT INTO $page_tbl"
-                                            . " (id,pagename)"
-                                            . " VALUES(NULL,%s)",
-                                            $dbh->qstr($pagename)));
-                $id = $dbh->_insertid();
-            } else {
-                //$id = $dbh->GenID($page_tbl . 'seq');
-                // Better generic version than with adodob::genID
-                //TODO: Does the DBM has subselects? Then we can do it with select max(id)+1
-                $this->lock(array('page'));
-                $dbh->BeginTrans( );
-                $dbh->CommitLock($page_tbl);
-                $row = $dbh->GetRow("SELECT MAX(id) FROM $page_tbl");
-                $id = $row[0] + 1;
-                $rs = $dbh->Execute(sprintf("INSERT INTO $page_tbl"
-                                            . " (id,pagename,hits)"
-                                            . " VALUES (%d,%s,0)",
-                                            $id, $dbh->qstr($pagename)));
-                if ($rs) $dbh->CommitTrans( );
-                else $dbh->RollbackTrans( );
-                $this->unlock(array('page'));
-            }
+	    //$id = $dbh->GenID($page_tbl . 'seq');
+	    // Better generic version than with adodob::genID
+	    //TODO: Does the DBM has subselects? Then we can do it with select max(id)+1
+	    // $this->lock(array('page'));
+	    $dbh->BeginTrans( );
+	    $dbh->CommitLock($page_tbl);
+	    $row = $dbh->GetRow("SELECT MAX(id) FROM $page_tbl");
+	    $id = $row[0] + 1;
+	    $rs = $dbh->Execute(sprintf("INSERT INTO $page_tbl"
+					. " (id,pagename,hits)"
+					. " VALUES (%d,%s,0)",
+					$id, $dbh->qstr($pagename)));
+	    if ($rs) $dbh->CommitTrans( );
+	    else $dbh->RollbackTrans( );
+	    // $this->unlock(array('page'));
         } else {
             $id = $row[0];
         }
@@ -423,7 +415,9 @@
         else
             $data['%content'] = '';
         if (!empty($pagedata)) {
-            $data['%pagedata'] = $this->_extract_page_data($pagedata, $hits);
+            // hmm, $pagedata = is already extracted by WikiDB_backend_ADODB_iter
+            //$data['%pagedata'] = $this->_extract_page_data($pagedata, $hits);
+            $data['%pagedata'] = $pagedata;
         }
         return $data;
     }
@@ -451,24 +445,14 @@
         $dbh->CommitLock($version_tbl);
         $id = $this->_get_pageid($pagename, true);
         $backend_type = $this->backendType();
-        // optimize: mysql can do this with one REPLACE INTO.
-        if (substr($backend_type,0,5) == 'mysql') {
-            $rs = $dbh->Execute(sprintf("REPLACE INTO $version_tbl"
-                                  . " (id,version,mtime,minor_edit,content,versiondata)"
-                                  . " VALUES(%d,%d,%d,%d,%s,%s)",
-                                  $id, $version, $mtime, $minor_edit,
-                                  $dbh->qstr($content),
-                                  $dbh->qstr($this->_serialize($data))));
-        } else {
-            $dbh->Execute(sprintf("DELETE FROM $version_tbl"
-                                  . " WHERE id=%d AND version=%d",
-                                  $id, $version));
-            $rs = $dbh->Execute("INSERT INTO $version_tbl"
-                                . " (id,version,mtime,minor_edit,content,versiondata)"
-                                . " VALUES(?,?,?,?,?,?)",
-                                  array($id, $version, $mtime, $minor_edit,
+	$dbh->Execute(sprintf("DELETE FROM $version_tbl"
+			      . " WHERE id=%d AND version=%d",
+			      $id, $version));
+	$rs = $dbh->Execute("INSERT INTO $version_tbl"
+			    . " (id,version,mtime,minor_edit,content,versiondata)"
+			    . " VALUES(?,?,?,?,?,?)",
+			    array($id, $version, $mtime, $minor_edit,
                                   $content, $this->_serialize($data)));
-        }
         $this->_update_recent_table($id);
         $this->_update_nonempty_table($id);
         if ($rs) $dbh->CommitTrans( );
@@ -591,7 +575,7 @@
         $this->lock(array('link'));
         $pageid = $this->_get_pageid($pagename, true);
 
-        if ($links) {
+        if (1 or $links) {
             $dbh->Execute("DELETE FROM $link_tbl WHERE linkfrom=$pageid");
             foreach ($links as $link) {
                 if (isset($linkseen[$link]))
@@ -602,17 +586,19 @@
                 $dbh->Execute("INSERT INTO $link_tbl (linkfrom, linkto)"
                             . " VALUES ($pageid, $linkid)");
             }
-        } elseif (DEBUG) {
+        } elseif (0 and DEBUG) {
             // purge page table: delete all non-referenced pages
             // for all previously linked pages...
             foreach ($dbh->getRow("SELECT $link_tbl.linkto as id FROM $link_tbl".
                                   " WHERE linkfrom=$pageid") as $id) {
             	// ...check if the page is empty and has no version
+                //FIXME: ISNULL is mysql specific
                 if ($dbh->getRow("SELECT $page_tbl.id FROM $page_tbl"
                                  . " LEFT JOIN $nonempty_tbl USING (id) "
                                  . " LEFT JOIN $version_tbl USING (id)"
-                                 . " WHERE ISNULL($nonempty_tbl.id) AND"
-                                 . " ISNULL($version_tbl.id) AND $page_tbl.id=$id")) {
+                                 . " WHERE $nonempty_tbl.id is NULL"
+                                 . " AND $version_tbl.id is NULL"
+                                 . " AND $page_tbl.id=$id")) {
                     $dbh->Execute("DELETE FROM $page_tbl WHERE id=$id");   // this purges the link
                     $dbh->Execute("DELETE FROM $recent_tbl WHERE id=$id"); // may fail
                 }
@@ -648,8 +634,7 @@
 
         $qpagename = $dbh->qstr($pagename);
         // removed ref to FETCH_MODE in next line
-        $sql = "SELECT $want.id AS id, $want.pagename AS pagename,"
-            . " $want.hits AS hits"
+        $sql = "SELECT $want.id AS id, $want.pagename AS pagename"
             . " FROM $link_tbl, $page_tbl linker, $page_tbl linkee"
             . (!$include_empty ? ", $nonempty_tbl" : '')
             . " WHERE linkfrom=linker.id AND linkto=linkee.id"
@@ -665,7 +650,7 @@
         } else {
             $result = $dbh->Execute($sql);
         }
-        return new WikiDB_backend_ADODB_iter($this, $result, $this->page_tbl_field_list);
+        return new WikiDB_backend_ADODB_iter($this, $result, $this->links_field_list);
     }
 
     /**
@@ -685,8 +670,7 @@
                             . " FROM $link_tbl, $page_tbl linker, $page_tbl linkee, $nonempty_tbl"
                             . " WHERE linkfrom=linker.id AND linkto=linkee.id"
                             . " AND $have.pagename=$qpagename"
-                            . " AND $want.pagename=$qlink"
-                            . "LIMIT 1");
+                            . " AND $want.pagename=$qlink");
         return $row[0];
     }
 
@@ -752,9 +736,11 @@
     }
         
     /**
-     * Title search.
+     * Title and fulltext search.
      */
-    function text_search($search, $fullsearch=false, $sortby=false, $limit=false, $exclude=false) {
+    function text_search($search, $fullsearch=false, 
+                         $sortby=false, $limit=false, $exclude=false) 
+    {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $orderby = $this->sortby($sortby, 'db');
@@ -774,7 +760,8 @@
             $join_clause .= " AND $page_tbl.id=$version_tbl.id AND latestversion=version";
 
             $fields .= ",$page_tbl.pagedata as pagedata," . $this->version_tbl_fields;
-            $field_list = array_merge($field_list, array('pagedata'), $this->version_tbl_field_list);
+            $field_list = array_merge($field_list, array('pagedata'), 
+                                      $this->version_tbl_field_list);
             $callback = new WikiMethodCb($searchobj, "_fulltext_match_clause");
         } else {
             $callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
@@ -792,29 +779,11 @@
         } else {
             $result = $dbh->Execute($sql);
         }
-        return new WikiDB_backend_ADODB_iter($this, $result, $field_list);
-    }
-    /*
-    function _sql_match_clause($word) {
-        //not sure if we need this.  ADODB may do it for us
-        $word = preg_replace('/(?=[%_\\\\])/', "\\", $word);  
-
-        // (we need it for at least % and _ --- they're the wildcard characters
-        //  for the LIKE operator, and we need to quote them if we're searching
-        //  for literal '%'s or '_'s.  --- I'm not sure about \, but it seems to
-        //  work as is.
-        $word = $this->_dbh->qstr("%".strtolower($word)."%");
-        $page_tbl = $this->_table_names['page_tbl'];
-        return "LOWER($page_tbl.pagename) LIKE $word";
-    }
-    function _fullsearch_sql_match_clause($word) {
-        $word = preg_replace('/(?=[%_\\\\])/', "\\", $word);  //not sure if we need this
-        // (see above)
-        $word = $this->_dbh->qstr("%".strtolower($word)."%");
-        $page_tbl = $this->_table_names['page_tbl'];
-        return "LOWER($page_tbl.pagename) LIKE $word OR content LIKE $word";
+        $iter = new WikiDB_backend_ADODB_iter($this, $result, $field_list);
+        if ($fullsearch)
+            $iter->stoplisted = $searchobj->stoplisted;
+        return $iter;
     }
-    */
 
     /*
      * TODO: efficiently handle wildcards exclusion: exclude=Php* => 'Php%', 
@@ -833,7 +802,7 @@
     /**
      * Find highest or lowest hit counts.
      */
-    function most_popular($limit=20, $sortby='-hits') {
+    function most_popular ($limit=20, $sortby='-hits') {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $order = "DESC";
@@ -952,23 +921,24 @@
             $orderby = 'ORDER BY ' . $orderby;
             
         if ($exclude_from) // array of pagenames
-            $exclude_from = " AND linked.pagename NOT IN ".$this->_sql_set($exclude_from);
+            $exclude_from = " AND pp.pagename NOT IN ".$this->_sql_set($exclude_from);
         if ($exclude) // array of pagenames
-            $exclude = " AND $page_tbl.pagename NOT IN ".$this->_sql_set($exclude);
+            $exclude = " AND p.pagename NOT IN ".$this->_sql_set($exclude);
 
         /* 
          all empty pages, independent of linkstatus:
-           select pagename as empty from page left join nonempty using(id) where isnull(nonempty.id);
+           select pagename as empty from page left join nonempty using(id) where is null(nonempty.id);
          only all empty pages, which have a linkto:
-           select page.pagename, linked.pagename as wantedfrom from link, page as linked 
-             left join page on(link.linkto=page.id) left join nonempty on(link.linkto=nonempty.id) 
-             where isnull(nonempty.id) and linked.id=link.linkfrom;  
+            select page.pagename, linked.pagename as wantedfrom from link, page linked 
+              left join page on link.linkto=page.id left join nonempty on link.linkto=nonempty.id
+              where nonempty.id is null and linked.id=link.linkfrom;  
         */
-        $sql = "SELECT $page_tbl.pagename,linked.pagename as wantedfrom"
-            . " FROM $link_tbl,$page_tbl as linked "
-            . " LEFT JOIN $page_tbl ON($link_tbl.linkto=$page_tbl.id)"
-            . " LEFT JOIN $nonempty_tbl ON($link_tbl.linkto=$nonempty_tbl.id)" 
-            . " WHERE ISNULL($nonempty_tbl.id) AND linked.id=$link_tbl.linkfrom"
+        $sql = "SELECT p.pagename, pp.pagename as wantedfrom"
+            . " FROM $page_tbl p JOIN $link_tbl linked "
+            . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
+            . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id" 
+            . " WHERE ne.id is NULL"
+            .       " AND p.id = linked.linkfrom"
             . $exclude_from
             . $exclude
             . $orderby;
@@ -1055,10 +1025,10 @@
                       . " SELECT $recent_tbl.id"
                       . " FROM $recent_tbl, $version_tbl"
                       . " WHERE $recent_tbl.id=$version_tbl.id"
-                      . "       AND version=latestversion"
+                      .       " AND version=latestversion"
                       // We have some specifics here (Oracle)
                       //. "  AND content<>''"
-                      . "  AND content $notempty"
+                      . "  AND content $notempty" // On Oracle not just "<>''"
                       . ( $pageid ? " AND $recent_tbl.id=$pageid" : ""));
         $this->unlock(array('nonempty'));
     }
@@ -1072,7 +1042,7 @@
      * @access protected
      */
     function lock($tables, $write_lock = true) {
-            $this->_dbh->StartTrans();
+	$this->_dbh->StartTrans();
         if ($this->_lock_count++ == 0) {
             $this->_current_lock = $tables;
             $this->_lock_tables($tables, $write_lock);
@@ -1103,7 +1073,7 @@
             return;
         }
         if (--$this->_lock_count <= 0 || $force) {
-            $this->_unlock_tables($tables);
+            $this->_unlock_tables($tables, $force);
             $this->_current_lock = false;
             $this->_lock_count = 0;
         }
@@ -1113,7 +1083,7 @@
     /**
      * overridden by non-transaction safe backends
      */
-    function _unlock_tables($tables, $write_lock) {
+    function _unlock_tables($tables, $write_lock=false) {
         return;
     }
 
@@ -1264,36 +1234,10 @@
     }
 }
 
-class WikiDB_backend_ADODB_search
-extends WikiDB_backend_search
+class WikiDB_backend_ADODB_search extends WikiDB_backend_search_sql 
 {
-    function WikiDB_backend_ADODB_search(&$search, &$dbh) {
-        $this->_dbh =& $dbh;
-        $this->_case_exact = $search->_case_exact;
-        $this->_stoplist =& $search->_stoplist;
-    }
-    function _pagename_match_clause($node) {
-        $word = $node->sql();
-        if ($word == '%')
-            return "1=1";
-        else
-            return ($this->_case_exact 
-                    ? "pagename LIKE '$word'"
-                    : "LOWER(pagename) LIKE '$word'");
-    }
-    function _fulltext_match_clause($node) { 
-        $word = $node->sql();
-        if ($word == '%')
-            return "1=1";
-        // eliminate stoplist words
-        if (preg_match("/^%".$this->_stoplist."%/i", $word) 
-            or preg_match("/^".$this->_stoplist."$/i", $word))
-            return $this->_pagename_match_clause($node);
-        else
-            return ($this->_case_exact
-                    ? "pagename LIKE '$word' OR content LIKE '$word'"
-                    : "LOWER(pagename) LIKE '$word' OR content LIKE '$word'");
-    }
+    // no surrounding quotes because we know it's a string
+    // function _quote($word) { return $this->_dbh->escapeSimple($word); }
 }
 
 // Following function taken from Pear::DB (prev. from adodb-pear.inc.php).
@@ -1456,6 +1400,22 @@
     }
 
 // $Log: ADODB.php,v $
+// Revision 1.88  2006/05/14 12:28:03  rurban
+// mysql 5.x fix for wantedpages join
+//
+// Revision 1.82  2005/10/31 16:48:22  rurban
+// move mysql-specifics into its special class
+//
+// Eliminate stoplist words,
+// don't extract %pagedate twice in ADODB,
+// fix fulltext search,
+//
+// Revision 1.81  2005/10/10 19:42:14  rurban
+// fix wanted_pages SQL syntax
+//
+// Revision 1.79  2005/09/28 19:08:41  rurban
+// dont use LIMIT on modifying queries
+//
 // Revision 1.78  2005/09/14 06:04:43  rurban
 // optimize searching for ALL (ie %), use the stoplist on PDO
 //
diff -ruN 11p1/lib/WikiDB/backend/ADODB_postgres7.php 12p3/lib/WikiDB/backend/ADODB_postgres7.php
--- 11p1/lib/WikiDB/backend/ADODB_postgres7.php	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/lib/WikiDB/backend/ADODB_postgres7.php	2006-06-18 06:19:26.000000000 -0500
@@ -0,0 +1,163 @@
+<?php // -*-php-*-
+rcs_id('$Id: ADODB_postgres7.php,v 1.3 2005/10/31 16:49:02 rurban Exp $');
+
+require_once('lib/WikiDB/backend/ADODB.php');
+
+if (!defined("USE_BYTEA"))     // see schemas/psql-initialize.sql
+    define("USE_BYTEA", true); // only BYTEA is binary safe
+    //define("USE_BYTEA", false);
+
+/**
+ * WikiDB layer for ADODB-postgres (7 or 8), called by lib/WikiDB/ADODB.php.
+ * Pending changes from CVS HEAD:
+ *  - use Foreign Keys and ON DELETE CASCADE.
+ *  - bytea blob type
+ *  - tsearch2
+ * 
+ * @author: Reini Urban
+ */
+class WikiDB_backend_ADODB_postgres7
+extends WikiDB_backend_ADODB
+{
+    /**
+     * Constructor.
+     */
+    function WikiDB_backend_ADODB_postgres7($dbparams) {
+        $this->WikiDB_backend_ADODB($dbparams);
+
+        $this->_serverinfo = $this->_dbh->ServerInfo();
+        if (!empty($this->_serverinfo['version'])) {
+            $arr = explode('.',$this->_serverinfo['version']);
+            $this->_serverinfo['version'] = (string)(($arr[0] * 100) + $arr[1]);
+	    if (!empty($arr[2]))
+		$this->_serverinfo['version'] .= ("." . (integer)$arr[2]);
+        }
+    }
+
+    /**
+     * Pack tables.
+     */
+    function optimize() {
+        foreach ($this->_table_names as $table) {
+            $this->_dbh->Execute("VACUUM ANALYZE $table");
+        }
+        return 1;
+    }
+
+    // just for blobs. the rest is escaped with qstr()
+    function _quote($s) {
+	if (USE_BYTEA)
+	    return $this->_dbh->BlobEncode($s);
+        return base64_encode($s);
+    }
+
+    // just for blobs, which might be base64_encoded
+    function _unquote($s) {
+	if (USE_BYTEA) {
+	    //if function_exists('pg_unescape_bytea')
+	    //return pg_unescape_bytea($s);
+	    // TODO: already unescaped by ADORecordSet_postgres64::_decode?
+	    return $s;
+	}
+        return base64_decode($s);
+    }
+
+    function get_cached_html($pagename) {
+        $dbh = &$this->_dbh;
+        $page_tbl = $this->_table_names['page_tbl'];
+	$data = $dbh->GetOne(sprintf("SELECT cached_html FROM $page_tbl WHERE pagename=%s",
+                                     $dbh->qstr($pagename)));
+        if ($data) return $this->_unquote($data);
+        else return '';
+    }
+
+    function set_cached_html($pagename, $data) {
+        $dbh = &$this->_dbh;
+        $page_tbl = $this->_table_names['page_tbl'];
+	if (USE_BYTEA) {
+	    $dbh->UpdateBlob($page_tbl,'cached_html',$data,"pagename=".$dbh->qstr($pagename));
+	    /*
+	    $dbh->Execute(sprintf("UPDATE $page_tbl"
+				  . " SET cached_html='%s'"
+				  . " WHERE pagename=%s",
+				  $this->_quote($data), 
+				  $dbh->qstr($pagename)));
+	    */
+	} else {
+	    $dbh->Execute("UPDATE $page_tbl"
+			  . " SET cached_html=?"
+			  . " WHERE pagename=?",
+			  array($this->_quote($data), $pagename));
+        }
+    }
+
+    /**
+     * Lock all tables we might use.
+     * postgresql has proper transactions so we dont need table locks.
+     */
+    function _lock_tables($tables, $write_lock = true) {
+        ;
+    }
+
+    /**
+     * Unlock all tables.
+     * postgresql has proper transactions so we dont need table locks.
+     */
+    function _unlock_tables($tables, $write_lock=false) {
+        ;
+    }
+
+    /**
+     * Serialize data
+     */
+    function _serialize($data) {
+        if (empty($data))
+            return '';
+        assert(is_array($data));
+        return $this->_quote(serialize($data));
+    }
+
+    /**
+     * Unserialize data
+     */
+    function _unserialize($data) {
+        if (empty($data))
+            return array();
+        // Base64 encoded data does not contain colons.
+        //  (only alphanumerics and '+' and '/'.)
+        if (substr($data,0,2) == 'a:')
+            return unserialize($data);
+        return unserialize($this->_unquote($data));
+    }
+
+};
+
+class WikiDB_backend_ADODB_postgres7_search
+extends WikiDB_backend_ADODB_search
+{
+    function _pagename_match_clause($node) {
+        $word = $node->sql();
+        if ($node->op == 'REGEX') { // posix regex extensions
+            return ($this->_case_exact 
+                    ? "pagename ~* '$word'"
+                    : "pagename ~ '$word'");
+        } else {
+            return ($this->_case_exact 
+                    ? "pagename LIKE '$word'" 
+                    : "pagename ILIKE '$word'");
+        }
+    }
+
+    // TODO: use tsearch2
+    //function _fulltext_match_clause($node)
+}
+
+// (c-file-style: "gnu")
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:   
+?>
diff -ruN 11p1/lib/WikiDB/backend/cvs.php 12p3/lib/WikiDB/backend/cvs.php
--- 11p1/lib/WikiDB/backend/cvs.php	2005-09-11 08:25:12.000000000 -0500
+++ 12p3/lib/WikiDB/backend/cvs.php	2006-06-18 06:19:27.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: cvs.php,v 1.25 2005/09/11 13:23:21 rurban Exp $');
+rcs_id('$Id: cvs.php,v 1.26 2005/11/14 22:24:33 rurban Exp $');
 /**
  * Backend for handling CVS repository. 
  *
@@ -413,13 +413,15 @@
                               $this->_getAllFileNamesInDir( $this->_docDir ));
     }
 
-    function text_search($search = '', $fullsearch = false, $orderby=false, $limit=false, $exclude=false) 
+    function text_search($search, $fullsearch = false, $orderby=false, $limit=false, $exclude=false) 
     {
         if ( $fullsearch ) {
-            return new Cvs_Backend_Full_Search_Iterator(
+            $iter = new Cvs_Backend_Full_Search_Iterator(
                                $this->_getAllFileNamesInDir( $this->_docDir ), 
                                $search, 
                                $this->_docDir );
+            $iter->stoplisted =& $search->stoplisted;
+            return $iter;
         } else {
             return new Cvs_Backend_Title_Search_Iterator(
                                $this->_getAllFileNamesInDir( $this->_docDir ),
diff -ruN 11p1/lib/WikiDB/backend/dumb/TextSearchIter.php 12p3/lib/WikiDB/backend/dumb/TextSearchIter.php
--- 11p1/lib/WikiDB/backend/dumb/TextSearchIter.php	2005-09-11 09:55:05.000000000 -0500
+++ 12p3/lib/WikiDB/backend/dumb/TextSearchIter.php	2006-06-18 06:19:27.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: TextSearchIter.php,v 1.6 2005/09/11 14:55:05 rurban Exp $');
+rcs_id('$Id: TextSearchIter.php,v 1.7 2005/11/14 22:24:33 rurban Exp $');
 
 class WikiDB_backend_dumb_TextSearchIter
 extends WikiDB_backend_iterator
@@ -10,9 +10,10 @@
         $this->_backend = &$backend;
         $this->_pages = $pages;
         $this->_fulltext = $fulltext;
-        $this->_search  = $search;
+        $this->_search  =& $search;
         $this->_index   = 0;
         $this->_stoplist =& $search->_stoplist;
+        $this->stoplisted = array();
 
         if (isset($options['limit'])) $this->_limit = $options['limit'];
         else $this->_limit = 0;
@@ -38,8 +39,10 @@
 
         if ($this->_fulltext) {
             // eliminate stoplist words from fulltext search
-            if (preg_match("/^".$this->_stoplist."$/i", $text))
+            if (preg_match("/^".$this->_stoplist."$/i", $text)) {
+                $this->stoplisted[] = $text;
                 return $result;
+            }
             $text .= "\n" . $this->_get_content($page);
             return $this->_search->match($text);
         } else
diff -ruN 11p1/lib/WikiDB/backend/PDO.php 12p3/lib/WikiDB/backend/PDO.php
--- 11p1/lib/WikiDB/backend/PDO.php	2005-09-14 01:04:43.000000000 -0500
+++ 12p3/lib/WikiDB/backend/PDO.php	2006-06-18 06:19:27.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PDO.php,v 1.5 2005/09/14 06:04:43 rurban Exp $');
+rcs_id('$Id: PDO.php,v 1.7 2006/05/14 12:28:03 rurban Exp $');
 
 /*
  Copyright 2005 $ThePhpWikiProgrammingTeam
@@ -865,7 +865,9 @@
                              . $limit);
         $sth->execute();
         $result = $sth->fetch(PDO_FETCH_NUM);
-        return new WikiDB_backend_PDO_iter($this, $result, $field_list);
+        $iter = new WikiDB_backend_PDO_iter($this, $result, $field_list);
+        $iter->stoplisted = $searchobj->stoplisted;
+        return $iter;
     }
 
     /*
@@ -1014,11 +1016,12 @@
              left join page on(link.linkto=page.id) left join nonempty on(link.linkto=nonempty.id) 
              where isnull(nonempty.id) and linked.id=link.linkfrom;  
         */
-        $sql = "SELECT $page_tbl.pagename,linked.pagename as wantedfrom"
-            . " FROM $link_tbl,$page_tbl as linked "
-            . " LEFT JOIN $page_tbl ON($link_tbl.linkto=$page_tbl.id)"
-            . " LEFT JOIN $nonempty_tbl ON($link_tbl.linkto=$nonempty_tbl.id)" 
-            . " WHERE ISNULL($nonempty_tbl.id) AND linked.id=$link_tbl.linkfrom"
+        $sql = "SELECT p.pagename, pp.pagename as wantedfrom"
+            . " FROM $page_tbl p JOIN $link_tbl linked"
+            . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
+            . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id" 
+            . " WHERE ne.id is NULL"
+	    .       " AND p.id = linked.linkfrom"
             . $exclude_from
             . $exclude
             . $orderby;
@@ -1295,37 +1298,7 @@
     }
 }
 
-class WikiDB_backend_PDO_search
-extends WikiDB_backend_search
-{
-    function WikiDB_backend_PDO_search(&$search, &$dbh) {
-        $this->_dbh =& $dbh;
-        $this->_case_exact = $search->_case_exact;
-    }
-    function _pagename_match_clause($node) {
-        // word already quoted by TextSearchQuery_node_word::_sql_quote()
-        $word = $node->sql();
-        if ($word == '%')
-            return "1=1";
-        else
-            return ($this->_case_exact 
-                    ? "pagename LIKE '$word'"
-                    : "LOWER(pagename) LIKE '$word'");
-    }
-    function _fulltext_match_clause($node) { 
-        $word = $node->sql();
-        if ($word == '%')
-            return "1=1";
-        // eliminate stoplist words
-        if (preg_match("/^%".$this->_stoplist."%/i", $word) 
-            or preg_match("/^".$this->_stoplist."$/i", $word))
-            return $this->_pagename_match_clause($node);
-        else
-            return $this->_pagename_match_clause($node)
-                . ($this->_case_exact ? " OR content LIKE '$word'" 
-                                      : " OR LOWER(content) LIKE '$word'");
-    }
-}
+class WikiDB_backend_PDO_search extends WikiDB_backend_search_sql {}
 
 // Following function taken from Pear::DB (prev. from adodb-pear.inc.php).
 // Eventually, change index.php to provide the relevant information
@@ -1487,6 +1460,16 @@
     }
 
 // $Log: PDO.php,v $
+// Revision 1.7  2006/05/14 12:28:03  rurban
+// mysql 5.x fix for wantedpages join
+//
+// Revision 1.6  2005/11/14 22:24:33  rurban
+// fix fulltext search,
+// Eliminate stoplist words,
+// don't extract %pagedate twice in ADODB,
+// add SemanticWeb support: link(relation),
+// major postgresql update: stored procedures, tsearch2 for fulltext
+//
 // Revision 1.5  2005/09/14 06:04:43  rurban
 // optimize searching for ALL (ie %), use the stoplist on PDO
 //
diff -ruN 11p1/lib/WikiDB/backend/PearDB_mysql.php 12p3/lib/WikiDB/backend/PearDB_mysql.php
--- 11p1/lib/WikiDB/backend/PearDB_mysql.php	2005-09-11 08:25:12.000000000 -0500
+++ 12p3/lib/WikiDB/backend/PearDB_mysql.php	2006-06-18 06:19:27.000000000 -0500
@@ -1,8 +1,10 @@
 <?php // -*-php-*-
-rcs_id('$Id: PearDB_mysql.php,v 1.20 2005/08/07 10:11:24 rurban Exp $');
+rcs_id('$Id: PearDB_mysql.php,v 1.23 2006/06/18 11:13:25 rurban Exp $');
 
 require_once('lib/WikiDB/backend/PearDB.php');
 
+// See http://sql-info.de/mysql/gotchas.html for mysql specific quirks.
+
 // The slowest function overall is mysql_connect with [680ms]
 // 2nd is db_mysql::simpleQuery with [257ms]
 class WikiDB_backend_PearDB_mysql
@@ -111,6 +113,36 @@
                     . " GROUP BY id" );
     }
 
+    /* ISNULL is mysql specific */
+    function wanted_pages($exclude_from='', $exclude='', $sortby=false, $limit=false) {
+        $dbh = &$this->_dbh;
+        extract($this->_table_names);
+        if ($orderby = $this->sortby($sortby, 'db', array('pagename','wantedfrom')))
+            $orderby = 'ORDER BY ' . $orderby;
+
+        if ($exclude_from) // array of pagenames
+            $exclude_from = " AND pp.pagename NOT IN ".$this->_sql_set($exclude_from);
+        if ($exclude) // array of pagenames
+            $exclude = " AND p.pagename NOT IN ".$this->_sql_set($exclude);
+
+        $sql = "SELECT p.pagename, pp.pagename as wantedfrom"
+            . " FROM $page_tbl p JOIN $link_tbl linked"
+            . " LEFT JOIN $page_tbl pp ON (linked.linkto = pp.id)"
+            . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)" 
+            . " WHERE ISNULL(ne.id)"
+            .       " AND p.id = linked.linkfrom"
+            . $exclude_from
+            . $exclude
+            . $orderby;
+        if ($limit) {
+            list($from, $count) = $this->limit($limit);
+            $result = $dbh->limitQuery($sql, $from, $count * 3);
+        } else {
+            $result = $dbh->query($sql);
+        }
+        return new WikiDB_backend_PearDB_generic_iter($this, $result);
+    }
+
     /* // REPLACE will not delete empy pages, so it was removed --ru
     function _update_nonempty_table($pageid = false) {
         $dbh = &$this->_dbh;
@@ -200,4 +232,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:   
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/WikiDB/backend/PearDB_oci8.php 12p3/lib/WikiDB/backend/PearDB_oci8.php
--- 11p1/lib/WikiDB/backend/PearDB_oci8.php	2005-09-11 08:25:12.000000000 -0500
+++ 12p3/lib/WikiDB/backend/PearDB_oci8.php	2006-06-18 06:19:27.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PearDB_oci8.php,v 1.8 2005/01/18 20:55:48 rurban Exp $');
+rcs_id('$Id: PearDB_oci8.php,v 1.9 2005/11/14 22:24:33 rurban Exp $');
 
 /**
  * Oracle extensions for the Pear DB backend.
@@ -72,9 +72,11 @@
     // Index on the CLOB. While it is very efficient, it requires the
     // Intermedia Text option, so let's stick to the 'simple' thing
     // Note that this does only an exact fulltext search, not using MATCH or LIKE.
-    function _fulltext_match_clause($node) { 
-        $page = $node->sql($word);
-        $exactword = $node->_sql_quote();
+    function _fulltext_match_clause($node) {
+        if ($this->isStoplisted($node))
+            return "1=1";
+        $page = $node->sql();
+        $exactword = $node->_sql_quote($node->word);
         return ($this->_case_exact
                 ? "pagename LIKE '$page' OR DBMS_LOB.INSTR(content, '$exactword') > 0"
                 : "LOWER(pagename) LIKE '$page' OR DBMS_LOB.INSTR(content, '$exactword') > 0");
diff -ruN 11p1/lib/WikiDB/backend/PearDB_pgsql.php 12p3/lib/WikiDB/backend/PearDB_pgsql.php
--- 11p1/lib/WikiDB/backend/PearDB_pgsql.php	2005-09-11 08:25:12.000000000 -0500
+++ 12p3/lib/WikiDB/backend/PearDB_pgsql.php	2006-06-18 06:19:27.000000000 -0500
@@ -4,6 +4,17 @@
 require_once('lib/ErrorManager.php');
 require_once('lib/WikiDB/backend/PearDB.php');
 
+if (!defined("USE_BYTEA"))     // see schemas/psql-initialize.sql
+    define("USE_BYTEA", true); // only BYTEA is binary safe!
+    //define("USE_BYTEA", false);
+
+/*
+Pending changes from CVS HEAD:
+ * Foreign Keys 
+ * ON DELETE CASCADE
+ * tsearch2
+*/
+
 class WikiDB_backend_PearDB_pgsql
 extends WikiDB_backend_PearDB
 {
@@ -19,10 +30,10 @@
         // so that they don't get reported to the user.  (They are
         // not consequential.)  
 
-        global $ErrorManager;
-        $ErrorManager->pushErrorHandler(new WikiMethodCb($this,'_pgsql_open_error'));
+        //global $ErrorManager;
+        //$ErrorManager->pushErrorHandler(new WikiMethodCb($this,'_pgsql_open_error'));
         $this->WikiDB_backend_PearDB($dbparams);
-        $ErrorManager->popErrorHandler();
+        //$ErrorManager->popErrorHandler();
     }
 
     function _pgsql_open_error($error) {
@@ -37,43 +48,67 @@
      */
     function optimize() {
         foreach ($this->_table_names as $table) {
+            // see /var/log/postgresql.log for any errors
+            // and disable this line here if the wikiuser doesn't have proper permissions
             $this->_dbh->query("VACUUM ANALYZE $table");
         }
         return 1;
     }
 
+    function _quote($s) {
+        if (USE_BYTEA)
+            return pg_escape_bytea($s);
+        else 
+            // pg_escape_string() is broken
+	    return base64_encode($s);
+    }
+
+    function _unquote($s) {
+        if (USE_BYTEA)
+            return pg_unescape_bytea($s);
+        else
+	    return base64_decode($s);
+    }
+
     // Until the binary escape problems on pear pgsql are solved */
     function get_cached_html($pagename) {
         $dbh = &$this->_dbh;
         $page_tbl = $this->_table_names['page_tbl'];
         $data = $dbh->GetOne(sprintf("SELECT cached_html FROM $page_tbl WHERE pagename='%s'",
                                      $dbh->escapeSimple($pagename)));
-        if ($data) return base64_decode($data);
+        if ($data) return $this->_unquote($data);
         else return '';
     }
 
     function set_cached_html($pagename, $data) {
         $dbh = &$this->_dbh;
         $page_tbl = $this->_table_names['page_tbl'];
-        $sth = $dbh->query("UPDATE $page_tbl"
-                           . " SET cached_html=?"
-                           . " WHERE pagename=?",
-                           // pear does NOT use pg_escape_string()! Oh dear.
-                           array(base64_encode($data), $pagename));
+        if (USE_BYTEA)
+            $sth = $dbh->query(sprintf("UPDATE $page_tbl"
+                                       . " SET cached_html='%s'"
+                                       . " WHERE pagename='%s'",
+                                       $this->_quote($data), 
+                                       $dbh->escapeSimple($pagename)));
+        else
+            $sth = $dbh->query("UPDATE $page_tbl"
+                               . " SET cached_html=?"
+                               . " WHERE pagename=?",
+                               // PearDB does NOT use pg_escape_string()! Oh dear.
+                               array($this->_quote($data), $pagename));
     }
 
     /**
      * Lock all tables we might use.
      */
     function _lock_tables($write_lock = true) {
-        $this->_dbh->query("BEGIN WORK");
+        $this->_dbh->query("BEGIN");
     }
 
     /**
      * Unlock all tables.
      */
     function _unlock_tables() {
-        $this->_dbh->query("COMMIT WORK");
+        $this->_dbh->query("COMMIT");
     }
 
     /**
@@ -83,7 +118,7 @@
         if (empty($data))
             return '';
         assert(is_array($data));
-        return base64_encode(serialize($data));
+        return $this->_quote(serialize($data));
     }
 
     /**
@@ -96,7 +131,7 @@
         //  (only alphanumerics and '+' and '/'.)
         if (substr($data,0,2) == 'a:')
             return unserialize($data);
-        return unserialize(base64_decode($data));
+        return unserialize($this->_unquote($data));
     }
 };
 
diff -ruN 11p1/lib/WikiDB/backend/PearDB.php 12p3/lib/WikiDB/backend/PearDB.php
--- 11p1/lib/WikiDB/backend/PearDB.php	2005-09-14 01:04:43.000000000 -0500
+++ 12p3/lib/WikiDB/backend/PearDB.php	2006-06-18 06:19:27.000000000 -0500
@@ -510,10 +510,12 @@
 
 	if ($links) {
             foreach($links as $link) {
+                // avoid duplicates
                 if (isset($linkseen[$link]))
                     continue;
                 $linkseen[$link] = true;
                 $linkid = $this->_get_pageid($link, true);
+                assert($linkid);
                 $dbh->query("INSERT INTO $link_tbl (linkfrom, linkto)"
                             . " VALUES ($pageid, $linkid)");
             }
@@ -541,14 +543,11 @@
             $exclude='';
 
         $qpagename = $dbh->escapeSimple($pagename);
-        $sql = "SELECT $want.id as id, $want.pagename as pagename, $want.hits as hits"
-            // Looks like 'AS' in column alias is a MySQL thing, Oracle does not like it
-            // and the PostgresSQL manual does not have it either
-            // Since it is optional in mySQL, just remove it...
+        $sql = "SELECT $want.id AS id, $want.pagename AS pagename "
             . " FROM $link_tbl, $page_tbl linker, $page_tbl linkee"
             . (!$include_empty ? ", $nonempty_tbl" : '')
             . " WHERE linkfrom=linker.id AND linkto=linkee.id"
-            . "  AND $have.pagename='$qpagename'"
+            . " AND $have.pagename='$qpagename'"
             . (!$include_empty ? " AND $nonempty_tbl.id=$want.id" : "")
             //. " GROUP BY $want.id"
             . $exclude
@@ -646,11 +645,14 @@
     /**
      * Title search.
      */
-    function text_search($search, $fulltext=false, $sortby=false, $limit=false, $exclude=false) {
+    function text_search($search, $fulltext=false, $sortby=false, $limit=false, 
+                         $exclude=false) 
+    {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $orderby = $this->sortby($sortby, 'db');
         if ($orderby) $orderby = ' ORDER BY ' . $orderby;
+        //else " ORDER BY rank($field, to_tsquery('$searchon')) DESC";
 
         $searchclass = get_class($this)."_search";
         // no need to define it everywhere and then fallback. memory!
@@ -687,7 +689,9 @@
              $result = $dbh->query($sql);
          }
         
-        return new WikiDB_backend_PearDB_iter($this, $result);
+        $iter = new WikiDB_backend_PearDB_iter($this, $result);
+        $iter->stoplisted = @$searchobj->stoplisted;
+        return $iter;
     }
 
     //Todo: check if the better Mysql MATCH operator is supported,
@@ -844,15 +848,15 @@
             $orderby = 'ORDER BY ' . $orderby;
 
         if ($exclude_from) // array of pagenames
-            $exclude_from = " AND linked.pagename NOT IN ".$this->_sql_set($exclude_from);
+            $exclude_from = " AND pp.pagename NOT IN ".$this->_sql_set($exclude_from);
         if ($exclude) // array of pagenames
-            $exclude = " AND $page_tbl.pagename NOT IN ".$this->_sql_set($exclude);
-
-        $sql = "SELECT $page_tbl.pagename,linked.pagename as wantedfrom"
-            . " FROM $link_tbl,$page_tbl as linked "
-            . " LEFT JOIN $page_tbl ON($link_tbl.linkto=$page_tbl.id)"
-            . " LEFT JOIN $nonempty_tbl ON($link_tbl.linkto=$nonempty_tbl.id)" 
-            . " WHERE ISNULL($nonempty_tbl.id) AND linked.id=$link_tbl.linkfrom"
+            $exclude = " AND p.pagename NOT IN ".$this->_sql_set($exclude);
+        $sql = "SELECT p.pagename, pp.pagename as wantedfrom"
+            . " FROM $page_tbl p JOIN $link_tbl linked"
+            . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id"
+            . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id" 
+            . " WHERE ne.id is NULL"
+	    .       " AND p.id = linked.linkfrom"
             . $exclude_from
             . $exclude
             . $orderby;
@@ -876,7 +880,7 @@
     /**
      * Rename page in the database.
      */
-    function rename_page($pagename, $to) {
+    function rename_page ($pagename, $to) {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         
@@ -1210,41 +1214,23 @@
     }
 }
 
-// word search
-class WikiDB_backend_PearDB_search
-extends WikiDB_backend_search
+class WikiDB_backend_PearDB_search extends WikiDB_backend_search_sql 
 {
-    function WikiDB_backend_PearDB_search(&$search, &$dbh) {
-        $this->_dbh = $dbh;
-        $this->_case_exact = $search->_case_exact;
-        $this->_stoplist =& $search->_stoplist;
-    }
-    function _pagename_match_clause($node) { 
-        $word = $node->sql();
-        if ($word == '%')
-            return "1=1";
-        else
-            return ($this->_case_exact 
-                    ? "pagename LIKE '$word'" 
-                    : "LOWER(pagename) LIKE '$word'");
-    }
-    function _fulltext_match_clause($node) { 
-        $word = $node->sql();
-        if ($word == '%')
-            return "1=1";
-        // eliminate stoplist words
-        if (preg_match("/^%".$this->_stoplist."%/i", $word) 
-            or preg_match("/^".$this->_stoplist."$/i", $word))
-            return $this->_pagename_match_clause($node);
-        else
-            return $this->_pagename_match_clause($node)
-                // probably convert this MATCH AGAINST or SUBSTR/POSITION without wildcards
-                . ($this->_case_exact ? " OR content LIKE '$word'" 
-                                      : " OR LOWER(content) LIKE '$word'");
-    }
+    // no surrounding quotes because we know it's a string
+    // function _quote($word) { return $this->_dbh->addq($word); }
 }
 
 // $Log: PearDB.php,v $
+// Revision 1.97  2006/05/14 12:28:03  rurban
+// mysql 5.x fix for wantedpages join
+//
+// Revision 1.94  2005/11/14 22:24:33  rurban
+// fix fulltext search,
+// Eliminate stoplist words,
+//
+// Revision 1.93  2005/10/10 19:42:15  rurban
+// fix wanted_pages SQL syntax
+//
 // Revision 1.92  2005/09/14 06:04:43  rurban
 // optimize searching for ALL (ie %), use the stoplist on PDO
 //
diff -ruN 11p1/lib/WikiDB/backend/sqlite-destroy.sql 12p3/lib/WikiDB/backend/sqlite-destroy.sql
--- 11p1/lib/WikiDB/backend/sqlite-destroy.sql	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/lib/WikiDB/backend/sqlite-destroy.sql	2006-06-18 06:19:27.000000000 -0500
@@ -0,0 +1,14 @@
+-- http://www.hezmatt.org/~mpalmer/sqlite-phpwiki/sqlite.sql
+
+-- $Id: sqlite-destroy.sql,v 1.3 2005/09/28 19:27:23 rurban Exp $
+
+DROP TABLE page;
+DROP TABLE version;
+DROP TABLE recent;
+DROP TABLE nonempty;
+DROP TABLE link;
+DROP TABLE session;
+DROP TABLE pref;
+DROP TABLE member;
+DROP TABLE rating;
+DROP TABLE accesslog;
diff -ruN 11p1/lib/WikiDB/backend/sqlite-initialize.sql 12p3/lib/WikiDB/backend/sqlite-initialize.sql
--- 11p1/lib/WikiDB/backend/sqlite-initialize.sql	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/lib/WikiDB/backend/sqlite-initialize.sql	2006-06-18 06:19:27.000000000 -0500
@@ -0,0 +1,108 @@
+-- http://www.hezmatt.org/~mpalmer/sqlite-phpwiki/sqlite.sql
+
+-- $Id: sqlite-initialize.sql,v 1.4 2005/09/28 19:27:23 rurban Exp $
+
+CREATE TABLE page (
+	id              INTEGER PRIMARY KEY,
+	pagename        VARCHAR(100) NOT NULL,
+	hits            INTEGER NOT NULL DEFAULT 0,
+	pagedata        MEDIUMTEXT NOT NULL DEFAULT '',
+	cached_html 	MEDIUMTEXT               -- added with 1.3.11
+);
+CREATE UNIQUE INDEX page_index ON page (pagename);
+
+CREATE TABLE version (
+	id              INTEGER NOT NULL,
+	version         INTEGER NOT NULL,
+	mtime           INTEGER NOT NULL,
+	minor_edit      TINYINTEGER DEFAULT 0,
+	content         MEDIUMTEXT NOT NULL DEFAULT '',
+	versiondata     MEDIUMTEXT NOT NULL DEFAULT '',
+	PRIMARY KEY (id,version)
+);
+CREATE INDEX version_index ON version (mtime);
+
+CREATE TABLE recent (
+	id              INTEGER NOT NULL PRIMARY KEY,
+	latestversion   INTEGER,
+	latestmajor     INTEGER,
+	latestminor     INTEGER
+);
+
+CREATE TABLE nonempty (
+	id              INTEGER NOT NULL
+);
+CREATE INDEX nonempty_index ON nonempty (id);
+
+CREATE TABLE link (
+	linkfrom        INTEGER NOT NULL,
+	linkto          INTEGER NOT NULL
+);
+CREATE INDEX linkfrom_index ON link (linkfrom);
+CREATE INDEX linkto_index ON link (linkto);
+
+CREATE TABLE session (
+	sess_id   CHAR(32) NOT NULL DEFAULT '' PRIMARY KEY,
+	sess_data MEDIUMTEXT NOT NULL,
+	sess_date INTEGER UNSIGNED NOT NULL,
+	sess_ip   CHAR(40) NOT NULL
+);
+CREATE INDEX sessdate_index ON session (sess_date);
+CREATE INDEX sessip_index ON session (sess_ip);
+
+-- Optional DB Auth and Prefs
+-- For these tables below the default table prefix must be used 
+-- in the DBAuthParam SQL statements also.
+
+CREATE TABLE pref (
+  	userid 	CHAR(48) NOT NULL PRIMARY KEY,
+  	prefs  	MEDIUMTEXT NULL DEFAULT '',
+  	passwd 	CHAR(48) DEFAULT '',
+	groupname CHAR(48) DEFAULT 'users',
+);
+
+-- Use the member table, if you need it for n:m user-group relations,
+-- and adjust your DBAUTH_AUTH_ SQL statements.
+CREATE TABLE member (
+	userid    CHAR(48) NOT NULL,
+   	groupname CHAR(48) NOT NULL DEFAULT 'users'
+);
+CREATE INDEX member_userid ON member (userid);
+CREATE INDEX member_groupname ON member (groupname);
+
+-- only if you plan to use the wikilens theme
+CREATE TABLE rating (
+        dimension TINYINTEGER NOT NULL,
+        raterpage INTEGER NOT NULL,
+        rateepage INTEGER NOT NULL,
+        ratingvalue FLOAT NOT NULL,
+        rateeversion INTEGER NOT NULL,
+        tstamp INTEGER UNSIGNED NOT NULL,
+        PRIMARY KEY (dimension, raterpage, rateepage)
+);
+CREATE INDEX rating_dimension ON rating (dimension);
+CREATE INDEX rating_raterpage ON rating (raterpage);
+CREATE INDEX rating_rateepage ON rating (rateepage);
+
+-- if ACCESS_LOG_SQL > 0
+-- only if you need fast log-analysis (spam prevention, recent referrers)
+-- see http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
+CREATE TABLE accesslog (
+        time_stamp    INTEGER UNSIGNED,
+	remote_host   VARCHAR(50),
+	remote_user   VARCHAR(50),
+        request_method VARCHAR(10),
+	request_line  VARCHAR(255),
+	request_args  VARCHAR(255),
+	request_file  VARCHAR(255),
+	request_uri   VARCHAR(255),
+	request_time  CHAR(28),
+	status 	      TINYINTEGER UNSIGNED,
+	bytes_sent    TINYINTEGER UNSIGNED,
+        referer       VARCHAR(255), 
+	agent         VARCHAR(255),
+	request_duration FLOAT
+);
+CREATE INDEX log_time ON accesslog (time_stamp);
+CREATE INDEX log_host ON accesslog (remote_host);
+-- create extra indices on demand (usually referer. see plugin/AccessLogSql)
diff -ruN 11p1/lib/WikiDB/backend.php 12p3/lib/WikiDB/backend.php
--- 11p1/lib/WikiDB/backend.php	2005-09-11 08:23:21.000000000 -0500
+++ 12p3/lib/WikiDB/backend.php	2006-06-18 06:19:27.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: backend.php,v 1.25 2005/09/11 13:23:21 rurban Exp $');
+rcs_id('$Id: backend.php,v 1.26 2005/11/14 22:24:33 rurban Exp $');
 
 /*
   Pagedata
@@ -603,13 +603,15 @@
 };
 
 /**
- * search baseclass, pcre-specific. only overriden by sql backends.
+ * search baseclass, pcre-specific
  */
 class WikiDB_backend_search
 {
-    function WikiDB_backend_search(&$dbh, $search) {
+    function WikiDB_backend_search($search, &$dbh) {
         $this->_dbh = $dbh;
-        $this->_case_exact = $search->_case_exact;
+        $this->_case_exact =  $search->_case_exact;
+        $this->_stoplist   =& $search->_stoplist;
+        $this->_stoplisted = array();
     }
     function _quote($word) {
         return preg_quote($word, "/");
@@ -626,6 +628,50 @@
         $word = $this->$method($node->word);
         return "preg_match(\"/\".$word.\"/\"".($this->_case_exact ? "i":"").")";
     }
+    /* Eliminate stoplist words.
+       Keep a list of Stoplisted words to inform the poor user. */
+    function isStoplisted ($node) {
+    	// check only on WORD or EXACT fulltext search
+    	if ($node->op != 'WORD' and $node->op != 'EXACT')
+    	    return false;
+        if (preg_match("/^".$this->_stoplist."$/i", $node->word)) {
+            array_push($this->_stoplisted, $node->word);
+            return true;
+        }
+        return false;
+    }
+    function getStoplisted($word) {
+        return $this->_stoplisted;
+    }
+}
+
+/**
+ * search baseclass, sql-specific
+ */
+class WikiDB_backend_search_sql extends WikiDB_backend_search
+{
+    function _pagename_match_clause($node) {
+        // word already quoted by TextSearchQuery_node_word::_sql_quote()
+        $word = $node->sql();
+        if ($word == '%') // ALL shortcut
+            return "1=1";
+        else
+            return ($this->_case_exact 
+                    ? "pagename LIKE '$word'"
+                    : "LOWER(pagename) LIKE '$word'");
+    }
+    function _fulltext_match_clause($node) {
+        // force word-style %word% for fulltext search
+        $word = '%' . $node->_sql_quote($node->word) . '%';
+        // eliminate stoplist words
+        if ($this->isStoplisted($node))
+            return "1=1";  // and (pagename or 1) => and 1
+        else
+            return $this->_pagename_match_clause($node)
+                // probably convert this MATCH AGAINST or SUBSTR/POSITION without wildcards
+                . ($this->_case_exact ? " OR content LIKE '$word'" 
+                                      : " OR LOWER(content) LIKE '$word'");
+    }
 }
 
 // For emacs users
diff -ruN 11p1/lib/WikiDB/SQL.php 12p3/lib/WikiDB/SQL.php
--- 11p1/lib/WikiDB/SQL.php	2004-12-10 16:15:00.000000000 -0600
+++ 12p3/lib/WikiDB/SQL.php	2006-06-18 06:19:27.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: SQL.php,v 1.13 2004/12/10 22:15:00 rurban Exp $');
+<?php rcs_id('$Id: SQL.php,v 1.15 2005/10/30 15:49:00 rurban Exp $');
 
 require_once('lib/WikiDB.php');
 //require_once('lib/WikiDB/backend/PearDB.php');
@@ -10,16 +10,19 @@
 class WikiDB_SQL extends WikiDB
 {
     function WikiDB_SQL ($dbparams) {
-        $backend_type = 'PearDB';
+        $backend = 'PearDB';
         if (is_array($dbparams['dsn']))
-            $backend_type = $dbparams['dsn']['phptype'];
+            $backend = $dbparams['dsn']['phptype'];
         elseif (preg_match('/^(\w+):/', $dbparams['dsn'], $m))
-            $backend_type = $m[1];
-        include_once ("lib/WikiDB/backend/PearDB_".$backend_type.".php");
-        $backend_class = "WikiDB_backend_PearDB_".$backend_type;
+            $backend = $m[1];
+	if ($backend == 'postgres7') { // ADODB cross-compatiblity hack (for unit testing)
+	    $backend = 'pgsql';
+	    if (is_string($dbparams['dsn']))
+		$dbparams['dsn'] = $backend . ':' . substr($dbparams['dsn'], 10);
+	}
+        include_once ("lib/WikiDB/backend/PearDB_".$backend.".php");
+        $backend_class = "WikiDB_backend_PearDB_".$backend;
         $backend = & new $backend_class($dbparams);
-        //$this->_iwpcache = array();
-        
         $this->WikiDB($backend, $dbparams);
     }
     
@@ -97,4 +100,4 @@
 // indent-tabs-mode: nil
 // End:
 
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/WikiDB.php 12p3/lib/WikiDB.php
--- 11p1/lib/WikiDB.php	2005-09-11 09:19:44.000000000 -0500
+++ 12p3/lib/WikiDB.php	2006-06-18 06:19:27.000000000 -0500
@@ -220,20 +220,24 @@
         if (! $this->isWikiPage($pagename) and !isa($GLOBALS['request'],'MockRequest')) {
             $notify = $this->get('notify');
             if (!empty($notify) and is_array($notify)) {
+                global $request;
                 //TODO: deferr it (quite a massive load if you remove some pages).
                 //TODO: notification class which catches all changes,
-                //  and decides at the end of the request what to mail. (type, page, who, what, users, emails)
+                //  and decides at the end of the request what to mail. 
+                //  (type, page, who, what, users, emails)
                 // could be used for PageModeration and RSS2 Cloud xml-rpc also.
                 $page = new WikiDB_Page($this, $pagename);
                 list($emails, $userids) = $page->getPageChangeEmails($notify);
                 if (!empty($emails)) {
-                    $editedby = sprintf(_("Removed by: %s"), $GLOBALS['request']->_user->getId()); // Todo: host_id
+                    $from = $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
+                    $editedby = sprintf(_("Removed by: %s"), $from);
                     $emails = join(',', $emails);
                     $subject = sprintf(_("Page removed %s"), urlencode($pagename));
-                    if (mail($emails,"[".WIKI_NAME."] ".$subject, 
+                    if (mail("<undisclosed-recipients>","[".WIKI_NAME."] ".$subject, 
                              $subject."\n".
                              $editedby."\n\n".
-                             "Deleted $pagename"))
+                             "Deleted $pagename",
+                             "From: $from\r\nBcc: $emails"))
                         trigger_error(sprintf(_("PageChange Notification of %s sent to %s"),
                                               $pagename, join(',',$userids)), E_USER_NOTICE);
                     else
@@ -359,7 +363,9 @@
         $result = $this->_backend->text_search($search, true, $sortby, $limit, $exclude);
         return new WikiDB_PageIterator($this, $result,
                                        array('exclude' => $exclude,
-                                             'limit' => $limit));
+                                             'limit'   => $limit,
+                                             'stoplisted' => $result->stoplisted
+                                             ));
     }
 
     /**
@@ -651,8 +657,9 @@
                 trigger_error("empty pagename", E_USER_WARNING);
                 return false;
             }
-        } else 
+        } else {
             assert(is_string($pagename) and $pagename != '');
+        }
     }
 
     /**
@@ -895,10 +902,14 @@
 	// in the backend to control when to optimize.
         //
         // We're doing this here rather than in createRevision because
-        // postgres can't optimize while locked.
-        if ((DEBUG & _DEBUG_SQL) or (time() % 5 == 0)) {
-            if ($backend->optimize())
-                trigger_error(_("Optimizing database"), E_USER_NOTICE);
+        // postgresql can't optimize while locked.
+        if ((DEBUG & _DEBUG_SQL)
+	    or (DATABASE_OPTIMISE_FREQUENCY > 0 and 
+                (time() % DATABASE_OPTIMISE_FREQUENCY == 0))) {
+            if ($backend->optimize()) {
+                if (DEBUG)
+                    trigger_error(_("Optimizing database"), E_USER_NOTICE);
+            }
         }
 
         /* Generate notification emails? */
@@ -997,7 +1008,8 @@
         global $request;
         if (@is_array($request->_deferredPageChangeNotification)) {
             // collapse multiple changes (loaddir) into one email
-            $request->_deferredPageChangeNotification[] = array($this->_pagename, $emails, $userids);
+            $request->_deferredPageChangeNotification[] 
+		= array($this->_pagename, $emails, $userids);
             return;
         }
         $backend = &$this->_wikidb->_backend;
@@ -1032,13 +1044,13 @@
                 Iso8601DateTime($meta['mtime']) . "\n";
             $content .= _("New page");
         }
-        $editedby = sprintf(_("Edited by: %s"), $meta['author']);
+        $from = $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
+        $editedby = sprintf(_("Edited by: %s"), $from);
         $emails = join(',',$emails);
-        if (mail($emails,"[".WIKI_NAME."] ".$subject, 
-                 $subject."\n".
-                 $editedby."\n".
-                 $difflink."\n\n".
-                 $content))
+        if (mail("<undisclosed-recipients>",
+                 "[".WIKI_NAME."] ".$subject, 
+                 $subject."\n". $editedby."\n". $difflink."\n\n". $content,
+                 "From: $from\r\nBcc: $emails"))
             trigger_error(sprintf(_("PageChange Notification of %s sent to %s"),
                                   $this->_pagename, join(',',$userids)), E_USER_NOTICE);
         else
@@ -1054,21 +1066,21 @@
             $request->_deferredPageRenameNotification[] = array($this->_pagename, 
                                                                 $to, $meta, $emails, $userids);
         } else {
-            $from = $this->_pagename;
-            $editedby = sprintf(_("Edited by: %s"), $meta['author']) . ' ' . $meta['author_id'];
+            $oldname = $this->_pagename;
+            $from = $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
+            $editedby = sprintf(_("Edited by: %s"), $from);
             $emails = join(',',$emails);
-            $subject = sprintf(_("Page rename %s to %s"), urlencode($from), urlencode($to));
+            $subject = sprintf(_("Page rename %s to %s"), urlencode($oldname), urlencode($to));
             $link = WikiURL($to, true);
-            if (mail($emails,"[".WIKI_NAME."] ".$subject, 
-                     $subject."\n".
-                     $editedby."\n".
-                     $link."\n\n".
-                     "Renamed $from to $to"))
+            if (mail("<undisclosed-recipients>",
+                     "[".WIKI_NAME."] ".$subject, 
+                     $subject."\n".$editedby."\n".$link."\n\n"."Renamed $from to $to",
+                     "From: $from\r\nBcc: $emails"))
                 trigger_error(sprintf(_("PageChange Notification of %s sent to %s"),
-                                      $from, join(',',$userids)), E_USER_NOTICE);
+                                      $oldname, join(',',$userids)), E_USER_NOTICE);
             else
                 trigger_error(sprintf(_("PageChange Notification Error: Couldn't send %s to %s"),
-                                      $from, join(',',$userids)), E_USER_WARNING);
+                                      $oldname, join(',',$userids)), E_USER_WARNING);
         }
     }
 
@@ -1079,7 +1091,7 @@
      *
      * @return WikiDB_PageRevision The current WikiDB_PageRevision object. 
      */
-    function getCurrentRevision($need_content = true) {
+    function getCurrentRevision ($need_content = true) {
         $backend = &$this->_wikidb->_backend;
         $cache = &$this->_wikidb->_cache;
         $pagename = &$this->_pagename;
@@ -1110,7 +1122,7 @@
      * false if the requested revision does not exist in the {@link WikiDB}.
      * Note that version zero of any page always exists.
      */
-    function getRevision($version, $need_content=true) {
+    function getRevision ($version, $need_content=true) {
         $cache = &$this->_wikidb->_cache;
         $pagename = &$this->_pagename;
         
@@ -1142,7 +1154,7 @@
      * unless $version is greater than zero, a revision (perhaps version zero,
      * the default revision) will always be found.
      */
-    function getRevisionBefore($version=false, $need_content=true) {
+    function getRevisionBefore ($version=false, $need_content=true) {
         $backend = &$this->_wikidb->_backend;
         $pagename = &$this->_pagename;
         if ($version === false)
@@ -1186,8 +1198,8 @@
      * @return WikiDB_PageIterator A WikiDB_PageIterator containing
      * all matching pages.
      */
-    function getLinks($reversed = true, $include_empty=false, $sortby=false, 
-                      $limit=false, $exclude=false) {
+    function getLinks ($reversed = true, $include_empty=false, $sortby=false, 
+                       $limit=false, $exclude=false) {
         $backend = &$this->_wikidb->_backend;
         $result =  $backend->get_links($this->_pagename, $reversed, 
                                        $include_empty, $sortby, $limit, $exclude);
@@ -1230,23 +1242,26 @@
     }
             
     /**
-     * Access WikiDB_Page meta-data.
+     * Access WikiDB_Page non version-specific meta-data.
      *
      * @access public
      *
      * @param string $key Which meta data to get.
      * Some reserved meta-data keys are:
      * <dl>
-     * <dt>'locked'<dd> Is page locked?
+     * <dt>'date'  <dd> Created as unixtime
+     * <dt>'locked'<dd> Is page locked? 'yes' or 'no'
      * <dt>'hits'  <dd> Page hit counter.
-     * <dt>'pref'  <dd> Users preferences, stored in homepages.
+     * <dt>'_cached_html' <dd> Transformed CachedMarkup object, serialized + optionally gzipped.
+     *                         In SQL stored now in an extra column.
+     * Optional data:
+     * <dt>'pref'  <dd> Users preferences, stored only in homepages.
      * <dt>'owner' <dd> Default: first author_id. We might add a group with a dot here:
      *                  E.g. "owner.users"
      * <dt>'perm'  <dd> Permission flag to authorize read/write/execution of 
      *                  page-headers and content.
+     + <dt>'moderation'<dd> ModeratedPage data
      * <dt>'score' <dd> Page score (not yet implement, do we need?)
-     * <dt>'_cached_html' <dd> Transformed CachedMarkup object, serialized + optionally gzipped.
-     *                         In SQL stored in an extra column.
      * </dl>
      *
      * @return scalar The requested value, or false if the requested data
@@ -1775,12 +1790,15 @@
             return false;
 
         $pagename = &$next['pagename'];
+        if (!is_string($pagename)) { // Bug #1327912 fixed by Joachim Lous
+            $pagename = strval($pagename);
+        }
         if (!$pagename) {
             trigger_error('empty pagename in WikiDB_PageIterator::next()', E_USER_WARNING);
             var_dump($next);
             return false;
         }
-        // there's always hits, but we cache only if more 
+        // There's always hits, but we cache only if more 
         // (well not with file, cvs and dba)
         if (isset($next['pagedata']) and count($next['pagedata']) > 1) {
             $this->_wikidb->_cache->cache_data($next);
@@ -2190,6 +2208,15 @@
 }
 
 // $Log: WikiDB.php,v $
+// fix bug #1327912 numeric pagenames can break plugins (Joachim Lous)
+// pass stoplist through iterator
+//
+// Revision 1.137  2005/10/12 06:16:18  rurban
+// better From header
+//
+// Revision 1.136  2005/10/03 16:14:57  rurban
+// improve description
+//
 // Revision 1.135  2005/09/11 14:19:44  rurban
 // enable LIMIT support for fulltext search
 //
diff -ruN 11p1/lib/WikiGroup.php 12p3/lib/WikiGroup.php
--- 11p1/lib/WikiGroup.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/WikiGroup.php	2006-06-18 06:19:27.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: WikiGroup.php,v 1.52 2004/11/28 15:59:17 rurban Exp $');
+rcs_id('$Id: WikiGroup.php,v 1.53 2005/10/29 14:17:21 rurban Exp $');
 /*
  Copyright (C) 2003, 2004 $ThePhpWikiProgrammingTeam
 
@@ -835,7 +835,8 @@
         $this->membership = array();
 
         if (!defined('AUTH_GROUP_FILE')) {
-            trigger_error(_("AUTH_GROUP_FILE not defined"), E_USER_WARNING);
+            trigger_error(sprintf(_("%s: not defined"), "AUTH_GROUP_FILE"),
+                          E_USER_WARNING);
             return false;
         }
         if (!file_exists(AUTH_GROUP_FILE)) {
@@ -947,7 +948,8 @@
         $this->membership = array();
 
         if (!defined("LDAP_AUTH_HOST")) {
-            trigger_error(_("LDAP_AUTH_HOST not defined"), E_USER_WARNING);
+            trigger_error(sprintf(_("%s not defined"), "LDAP_AUTH_HOST"),
+                          E_USER_WARNING);
             return false;
         }
         // We should ignore multithreaded environments, not generally windows.
@@ -1100,6 +1102,9 @@
 }
 
 // $Log: WikiGroup.php,v $
+// Revision 1.53  2005/10/29 14:17:21  rurban
+// simplify message for translators
+//
 // Revision 1.52  2004/11/28 15:59:17  rurban
 // patch by Charles Corrigan so that WikiGroup->isSpecialMember knows about CREATOR and OWNER
 //
diff -ruN 11p1/lib/wikilens/PageListColumns.php 12p3/lib/wikilens/PageListColumns.php
--- 11p1/lib/wikilens/PageListColumns.php	2004-12-26 11:08:36.000000000 -0600
+++ 12p3/lib/wikilens/PageListColumns.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PageListColumns.php,v 1.9 2004/12/26 17:08:36 rurban Exp $');
+rcs_id('$Id: PageListColumns.php,v 1.10 2005/09/30 18:41:39 uckelman Exp $');
 
 /*
  Copyright 2004 Mike Cassano
@@ -50,7 +50,7 @@
     }
     
     function _getSortableValue ($page_handle, &$revision_handle) {
-        return $this->_getValue($page_handle, &$revision_handle);
+        return $this->_getValue($page_handle, $revision_handle);
     }
 };
 
@@ -199,7 +199,7 @@
     }
     
     function _getSortableValue ($page_handle, &$revision_handle) {
-        return $this->_getValue($page_handle, &$revision_handle);
+        return $this->_getValue($page_handle, $revision_handle);
     }
 };
 
@@ -236,7 +236,7 @@
     }
     
     function _getSortableValue ($page_handle, &$revision_handle) {
-        return $this->_getValue($page_handle, &$revision_handle);
+        return $this->_getValue($page_handle, $revision_handle);
     }
 };
 
@@ -283,7 +283,7 @@
     }
     
     function _getSortableValue ($page_handle, &$revision_handle) {
-        return $this->_getValue($page_handle, &$revision_handle);
+        return $this->_getValue($page_handle, $revision_handle);
     }
 };
 
@@ -376,6 +376,9 @@
     ));
 
 // $Log: PageListColumns.php,v $
+// Revision 1.10  2005/09/30 18:41:39  uckelman
+// Fixed more passes-by-reference.
+//
 // Revision 1.9  2004/12/26 17:08:36  rurban
 // php5 fixes: case-sensitivity, no & new
 //
diff -ruN 11p1/lib/wikilens/RatingsDb.php 12p3/lib/wikilens/RatingsDb.php
--- 11p1/lib/wikilens/RatingsDb.php	2004-11-15 10:00:02.000000000 -0600
+++ 12p3/lib/wikilens/RatingsDb.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: RatingsDb.php,v 1.12 2004/11/15 16:00:02 rurban Exp $');
+rcs_id('$Id: RatingsDb.php,v 1.13 2005/10/10 19:51:41 rurban Exp $');
 
 /*
  * @author:  Dan Frankowski (wikilens group manager), Reini Urban (as plugin)
@@ -355,26 +355,36 @@
         if (is_null($pagename))  $pagename = $this->pagename;
         if (RATING_STORAGE == 'SQL') {
             $dbi = &$this->_sqlbackend;
-            $where = "WHERE 1";
+	    if (isset($pagename) || isset($dimension)) {
+		$where = "WHERE";
+	    }
             if (isset($pagename)) {
                 $raterid = $this->_backend->_get_pageid($pagename, true);
-                $where .= " AND raterpage=$raterid";
+                $where .= " raterpage=$raterid";
             }
             if (isset($dimension)) {
-                $where .= " AND dimension=$dimension";
+		if (isset($pagename)) $where .= " AND";
+                $where .= " dimension=$dimension";
             }
             //$dbh = &$this->_dbi;
             extract($dbi->_table_names);
             $query = "SELECT AVG(ratingvalue) as avg"
-                   . " FROM $rating_tbl r, $page_tbl p "
-                   . $where. " GROUP BY raterpage";
+		   . " FROM $rating_tbl r, $page_tbl p "
+		   . $where
+		   . " GROUP BY raterpage";
             $result = $dbi->_dbh->query($query);
             $iter = new $this->iter_class($this, $result);
             $row = $iter->next();
             return $row['avg'];
         } else {
             if (!$pagename) return 0;
-            return 2.5;
+            $page = $this->_dbi->getPage($pagename);
+            $data = $page->get('rating');
+            if (!empty($data[$dimension]))
+                // hash of userid => rating
+                return array_sum(array_values($data[$dimension])) / count($data[$dimension]);
+	    else
+		return 0;
         }
     }
 //*******************************************************************************
@@ -702,6 +712,9 @@
 */
 
 // $Log: RatingsDb.php,v $
+// Revision 1.13  2005/10/10 19:51:41  rurban
+// fix aesthetic issues by John Stevens
+//
 // Revision 1.12  2004/11/15 16:00:02  rurban
 // enable RateIt imgPrefix: '' or 'Star' or 'BStar',
 // enable blue prediction icons,
@@ -762,4 +775,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/WikiPluginCached.php 12p3/lib/WikiPluginCached.php
--- 11p1/lib/WikiPluginCached.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/WikiPluginCached.php	2006-06-18 06:19:28.000000000 -0500
@@ -787,8 +787,12 @@
     }
 
     function tempnam($prefix = false) {
-        return tempnam(isWindows() ? str_replace('/', "\\", PLUGIN_CACHED_CACHE_DIR) : PLUGIN_CACHED_CACHE_DIR,
+        $temp = tempnam(isWindows() ? str_replace('/', "\\", PLUGIN_CACHED_CACHE_DIR) 
+                                    : PLUGIN_CACHED_CACHE_DIR,
                        $prefix ? $prefix : PLUGIN_CACHED_FILENAME_PREFIX);
+        if (isWindows())
+            $temp = preg_replace("/\.tmp$/", "_tmp", $temp);
+        return $temp;
     }
 
     /** 
@@ -1092,10 +1096,46 @@
             return $this->oldFilterThroughCmd($source, $commandLine);
     }
 
+    /**
+     * Execute system command until the outfile $until exists.
+     *
+     * @param  cmd   string   command to be invoked
+     * @param  until string   expected output filename
+     * @return       boolean  error status; true=ok; false=error
+     */
+    function execute($cmd, $until = false) {
+        // cmd must redirect stderr to stdout though!
+        $errstr = exec($cmd); //, $outarr, $returnval); // normally 127
+        //$errstr = join('',$outarr);
+        $ok = empty($errstr);
+        if (!$ok) {
+            trigger_error("\n".$cmd." failed: $errstr", E_USER_WARNING);
+        } elseif ($GLOBALS['request']->getArg('debug'))
+            trigger_error("\n".$cmd.": success\n", E_USER_NOTICE);
+        if (!isWindows()) {
+            if ($until) {
+                $loop = 100000;
+                while (!file_exists($until) and $loop > 0) {
+                    $loop -= 100;
+                    usleep(100);
+                }
+            } else {
+                usleep(5000);
+            }
+        }
+        if ($until)
+            return file_exists($until);
+        return $ok;
+    }
+
+
 } // WikiPluginCached
 
 
 // $Log: WikiPluginCached.php,v $
+// Revision 1.20  2005/09/26 06:28:46  rurban
+// beautify tempnam() on Windows. Move execute() from above here
+//
 // Revision 1.19  2004/12/16 18:30:59  rurban
 // avoid ugly img border
 //
diff -ruN 11p1/lib/WikiPlugin.php 12p3/lib/WikiPlugin.php
--- 11p1/lib/WikiPlugin.php	2005-04-01 10:03:59.000000000 -0600
+++ 12p3/lib/WikiPlugin.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiPlugin.php,v 1.58 2005/02/12 17:22:17 rurban Exp $');
+rcs_id('$Id: WikiPlugin.php,v 1.61 2005/10/31 17:20:40 rurban Exp $');
 
 class WikiPlugin
 {
@@ -87,7 +87,7 @@
     function getVersion() {
         return _("n/a");
         //return preg_replace("/[Revision: $]/", '',
-        //                    "\$Revision: 1.58 $");
+        //                    "\$Revision: 1.61 $");
     }
 
     function getArgs($argstr, $request=false, $defaults=false) {
@@ -122,7 +122,7 @@
                 and $arg == 'overwrite') // silence this warning
                 ;
             else
-                trigger_error(sprintf(_("argument '%s' not declared by plugin."),
+                trigger_error(sprintf(_("Argument '%s' not declared by plugin."),
                                       $arg), E_USER_NOTICE);
         }
 
@@ -410,6 +410,25 @@
         }
         return $string . '?'.'>';
     }
+
+    function getArgumentsDescription() {
+        $arguments = HTML();
+        foreach ($this->getDefaultArguments() as $arg => $default) {
+            // Work around UserPreferences plugin to avoid error
+            if ((is_array($default))) {
+                $default = '(array)';
+                // This is a bit flawed with UserPreferences object
+                //$default = sprintf("array('%s')",
+                //                   implode("', '", array_keys($default)));
+            }
+            else
+                if (stristr($default, ' '))
+                    $default = "'$default'";
+            $arguments->pushcontent("$arg=$default", HTML::br());
+        }
+        return $arguments;
+    }
+
 }
 
 class WikiPluginLoader {
@@ -537,4 +556,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/WikiUser/AdoDb.php 12p3/lib/WikiUser/AdoDb.php
--- 11p1/lib/WikiUser/AdoDb.php	2005-08-06 08:21:09.000000000 -0500
+++ 12p3/lib/WikiUser/AdoDb.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: AdoDb.php,v 1.6 2005/08/06 13:21:09 rurban Exp $');
+rcs_id('$Id: AdoDb.php,v 1.8 2006/03/19 16:26:40 rurban Exp $');
 /* Copyright (C) 2004 ReiniUrban
  * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
  */
@@ -76,11 +76,30 @@
             if (!$id_only and isset($this->_prefs->_update)) {
                 $this->getAuthDbh();
                 $dbh = &$this->_auth_dbi;
-                $db_result = $dbh->Execute(sprintf($this->_prefs->_update,
-                                                   $dbh->qstr($packed),
-                                                   $dbh->qstr($this->_userid)));
+		// check if the user already exists (not needed with mysql REPLACE)
+		$rs = $dbh->Execute(sprintf($this->_prefs->_select, $dbh->qstr($this->_userid)));
+		if ($rs->EOF) {
+		    $rs->Close();
+		    $prefs_blob = false;
+		} else {
+		    $prefs_blob = @$rs->fields['prefs'];
+		    $rs->Close();
+		}
+		if ($prefs_blob) {
+		    $db_result = $dbh->Execute(sprintf($this->_prefs->_update,
+						       $dbh->qstr($packed),
+						       $dbh->qstr($this->_userid)));
+		} else {
+		    // Otherwise, insert a record for them and set it to the defaults.
+		    $dbi = $request->getDbh();
+		    $this->_prefs->_insert = $this->prepare($dbi->getAuthParam('pref_insert'),
+							    array("pref_blob", "userid"));
+		    $db_result = $dbh->Execute(sprintf($this->_prefs->_insert,
+						       $dbh->qstr($packed),
+						       $dbh->qstr($this->_userid)));
+		}
                 $db_result->Close();
-                //delete pageprefs:
+                // delete pageprefs:
                 if ($this->_HomePagehandle and $this->_HomePagehandle->get('pref'))
                     $this->_HomePagehandle->set('pref', '');
             } else {
@@ -106,7 +125,7 @@
         // Prepare the configured auth statements
         if ($dbi->getAuthParam('auth_check') and empty($this->_authselect)) {
             $this->_authselect = $this->prepare($dbi->getAuthParam('auth_check'), 
-                                                array("userid", "password"));
+                                                array("password", "userid"));
         }
         //NOTE: for auth_crypt_method='crypt' no special auth_user_exists is needed
         if ( !$dbi->getAuthParam('auth_user_exists') 
@@ -230,7 +249,7 @@
         $dbi =& $GLOBALS['request']->_dbi;
         if ($dbi->getAuthParam('auth_update') and empty($this->_authupdate)) {
             $this->_authupdate = $this->prepare($dbi->getAuthParam('auth_update'),
-                                                array("userid", "password"));
+                                                array("password", "userid"));
         }
         if (!isset($this->_authupdate)) {
             trigger_error(fmt("Either %s is missing or DATABASE_TYPE != '%s'",
@@ -253,6 +272,12 @@
 }
 
 // $Log: AdoDb.php,v $
+// Revision 1.8  2006/03/19 16:26:40  rurban
+// fix DBAUTH arguments to be position independent, fixes bug #1358973
+//
+// Revision 1.7  2005/10/10 19:43:49  rurban
+// add DBAUTH_PREF_INSERT: self-creating users. by John Stevens
+//
 // Revision 1.6  2005/08/06 13:21:09  rurban
 // switch to natural order password, userid
 //
@@ -285,4 +310,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/WikiUser/Db.php 12p3/lib/WikiUser/Db.php
--- 11p1/lib/WikiUser/Db.php	2005-06-10 01:11:56.000000000 -0500
+++ 12p3/lib/WikiUser/Db.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: Db.php,v 1.3 2005/06/10 06:11:56 rurban Exp $');
+rcs_id('$Id: Db.php,v 1.4 2006/03/07 21:05:24 rurban Exp $');
 /* Copyright (C) 2004 ReiniUrban
  * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
  */
@@ -68,6 +68,16 @@
                 return $user;
             }
         }
+        elseif ($dbtype == 'PDO') {
+            include_once("lib/WikiUser/PdoDb.php");
+            if (check_php_version(5))
+                return new _PdoDbPassUser($UserName,$this->_prefs);
+            else {
+                $user = new _PdoDbPassUser($UserName,$this->_prefs);
+                eval("\$this = \$user;");
+                return $user;
+            }
+        }
         return false;
     }
 
@@ -88,6 +98,9 @@
 }
 
 // $Log: Db.php,v $
+// Revision 1.4  2006/03/07 21:05:24  rurban
+// add PdoDbPassUser
+//
 // Revision 1.3  2005/06/10 06:11:56  rurban
 // special validname method
 //
diff -ruN 11p1/lib/WikiUser/File.php 12p3/lib/WikiUser/File.php
--- 11p1/lib/WikiUser/File.php	2005-08-06 08:21:37.000000000 -0500
+++ 12p3/lib/WikiUser/File.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: File.php,v 1.7 2005/08/06 13:21:37 rurban Exp $');
+rcs_id('$Id: File.php,v 1.8 2006/03/07 18:03:51 rurban Exp $');
 /* Copyright (C) 2004 ReiniUrban
  * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
  */
@@ -78,11 +78,11 @@
             return false;
         }
         if ($this->_may_change) {
-            $this->_file = new File_Passwd($this->_file->_filename, true, 
-                                           $this->_file->_filename.'.lock');
+            $this->_file = new File_Passwd($this->_file->filename, true, 
+                                           $this->_file->filename.'.lock');
             $result = $this->_file->modUser($this->_userid, $submitted_password);
             $this->_file->close();
-            $this->_file = new File_Passwd($this->_file->_filename, false);
+            $this->_file = new File_Passwd($this->_file->filename, false);
             return $result;
         }
         return false;
@@ -91,6 +91,9 @@
 }
 
 // $Log: File.php,v $
+// Revision 1.8  2006/03/07 18:03:51  rurban
+// fix storePass
+//
 // Revision 1.7  2005/08/06 13:21:37  rurban
 // only cosmetics
 //
diff -ruN 11p1/lib/WikiUser/LDAP.php 12p3/lib/WikiUser/LDAP.php
--- 11p1/lib/WikiUser/LDAP.php	2004-12-26 11:11:17.000000000 -0600
+++ 12p3/lib/WikiUser/LDAP.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: LDAP.php,v 1.4 2004/12/26 17:11:17 rurban Exp $');
+rcs_id('$Id: LDAP.php,v 1.5 2005/10/10 19:43:49 rurban Exp $');
 /* Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
  */
@@ -30,9 +30,10 @@
                     $r = ldap_bind($this->_ldap, LDAP_AUTH_USER); 
             else
                 $r = true; // anonymous bind allowed
-            if (!$r) {    
+            if (!$r) {
                 $this->_free();
-                trigger_error(sprintf("Unable to bind LDAP server %s", LDAP_AUTH_HOST), 
+                trigger_error(sprintf(_("Unable to bind LDAP server %s using %s %s"),
+				      LDAP_AUTH_HOST, LDAP_AUTH_USER, LDAP_AUTH_PASSWORD), 
                               E_USER_WARNING);
                 return false;
             }
@@ -54,14 +55,14 @@
         $this->_authmethod = 'LDAP';
         $userid = $this->_userid;
         if (!$this->isValidName()) {
-            trigger_error(_("Invalid username."),E_USER_WARNING);
+            trigger_error(_("Invalid username."), E_USER_WARNING);
             return $this->_tryNextPass($submitted_password);
         }
         if (!$this->_checkPassLength($submitted_password)) {
             return WIKIAUTH_FORBIDDEN;
         }
         if (strstr($userid,'*')) {
-            trigger_error(fmt("Invalid username '%s' for LDAP Auth",$userid), 
+            trigger_error(fmt("Invalid username '%s' for LDAP Auth", $userid), 
                           E_USER_WARNING);
             return WIKIAUTH_FORBIDDEN;
         }
@@ -135,6 +136,9 @@
 }
 
 // $Log: LDAP.php,v $
+// Revision 1.5  2005/10/10 19:43:49  rurban
+// add DBAUTH_PREF_INSERT: self-creating users. by John Stevens
+//
 // Revision 1.4  2004/12/26 17:11:17  rurban
 // just copyright
 //
@@ -161,4 +165,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/WikiUser/PearDb.php 12p3/lib/WikiUser/PearDb.php
--- 11p1/lib/WikiUser/PearDb.php	2005-08-06 08:21:09.000000000 -0500
+++ 12p3/lib/WikiUser/PearDb.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: PearDb.php,v 1.8 2005/08/06 13:21:09 rurban Exp $');
+rcs_id('$Id: PearDb.php,v 1.10 2006/03/19 16:26:40 rurban Exp $');
 /* Copyright (C) 2004 ReiniUrban
  * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
  */
@@ -11,7 +11,6 @@
  * Now optimized not to use prepare, ...query(sprintf($sql,quote())) instead.
  * We use FETCH_MODE_ROW, so we don't need aliases in the auth_* SQL statements.
  *
- * @tables: user
  * @tables: pref
  */
 {
@@ -74,9 +73,25 @@
             $packed = $this->_prefs->store();
             if (!$id_only and isset($this->_prefs->_update)) {
                 $dbh = &$this->_auth_dbi;
-                $dbh->simpleQuery(sprintf($this->_prefs->_update,
-                                          $dbh->quote($packed),
-                                          $dbh->quote($this->_userid)));
+		// check if the user already exists (not needed with mysql REPLACE)
+		$db_result = $dbh->query(sprintf($this->_prefs->_select, 
+						 $dbh->quote($this->_userid)));
+		$prefs = $db_result->fetchRow();
+		$prefs_blob = @$prefs["prefs"]; 
+		// If there are prefs for the user, update them.
+		if($prefs_blob != "" ){
+		    $dbh->simpleQuery(sprintf($this->_prefs->_update,
+					      $dbh->quote($packed),
+					      $dbh->quote($this->_userid)));
+		} else {
+		    // Otherwise, insert a record for them and set it to the defaults.
+		    // johst@deakin.edu.au
+		    $dbi = $GLOBALS['request']->getDbh();
+		    $this->_prefs->_insert = $this->prepare($dbi->getAuthParam('pref_insert'),
+							    array("pref_blob", "userid"));
+		    $dbh->simpleQuery(sprintf($this->_prefs->_insert, 
+		                              $dbh->quote($packed), $dbh->quote($this->_userid)));
+		}
                 //delete pageprefs:
                 if ($this->_HomePagehandle and $this->_HomePagehandle->get('pref'))
                     $this->_HomePagehandle->set('pref', '');
@@ -105,7 +120,7 @@
         // Prepare the configured auth statements
         if ($dbi->getAuthParam('auth_check') and empty($this->_authselect)) {
             $this->_authselect = $this->prepare($dbi->getAuthParam('auth_check'), 
-                                                array("userid", "password"));
+                                                array("password", "userid"));
         }
         //NOTE: for auth_crypt_method='crypt' no special auth_user_exists is needed
         if (!$dbi->getAuthParam('auth_user_exists') 
@@ -131,15 +146,15 @@
         // reasons
         if (empty($this->_authcreate) and $dbi->getAuthParam('auth_create')) {
             $this->_authcreate = $this->prepare($dbi->getAuthParam('auth_create'),
-                                                array("userid", "password"));
+                                                array("password", "userid"));
         }
         if (!empty($this->_authcreate) and 
             isset($GLOBALS['HTTP_POST_VARS']['auth']) and
             isset($GLOBALS['HTTP_POST_VARS']['auth']['passwd'])) 
         {
             $passwd = $GLOBALS['HTTP_POST_VARS']['auth']['passwd'];
-            $dbh->simpleQuery(sprintf($this->_authcreate,
-                                      $dbh->quote($passwd),
+            $dbh->simpleQuery(sprintf($this->_authcreate, 
+                                      $dbh->quote($passwd), 
                                       $dbh->quote($this->_userid)));
             return true;
         }
@@ -168,11 +183,11 @@
         //NOTE: for auth_crypt_method='crypt'  defined('ENCRYPTED_PASSWD',true) must be set
         $dbh = &$this->_auth_dbi;
         if ($this->_auth_crypt_method == 'crypt') {
-            $stored_password = $dbh->getOne(sprintf($this->_authselect, 
-                                                    $dbh->quote($this->_userid)));
+            $stored_password = $dbh->getOne(sprintf($this->_authselect, $dbh->quote($this->_userid)));
             $result = $this->_checkPass($submitted_password, $stored_password);
         } else {
-            $okay = $dbh->getOne(sprintf($this->_authselect,
+            // be position independent
+            $okay = $dbh->getOne(sprintf($this->_authselect, 
                                          $dbh->quote($submitted_password),
                                          $dbh->quote($this->_userid)));
             $result = !empty($okay);
@@ -202,7 +217,7 @@
         $dbi =& $GLOBALS['request']->_dbi;
         if ($dbi->getAuthParam('auth_update') and empty($this->_authupdate)) {
             $this->_authupdate = $this->prepare($dbi->getAuthParam('auth_update'),
-                                                array("userid", "password"));
+                                                array("password", "userid"));
         }
         if (empty($this->_authupdate)) {
             trigger_error(fmt("Either %s is missing or DATABASE_TYPE != '%s'",
@@ -216,14 +231,18 @@
                 $submitted_password = crypt($submitted_password);
         }
         $dbh->simpleQuery(sprintf($this->_authupdate,
-                                  $dbh->quote($submitted_password),
-        			  $dbh->quote($this->_userid)
-                                  ));
+                                  $dbh->quote($submitted_password), $dbh->quote($this->_userid)));
         return true;
     }
 }
 
 // $Log: PearDb.php,v $
+// Revision 1.10  2006/03/19 16:26:40  rurban
+// fix DBAUTH arguments to be position independent, fixes bug #1358973
+//
+// Revision 1.9  2005/10/10 19:43:49  rurban
+// add DBAUTH_PREF_INSERT: self-creating users. by John Stevens
+//
 // Revision 1.8  2005/08/06 13:21:09  rurban
 // switch to natural order password, userid
 //
@@ -266,4 +285,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/WikiUserNew.php 12p3/lib/WikiUserNew.php
--- 11p1/lib/WikiUserNew.php	2005-06-10 01:10:35.000000000 -0500
+++ 12p3/lib/WikiUserNew.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiUserNew.php,v 1.129 2005/06/10 06:10:35 rurban Exp $');
+rcs_id('$Id: WikiUserNew.php,v 1.137 2006/05/03 06:05:37 rurban Exp $');
 /* Copyright (C) 2004,2005 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
@@ -669,14 +669,14 @@
         }
         if (! $UserName ) {
             // Try reading userid from old PhpWiki cookie formats:
-            if ($cookie = $request->cookies->get_old('WIKI_ID')) {
+            if ($cookie = $request->cookies->get_old(getCookieName())) {
                 if (is_string($cookie) and (substr($cookie,0,2) != 's:'))
                     $UserName = $cookie;
                 elseif (is_array($cookie) and !empty($cookie['userid']))
                     $UserName = $cookie['userid'];
             }
             if (! $UserName and !headers_sent())
-                $request->deleteCookieVar("WIKI_ID");
+                $request->deleteCookieVar(getCookieName());
             else
                 $this->_userid = $UserName;
         }
@@ -721,7 +721,7 @@
                 // new 1.3.8 policy: no array cookies, only plain userid string as in 
                 // the pre 1.3.x versions.
                 // prefs should be stored besides the session in the homepagehandle or in a db.
-                $request->setCookieVar('WIKI_ID', $this->_userid,
+                $request->setCookieVar(getCookieName(), $this->_userid,
                                        COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN);
                 //$request->setCookieVar(WIKI_NAME, array('userid' => $prefs->get('userid')),
                 //                       COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN);
@@ -730,7 +730,7 @@
         $packed = $prefs->store();
         $unpacked = $prefs->unpack($packed);
         if (count($unpacked)) {
-            foreach (array('_method','_select','_update') as $param) {
+            foreach (array('_method','_select','_update','_insert') as $param) {
             	if (!empty($this->_prefs->{$param}))
             	    $prefs->{$param} = $this->_prefs->{$param};
             }
@@ -973,7 +973,9 @@
                 unset($this->_auth_dbi);
         }
         if (empty($this->_auth_dbi)) {
-            if ($dbh->getParam('dbtype') != 'SQL' and $dbh->getParam('dbtype') != 'ADODB')
+            if ($dbh->getParam('dbtype') != 'SQL' 
+                and $dbh->getParam('dbtype') != 'ADODB'
+                and $dbh->getParam('dbtype') != 'PDO')
                 return false;
             if (empty($GLOBALS['DBAuthParams']))
                 return false;
@@ -1004,7 +1006,11 @@
     }
 
     // TODO: use it again for the auth and member tables
-    function prepare ($stmt, $variables, $oldstyle = false) {
+    // sprintfstyle vs prepare style: %s or ?
+    //   multiple vars should be executed via prepare(?,?)+execute, 
+    //   single vars with execute(sprintf(quote(var)))
+    // help with position independency
+    function prepare ($stmt, $variables, $oldstyle = false, $sprintfstyle = true) {
         global $request;
         $dbi = $request->getDbh();
         $this->getAuthDbh();
@@ -1013,6 +1019,7 @@
         // old-style strings don't survive pear/Config/IniConfig treatment, that's why we changed it.
         $new = array();
         if (is_array($variables)) {
+            //$sprintfstyle = false;
             for ($i=0; $i < count($variables); $i++) { 
                 $var = $this->_normalize_stmt_var($variables[$i], $oldstyle);
                 if (!$var)
@@ -1020,7 +1027,10 @@
                                           $variables[$i], $stmt), E_USER_WARNING);
                 $variables[$i] = $var;
                 if (!$var) $new[] = '';
-                else $new[] = '%s';
+                else {
+                    $s = "%" . ($i+1) . "s";	
+                    $new[] = $sprintfstyle ? $s : "?";
+                }
             }
         } else {
             $var = $this->_normalize_stmt_var($variables, $oldstyle);
@@ -1029,7 +1039,7 @@
                                       $variables, $stmt), E_USER_WARNING);
             $variables = $var;
             if (!$var) $new = ''; 
-            else $new = '%s'; 
+            else $new = $sprintfstyle ? '%s' : "?"; 
         }
         $prefix = $dbi->getParam('prefix');
         // probably prefix table names if in same database
@@ -1037,13 +1047,14 @@
             ($dbi->getAuthParam('auth_dsn') and $dbi->getParam('dsn') == $dbi->getAuthParam('auth_dsn')))
         {
             if (!stristr($stmt, $prefix)) {
-                //Do it automatically for the lazy admin? Esp. on sf.net it's nice to have
-                trigger_error("TODO: Need to prefix the DBAuthParam tablename in config/config.ini:\n  $stmt",
-                              E_USER_WARNING);
+            	$oldstmt = $stmt;
                 $stmt = str_replace(array(" user "," pref "," member "),
                                     array(" ".$prefix."user ",
                                           " ".$prefix."pref ",
-                                          " ".$prefix."member "),$stmt);
+                                          " ".$prefix."member "), $stmt);
+                //Do it automatically for the lazy admin? Esp. on sf.net it's nice to have
+                trigger_error("Need to prefix the DBAUTH tablename in config/config.ini:\n  $oldstmt \n=> $stmt",
+                              E_USER_WARNING);
             }
         }
         // Preparate the SELECT statement, for ADODB and PearDB (MDB not).
@@ -1068,13 +1079,18 @@
             	// FIXME: strange why this should be needed...
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/AdoDb.php");
-                _AdoDbPassUser::_AdoDbPassUser($this->_userid,$this->_prefs);
+                _AdoDbPassUser::_AdoDbPassUser($this->_userid, $this->_prefs);
                 return _AdoDbPassUser::getPreferences();
             } elseif ($this->_prefs->_method == 'SQL') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PearDb.php");
-                _PearDbPassUser::_PearDbPassUser($this->_userid,$this->_prefs);
+                _PearDbPassUser::_PearDbPassUser($this->_userid, $this->_prefs);
                 return _PearDbPassUser::getPreferences();
+            } elseif ($this->_prefs->_method == 'PDO') {
+            	include_once("lib/WikiUser/Db.php");
+            	include_once("lib/WikiUser/PdoDb.php");
+                _PdoDbPassUser::_PdoDbPassUser($this->_userid, $this->_prefs);
+                return _PdoDbPassUser::getPreferences();
             }
         }
 
@@ -1101,7 +1117,7 @@
             	// FIXME: strange why this should be needed...
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/AdoDb.php");
-                _AdoDbPassUser::_AdoDbPassUser($this->_userid,$prefs);
+                _AdoDbPassUser::_AdoDbPassUser($this->_userid, $prefs);
                 return _AdoDbPassUser::setPreferences($prefs, $id_only);
             }
             elseif ($this->_prefs->_method == 'SQL') {
@@ -1110,14 +1126,20 @@
                 _PearDbPassUser::_PearDbPassUser($this->_userid, $prefs);
                 return _PearDbPassUser::setPreferences($prefs, $id_only);
             }
+            elseif ($this->_prefs->_method == 'PDO') {
+            	include_once("lib/WikiUser/Db.php");
+            	include_once("lib/WikiUser/PdoDb.php");
+                _PdoDbPassUser::_PdoDbPassUser($this->_userid, $prefs);
+                return _PdoDbPassUser::setPreferences($prefs, $id_only);
+            }
         }
-        if (_AnonUser::setPreferences($prefs, $id_only)) {
+        if ($updated = _AnonUser::setPreferences($prefs, $id_only)) {
             // Encode only the _prefs array of the UserPreference object
-            if ($this->_HomePagehandle and !$id_only) {
+            if (!empty($this->_HomePagehandle) and !$id_only) {
                 $this->_HomePagehandle->set('pref', $this->_prefs->store());
             }
         }
-        return;
+        return $updated;
     }
 
     function mayChangePass() {
@@ -1774,7 +1796,7 @@
                     'noLinkIcons'   => new _UserPreference_bool(),    // 1.3.8 
                     'editHeight'    => new _UserPreference_int(EDITHEIGHT_DEFAULT_ROWS,
                                                                EDITHEIGHT_MIN_ROWS,
-                                                               EDITHEIGHT_DEFAULT_ROWS),
+                                                               EDITHEIGHT_MAX_ROWS),
                     'timeOffset'    => new _UserPreference_numeric(TIMEOFFSET_DEFAULT_HOURS,
                                                                    TIMEOFFSET_MIN_HOURS,
                                                                    TIMEOFFSET_MAX_HOURS),
@@ -1786,7 +1808,7 @@
         // FIXME: on theme changes the wiki_user session pref object will fail. 
         // We will silently ignore this.
         if (!empty($customUserPreferenceColumns))
-            $this->_prefs = array_merge($this->_prefs,$customUserPreferenceColumns);
+            $this->_prefs = array_merge($this->_prefs, $customUserPreferenceColumns);
 /*
         if (isset($this->_method) and $this->_method == 'SQL') {
             //unset($this->_prefs['userid']);
@@ -1839,7 +1861,11 @@
         if ($name == 'theme' and $value == '')
            return true;
         */
-        if (!isset($pref->{$value}) or $pref->{$value} != $pref->default_value) {
+        // Fix Fatal error for undefined value. Thanks to Jim Ford and Joel Schaubert
+        if ((!$value and $pref->default_value)
+            or ($value and !isset($pref->{$name})) // bug #1355533
+            or ($value and ($pref->{$name} != $pref->default_value)))
+        {
             if ($name == 'emailVerified') $newvalue = $value;
             else $newvalue = $pref->sanify($value);
 	    $pref->set($name, $newvalue);
@@ -1857,7 +1883,7 @@
             $type = 'emailVerified'; $obj =& $this->_prefs['email'];
             $obj->_init = $init;
             if ($obj->get($type) !== $prefs->get($type)) {
-                if ($obj->set($type,$prefs->get($type)))
+                if ($obj->set($type, $prefs->get($type)))
                     $count++;
             }
             foreach (array_keys($this->_prefs) as $type) {
@@ -1869,7 +1895,7 @@
                         $obj->get($type) == THEME) continue;
                     if ($type == 'lang' and $prefs->get($type) == '' and 
                         $obj->get($type) == DEFAULT_LANGUAGE) continue;
-                    if ($this->_prefs[$type]->set($type,$prefs->get($type)))
+                    if ($this->_prefs[$type]->set($type, $prefs->get($type)))
                         $count++;
                 }
             }
@@ -1919,7 +1945,10 @@
             if ($name == 'email' and ($value = $object->getraw('emailVerified')))
                 $prefs['emailVerified'] = $value;
             if ($name == 'passwd' and $value and ENCRYPTED_PASSWD) {
-            	$prefs['passwd'] = crypt($value);
+                if (strlen($value) != strlen(crypt('test')))
+                    $prefs['passwd'] = crypt($value);
+                else // already crypted
+                    $prefs['passwd'] = $value;
             }
         }
         return $this->pack($prefs);
@@ -2005,7 +2034,7 @@
     }
 
     function hash () {
-        return hash($this->_prefs);
+        return wikihash($this->_prefs);
     }
 }
 
@@ -2078,6 +2107,28 @@
 */
 
 // $Log: WikiUserNew.php,v $
+// Revision 1.137  2006/05/03 06:05:37  rurban
+// Fix default preferences for editheight maxrows, by Manuel Vacelet.
+//
+// Revision 1.136  2006/04/16 11:07:48  rurban
+// Dont crypt the passwd twice on storing prefs. Patch by Thomas Harding.
+// Fixes bug #1327470
+//
+// Revision 1.135  2006/03/19 16:26:39  rurban
+// fix DBAUTH arguments to be position independent, fixes bug #1358973
+//
+// Revision 1.134  2006/03/19 15:01:00  rurban
+// sf.net patch #1333957 by Matt Brown: Authentication cookie identical across all wikis on a host
+//
+// Revision 1.133  2006/03/07 18:39:21  rurban
+// add PdoDb, rename hash to wikihash (php-5.1), fix output of Homepage prefs update
+//
+// Revision 1.132  2006/03/04 13:19:12  rurban
+// fix for fatal error on empty pref value (sign out). Thanks to Jim Ford and Joel Schaubert. rename hash for php-5.1
+//
+// Revision 1.131  2005/10/12 06:16:48  rurban
+// add new _insert statement
+//
 // Revision 1.129  2005/06/10 06:10:35  rurban
 // ensure Update Preferences gets through
 //
diff -ruN 11p1/lib/WikiUser.php 12p3/lib/WikiUser.php
--- 11p1/lib/WikiUser.php	2005-06-05 00:38:02.000000000 -0500
+++ 12p3/lib/WikiUser.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiUser.php,v 1.65 2005/06/05 05:38:02 rurban Exp $');
+rcs_id('$Id: WikiUser.php,v 1.67 2006/03/19 15:01:01 rurban Exp $');
 
 // It is anticipated that when userid support is added to phpwiki,
 // this object will hold much more information (e-mail,
@@ -355,7 +355,7 @@
         $this->_request->setSessionVar('wiki_prefs', $prefs);
         // $this->_request->setCookieVar('WIKI_PREFS2', $this->_prefs, 365);
         // simple unpacked cookie
-        if ($this->_userid) setcookie('WIKI_ID', $this->_userid, 365, '/');
+        if ($this->_userid) setcookie(getCookieName(), $this->_userid, 365, '/');
 
         // We must ensure that any password is encrypted.
         // We don't need any plaintext password.
@@ -741,11 +741,17 @@
     }
 
     function hash () {
-        return hash($this->_prefs);
+        return wikihash($this->_prefs);
     }
 }
 
 // $Log: WikiUser.php,v $
+// Revision 1.67  2006/03/19 15:01:01  rurban
+// sf.net patch #1333957 by Matt Brown: Authentication cookie identical across all wikis on a host
+//
+// Revision 1.66  2006/03/07 20:45:44  rurban
+// wikihash for php-5.1
+//
 // Revision 1.65  2005/06/05 05:38:02  rurban
 // Default ENABLE_DOUBLECLICKEDIT = false. Moved to UserPreferences
 //
@@ -979,4 +985,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>
diff -ruN 11p1/lib/XmlElement.php 12p3/lib/XmlElement.php
--- 11p1/lib/XmlElement.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/XmlElement.php	2006-06-18 06:19:28.000000000 -0500
@@ -1,13 +1,13 @@
-<?php rcs_id('$Id: XmlElement.php,v 1.37 2005/01/25 07:04:27 rurban Exp $');
+<?php rcs_id('$Id: XmlElement.php,v 1.38 2005/10/10 19:36:09 rurban Exp $');
 /**
  * Code for writing XML.
  * @package Markup
  * @author: Jeff Dairiki,
  *          Reini Urban (php5 tricks)
  *
- * FIXME: This module is very php5 sensitive: It was fixed for 1.3.9, 
- *          but is again broken with the 1.3.11.
- *        With allow_call_time_pass_reference clean fixes
+ * WARNING: This module is very php5 sensitive. 
+ *        Fixed for 1.3.9 and 1.3.11.
+ *        With allow_call_time_pass_reference clean fixes.
  */
 
 /**
@@ -604,6 +604,9 @@
 }
 
 // $Log: XmlElement.php,v $
+// Revision 1.38  2005/10/10 19:36:09  rurban
+// fix comment
+//
 // Revision 1.37  2005/01/25 07:04:27  rurban
 // case-sensitive for php5
 //
diff -ruN 11p1/lib/XmlRpcServer.php 12p3/lib/XmlRpcServer.php
--- 11p1/lib/XmlRpcServer.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/XmlRpcServer.php	2006-06-18 06:19:29.000000000 -0500
@@ -55,8 +55,8 @@
 */
 
 // Intercept GET requests from confused users.  Only POST is allowed here!
-// There is some indication that $HTTP_SERVER_VARS is deprecated in php > 4.1.0
-// in favour of $_Server, but as far as I know, it still works.
+if (empty($GLOBALS['HTTP_SERVER_VARS']))
+    $GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER;
 if ($GLOBALS['HTTP_SERVER_VARS']['REQUEST_METHOD'] != "POST")
 {
     die('This is the address of the XML-RPC interface.' .
@@ -638,7 +638,7 @@
 }
 
 /** 
- * struct titleSearch(String substring [, Integer option = 0])
+ * array wiki.titleSearch(String substring [, Integer option = 0])
  * returns an array of matching pagenames.
  * TODO: standardize options
  *
@@ -689,18 +689,217 @@
     return new xmlrpcresp(new xmlrpcval($pages, "array"));
 }
 
+/** 
+ * array wiki.listPlugins()
+ *
+ * Returns an array of all available plugins. 
+ * For EditToolbar pluginPulldown via AJAX
+ *
+ * @author: Reini Urban
+ */
+$wiki_dmap['listPlugins']
+= array('signature'     => array(array($xmlrpcArray)),
+        'documentation' => "Return names of all plugins",
+        'function'      => 'listPlugins');
+
+function listPlugins($params)
+{
+    $plugin_dir = 'lib/plugin';
+    if (defined('PHPWIKI_DIR'))
+        $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
+    $pd = new fileSet($plugin_dir, '*.php');
+    $plugins = $pd->getFiles();
+    unset($pd);
+    sort($plugins);
+    $RetArray = array();
+    if (!empty($plugins)) {
+        require_once("lib/WikiPlugin.php");
+        $w = new WikiPluginLoader;
+        foreach ($plugins as $plugin) {
+            $pluginName = str_replace(".php", "", $plugin);
+            $p = $w->getPlugin($pluginName, false); // second arg?
+            // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
+            if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
+                $RetArray[] = short_string($pluginName);
+            }
+        }
+    }
+  
+    return new xmlrpcresp(new xmlrpcval($RetArray, "array"));
+}
+
+/** 
+ * String wiki.getPluginSynopsis(String plugin)
+ *
+ * For EditToolbar pluginPulldown via AJAX
+ *
+ * @author: Reini Urban
+ */
+$wiki_dmap['getPluginSynopsis']
+= array('signature'     => array(array($xmlrpcArray, $xmlrpcString)),
+        'documentation' => "Return plugin synopsis",
+        'function'      => 'getPluginSynopsis');
+
+function getPluginSynopsis($params)
+{
+    $ParamPlugin = $params->getParam(0);
+    $pluginName = short_string_decode($ParamPlugin->scalarval());
+
+    require_once("lib/WikiPlugin.php");
+    $w = new WikiPluginLoader;
+    $synopsis = '';
+    $p = $w->getPlugin($pluginName, false); // second arg?
+    // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only
+    if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
+        $plugin_args = '';
+        $desc = $p->getArgumentsDescription();
+        $src = array("\n",'"',"'",'|','[',']','\\');
+        $replace = array('%0A','%22','%27','%7C','%5B','%5D','%5C');
+        $desc = str_replace("<br />",' ',$desc->asXML());
+        if ($desc)
+            $plugin_args = '\n'.str_replace($src, $replace, $desc);
+        $synopsis = "<?plugin ".$pluginName.$plugin_args."?>"; // args?
+    }
+   
+    return new xmlrpcresp(short_string($synopsis));
+}
+
+/** 
+ * array wiki.listRelations()
+ *
+ * Returns an array of all available relations. 
+ * For SemanticSearch autofill method.
+ *
+ * @author: Reini Urban
+ */
+$wiki_dmap['listRelations']
+= array('signature'     => array(array($xmlrpcArray)),
+        'documentation' => "Return names of all relations",
+        'function'      => 'listRelations');
+
+function listRelations($params)
+{
+    global $request;
+    $dbh = $request->getDbh();
+    $RetArray = $dbh->listRelations();
+    return new xmlrpcresp(new xmlrpcval($RetArray->asArray(), "array"));
+}
+
+/** 
+ * String pingback.ping(String sourceURI, String targetURI)
+
+Spec: http://www.hixie.ch/specs/pingback/pingback
+
+Parameters
+    sourceURI of type string
+        The absolute URI of the post on the source page containing the
+        link to the target site.
+    targetURI of type string
+        The absolute URI of the target of the link, as given on the source page.
+Return Value
+    A string, as described below.
+Faults
+    If an error condition occurs, then the appropriate fault code from
+    the following list should be used. Clients can quickly determine
+    the kind of error from bits 5-8. 0001x fault codes are used for
+    problems with the source URI, 0002x codes are for problems with
+    the target URI, and 0003x codes are used when the URIs are fine
+    but the pingback cannot be acknowledged for some other reaon.
+
+    0 
+    	A generic fault code. Servers MAY use this error code instead
+    	of any of the others if they do not have a way of determining
+    	the correct fault code.
+    00010 (16)
+        The source URI does not exist.
+    00011 (17)
+        The source URI does not contain a link to the target URI, and
+        so cannot be used as a source.
+    00020 (32)
+        The specified target URI does not exist. This MUST only be
+        used when the target definitely does not exist, rather than
+        when the target may exist but is not recognised. See the next
+        error.
+    00021 (33)
+        The specified target URI cannot be used as a target. It either
+        doesn't exist, or it is not a pingback-enabled resource. For
+        example, on a blog, typically only permalinks are
+        pingback-enabled, and trying to pingback the home page, or a
+        set of posts, will fail with this error.
+    00030 (48)
+        The pingback has already been registered.
+    00031 (49)
+        Access denied.
+    00032 (50)
+        The server could not communicate with an upstream server, or
+        received an error from an upstream server, and therefore could
+        not complete the request. This is similar to HTTP's 402 Bad
+        Gateway error. This error SHOULD be used by pingback proxies
+        when propagating errors.
+
+    In addition, [FaultCodes] defines some standard fault codes that
+    servers MAY use to report higher level errors.
+
+Servers MUST respond to this function call either with a single string
+or with a fault code.
+
+If the pingback request is successful, then the return value MUST be a
+single string, containing as much information as the server deems
+useful. This string is only expected to be used for debugging
+purposes.
+
+If the result is unsuccessful, then the server MUST respond with an
+RPC fault value. The fault code should be either one of the codes
+listed above, or the generic fault code zero if the server cannot
+determine the correct fault code.
+
+Clients MAY ignore the return value, whether the request was
+successful or not. It is RECOMMENDED that clients do not show the
+result of successful requests to the user.
+
+Upon receiving a request, servers MAY do what they like. However, the
+following steps are RECOMMENDED:
+
+   1. The server MAY attempt to fetch the source URI to verify that
+   the source does indeed link to the target.
+   2. The server MAY check its own data to ensure that the target
+   exists and is a valid entry.
+   3. The server MAY check that the pingback has not already been registered.
+   4. The server MAY record the pingback.
+   5. The server MAY regenerate the site's pages (if the pages are static).
+
+ * @author: Reini Urban
+ */
+$wiki_dmap['pingback.ping']
+= array('signature'     => array(array($xmlrpcString, $xmlrpcString, $xmlrpcString)),
+        'documentation' => "",
+        'function'      => 'pingBack');
+function pingBack($params)
+{
+    global $request;
+    $Param0 = $params->getParam(0);
+    $sourceURI = short_string_decode($Param0->scalarval());
+    $Param1 = $params->getParam(1);
+    $targetURI = short_string_decode($Param1->scalarval());
+    // TODO...
+}
  
 /** 
  * Construct the server instance, and set up the dispatch map, 
  * which maps the XML-RPC methods on to the wiki functions.
- * Provide the "wiki." prefix to each function
+ * Provide the "wiki." prefix to each function. Besides 
+ * the blog - pingback, ... - functions with a seperate namespace.
  */
 class XmlRpcServer extends xmlrpc_server
 {
     function XmlRpcServer ($request = false) {
         global $wiki_dmap;
-        foreach ($wiki_dmap as $name => $val)
-            $dmap['wiki.' . $name] = $val;
+        foreach ($wiki_dmap as $name => $val) {
+            if ($name == 'pingback.ping') // non-wiki methods
+                $dmap[$name] = $val;
+            else
+                $dmap['wiki.' . $name] = $val;
+        }
 
         $this->xmlrpc_server($dmap, 0 /* delay service*/);
     }
@@ -723,6 +922,22 @@
     }
 }
 
+/*
+ $Log: XmlRpcServer.php,v $
+ Revision 1.17  2005/10/31 16:49:31  rurban
+ fix doc
+
+ Revision 1.16  2005/10/29 14:17:51  rurban
+ fix doc
+
+ Revision 1.15  2005/10/29 08:57:12  rurban
+ fix for !register_long_arrays
+ new: array wiki.listPlugins()
+      String wiki.getPluginSynopsis(String plugin)
+      String pingback.ping(String sourceURI, String targetURI) (preliminary)
+
+
+ */
 
 // (c-file-style: "gnu")
 // Local Variables:
diff -ruN 11p1/lib/ziplib.php 12p3/lib/ziplib.php
--- 11p1/lib/ziplib.php	2005-02-12 11:08:18.000000000 -0600
+++ 12p3/lib/ziplib.php	2006-06-18 06:19:29.000000000 -0500
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: ziplib.php,v 1.44 2005/01/31 00:28:48 rurban Exp $');
+<?php rcs_id('$Id: ziplib.php,v 1.46 2006/03/07 20:47:36 rurban Exp $');
 
 /**
  * GZIP stuff.
@@ -39,17 +39,6 @@
     if (!gzclose($fp)) {
         trigger_error(sprintf("%s failed", 'gzclose'), E_USER_ERROR);
     }
-/* ---- Original code ----  
-	$size = filesize($filename);
-    if (!($fp = fopen($filename, "rb"))) {
-        trigger_error(sprintf("%s failed", 'fopen'), E_USER_ERROR);
-	}
-    if (!($z = fread($fp, $size)) || strlen($z) != $size)
-        trigger_error(sprintf("%s failed", 'fread'), E_USER_ERROR);
-    if (!fclose($fp))
-        trigger_error(sprintf("%s failed", 'fclose'), E_USER_ERROR);
-*/
-// -- FIX -------------
     $z = NULL;
     if (!($fp = fopen($filename,"rb"))) {
         trigger_error(sprintf("%s failed", 'fopen'), E_USER_ERROR);
@@ -59,7 +48,6 @@
     }
     if (!fclose($fp))
         trigger_error(sprintf("%s failed", 'fclose'), E_USER_ERROR);
-// -- End FIX ----------
     unlink($filename);
     return $z;
 }
@@ -373,7 +361,7 @@
 
 
 /**
- * Class for reading zip files.
+ * Class for reading zip files. Handles buffers also.
  *
  * BUGS:
  *
@@ -391,27 +379,50 @@
 class ZipReader
 {
     function ZipReader ($zipfile) {
-        if (!is_string($zipfile))
-            $this->fp = $zipfile;	// File already open
-        else if (!($this->fp = fopen($zipfile, "rb")))
-            trigger_error(sprintf(_("Can't open zip file '%s' for reading"),
-                                  $zipfile), E_USER_ERROR);
+        if (!is_string($zipfile)) { // filepointer: File already open
+            $this->fp = $zipfile;
+            $zipfile = NULL;
+        } elseif (((ord($zipfile[0]) * 256 + ord($zipfile[1])) % 31 == 0) // buffer
+		and (substr($zipfile,0,2) == "\037\213")
+		or (substr($zipfile,0,2) == "x\332")) {  // 120, 218
+	    $this->fp = NULL;	
+	    $this->buf = $zipfile;
+            $zipfile = NULL;
+	} 
+        if ($zipfile) {
+            $this->zipfile = $zipfile;
+            if (!($this->fp = fopen($zipfile, "rb"))) {
+                trigger_error(sprintf(_("Can't open zip file '%s' for reading"),
+                                    $zipfile), E_USER_ERROR);
+            }
+        }
     }
     
     function _read ($nbytes) {
-        $chunk = fread($this->fp, $nbytes);
-        if (strlen($chunk) != $nbytes)
-            trigger_error(_("Unexpected EOF in zip file"), E_USER_ERROR);
-        return $chunk;
+	if ($this->fp) {
+            $chunk = fread($this->fp, $nbytes);
+            if (strlen($chunk) != $nbytes)
+                trigger_error(_("Unexpected EOF in zip file"), E_USER_ERROR);
+            return $chunk;
+	} elseif ($this->buf)  {
+	    if (strlen($this->buf) < $nbytes)
+		trigger_error(_("Unexpected EOF in zip file"), E_USER_ERROR);
+	    $chunk = substr($this->buf, 0, $nbytes);
+	    $this->buf = substr($this->buf, $nbytes);
+	    return $chunk;
+	}
     }
     
     function done () {
-        fclose($this->fp);
+	if ($this->fp)
+            fclose($this->fp);
+	else
+	    $this->buf = '';
         return false;
     }
     
   function readFile () {
-      $head = $this->_read(30);
+      $head = $this->_read(30); // FIXME: This is bad for gzip compressed buffers
       
       extract(unpack("a4magic/vreq_version/vflags/vcomp_type"
                      . "/vmod_time/vmod_date"
@@ -419,13 +430,26 @@
                      . "/vfilename_len/vextrafld_len",
                      $head));
       
-      //FIXME: we should probably check $req_version.
-      $attrib['mtime'] = dostime2unixtime($mod_date, $mod_time);
-      
       if ($magic != ZIP_LOCHEAD_MAGIC) {
+          // maybe gzip?
+          //$x = substr($magic,0,3);
+          if (substr($magic,0,3) == "\037\213\225")
+              //and (substr($magic,3,1) & 0x3e) == 0) 
+          {
+              if ($this->fp) {
+                  fclose($this->fp);
+                  $this->fp = fopen($this->zipfile, "rb");
+                  $content = $this->_read(filesize($this->fp));
+              } else {
+                  $content = $this->buf;
+              }
+              // TODO...
+              $data = zip_deflate($content);
+              return array($filename, $data, $attrib);
+          }
           if ($magic != ZIP_CENTHEAD_MAGIC)
               // FIXME: better message?
-              ExitWiki(sprintf("Bad header type: %s", $magic));
+              ExitWiki(sprintf("Unsupported ZIP header type: %s", $magic));
           return $this->done();
       }
       if (($flags & 0x21) != 0)
@@ -435,6 +459,8 @@
           ExitWiki("Postponed CRC not yet supported.");
       
       $filename = $this->_read($filename_len);
+      //FIXME: we should probably check $req_version.
+      $attrib['mtime'] = dostime2unixtime($mod_date, $mod_time);
       if ($extrafld_len != 0)
           $attrib['extra_field'] = $this->_read($extrafld_len);
       
@@ -546,8 +572,9 @@
  * automatically convert encodings to a safe type if they receive
  * mail encoded in '8bit' and/or 'binary' encodings.
  */
-function MimeifyPageRevision ($revision) {
-    $page = $revision->getPage();
+function MimeifyPageRevision (&$page, &$revision) {
+    // $wikidb =& $revision->_wikidb;
+    // $page = $wikidb->getPage($revision->getName());
     // FIXME: add 'hits' to $params 
     $params = array('pagename'     => $page->getName(),
                     'flags'        => "",
@@ -814,8 +841,10 @@
     //        haven't got one yet?
     if (!isset($versiondata['author'])) {
         global $request;
-        $user = $request->getUser();
-        $versiondata['author'] = $user->getId(); //FIXME:?
+        if (is_object($request)) {
+            $user = $request->getUser();
+            $versiondata['author'] = $user->getId(); //FIXME:?
+        }
     }
     
     $encoding = strtolower($headers['content-transfer-encoding']);
@@ -834,6 +863,12 @@
 }
 
 // $Log: ziplib.php,v $
+// Revision 1.46  2006/03/07 20:47:36  rurban
+// MimeifyPageRevision refactoring. see loadsave
+//
+// Revision 1.45  2005/12/27 18:05:48  rurban
+// start with GZIP reading within ZipReader (not yet ready)
+//
 // Revision 1.44  2005/01/31 00:28:48  rurban
 // fix bug 1044945: pgsrc upgrade problem if mime wo/body
 //
Files 11p1/locale/de/LC_MESSAGES/phpwiki.mo and 12p3/locale/de/LC_MESSAGES/phpwiki.mo differ
diff -ruN 11p1/locale/de/LC_MESSAGES/phpwiki.php 12p3/locale/de/LC_MESSAGES/phpwiki.php
--- 11p1/locale/de/LC_MESSAGES/phpwiki.php	2005-09-18 07:12:29.000000000 -0500
+++ 12p3/locale/de/LC_MESSAGES/phpwiki.php	2006-06-18 06:19:29.000000000 -0500
@@ -80,6 +80,8 @@
    "%s ist leer";
 $locale["%s is empty."] =
    "%s ist leer.";
+$locale["%s is listed at %s"] =
+   "%s blockiert von %s";
 $locale["%s is missing"] =
    "%s Argument fehlt";
 $locale["%s is not locked!"] =
@@ -92,6 +94,8 @@
    "%s wird/werden nur in gesperrten Seiten erlaubt.";
 $locale["%s k"] =
    "%s k";
+$locale["%s not defined"] =
+   "%s nicht definiert";
 $locale["%s not found"] =
    "%s nicht gefunden";
 $locale["%s of this page"] =
@@ -234,14 +238,12 @@
    "ADMIN";
 $locale["ANON"] =
    "ANON";
-$locale["AUTH_GROUP_FILE not defined"] =
-   "AUTH_GROUP_FILE nicht definiert";
 $locale["About"] =
    "ber";
 $locale["Access"] =
    "Zugriff";
 $locale["Access denied to change page '%s'."] =
-   "Zugang veweigert um Seite '%s' zu ndern.";
+   "Zugang verweigert um Seite '%s' zu ndern.";
 $locale["Action page"] =
    "Aktion Seite";
 $locale["Add %s hours to the server's local time when reporting times."] =
@@ -266,6 +268,8 @@
    "SeitenLink einfgen";
 $locale["AddPlugin"] =
    "Plugin einfgen";
+$locale["AddTemplate"] =
+   "NeueVorlage";
 $locale["AddingPages"] =
    "SeitenErzeugen";
 $locale["Adjust"] =
@@ -298,6 +302,8 @@
    "Erlaubt die Auswahl mehrerer Seiten, die dann mit weiteren WikiAdmin Zusatzprogrammen bearbeitet werden.";
 $locale["Also pages which have been deleted at least %s days."] =
    "Auch Seiten, die in den letzten %s Tagen gelscht wurden.";
+$locale["An email will be sent."] =
+   "Ein EMail wird versendet.";
 $locale["An unnamed PhpWiki"] =
    "Unbenanntes PhpWiki";
 $locale["Anonymous Users"] =
@@ -319,19 +325,23 @@
 $locale["Approve"] =
    "Akzeptieren";
 $locale["Are you sure you want to permanently change access to the selected files?"] =
-   "Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?";
+   "Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?";
 $locale["Are you sure you want to permanently change the markup type of the selected files?"] =
-   "Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?";
+   "Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?";
 $locale["Are you sure you want to permanently change the selected files?"] =
-   "Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?";
+   "Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?";
 $locale["Are you sure you want to permanently chown the selected files?"] =
-   "Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?";
+   "Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?";
 $locale["Are you sure you want to permanently remove the selected files?"] =
-   "Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich lschen wollen?";
+   "Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich lschen wollen?";
 $locale["Are you sure you want to permanently rename the selected files?"] =
-   "Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich umbenennen wollen?";
+   "Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich umbenennen wollen?";
 $locale["Are you sure you want to permanently search & replace text in the selected files?"] =
-   "Sind Sie sicher, da Sie alle Wrter in den angegebenen Seiten ersetzen wollen?";
+   "Sind Sie sicher, dass Sie alle Wrter in den angegebenen Seiten ersetzen wollen?";
+$locale["Are you sure?"] =
+   "Sind Sie sicher?";
+$locale["Argument '%s' not declared by plugin."] =
+   "Argument %s nicht im Zusatzprogramm deklariert.";
 $locale["Arguments"] =
    "Parameter";
 $locale["Attempting to use the directory '%s' instead."] =
@@ -347,7 +357,7 @@
 $locale["Authenticated as %s"] =
    "Authentifiziert als %s";
 $locale["Authenticated users on this wiki (%d total):"] =
-   "Eingetrage Benutzer in diesem Wiki (Gesamt: %d):";
+   "Eingetragene Benutzer in diesem Wiki (Gesamt: %d):";
 $locale["Author"] =
    "Autor";
 $locale["Author will be logged as %s."] =
@@ -383,9 +393,9 @@
 $locale["Bad url in src: remove all of <, >, \""] =
    "URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \"";
 $locale["Blog Archives:"] =
-   "Blog Archive:";
+   "Blog-Archive:";
 $locale["Blog Entries for %s:"] =
-   "Blog Eintrge fr %s:";
+   "Blog-Eintrge fr %s:";
 $locale["Blog page"] =
    "Blog Seite";
 $locale["BlogArchives"] =
@@ -415,25 +425,25 @@
 $locale["CalendarPlugin"] =
    "KalenderPlugin";
 $locale["Can't inflate data: zlib support not enabled in this PHP"] =
-   "Kann Daten nicht dekomprimieren: Die zlib Bibiliothek wurde in PHP nicht installiert/aktiviert.";
+   "Kann Daten nicht dekomprimieren: Die zlib-Bibliothek wurde in PHP nicht installiert/aktiviert.";
 $locale["Can't mix '%s' with '%s' type format strings"] =
    "Kann %s Typ-Formatzeichenketten nicht mit %s vermischen.";
 $locale["Can't open the upload logfile."] =
    "Die Upload-Logdatei konnte nicht geffnet worden.";
 $locale["Can't open zip file '%s' for reading"] =
-   "Konnte zip Datei %s nich ffnen zum lesen";
+   "Konnte ZIP-Datei %s nicht zum Lesen ffnen";
 $locale["Cancel"] =
    "Abbrechen";
 $locale["Cancel rating"] =
    "Bewertung lschen";
+$locale["Cancelled"] =
+   "Abgebrochen";
 $locale["Cannot create directory '%s'"] =
    "Das Verzeichnis %s kann nicht erzeugt werden";
 $locale["Cannot open AUTH_GROUP_FILE %s"] =
    "Kann AUTH_GROUP_FILE %s nicht ffnen";
 $locale["Case insensitive?"] =
-   "Gross/Kleinschreibung beachten?";
-$locale["Category"] =
-   "Kategorie";
+   "Gro-/Kleinschreibung beachten?";
 $locale["CategoryCategory"] =
    "KategorieKategorie";
 $locale["CategoryGroup"] =
@@ -451,18 +461,18 @@
 $locale["Change country"] =
    "Land ndern";
 $locale["Change markup"] =
-   "ndere Formattierung";
+   "ndere Formatierung";
 $locale["Change markup type"] =
-   "ndere Formattierungs-Typ";
+   "ndere Formatierungs-Typ";
 $locale["Change page attributes"] =
    "ndern von Eigenschaften";
 $locale["Change the markup type of selected pages."] =
-   "ndere den Formattierungstyp aller ausgewhlte Seiten.";
+   "ndere den Formatierungstyp aller ausgewhlte Seiten.";
 $locale["Check any two boxes then %s."] =
    "Whlen Sie zwei Versionen aus, dann %s.";
 $locale["Check any two boxes to compare revisions."] =
    "Whlen Sie zwei Versionen zum Vergleich aus.";
-$locale["Check to add this Acl"] =
+$locale["Check to add this ACL"] =
    "Anklicken um diese ACL hinzuzufgen";
 $locale["Chmod"] =
    "Chmod";
@@ -484,6 +494,8 @@
    "Klicken um anzuzeigen";
 $locale["Click to display all comments"] =
    "Klicken um Kommentare anzuzeigen";
+$locale["Click to hide the TOC"] =
+   "Hier klicken um zu verstecken";
 $locale["Click to hide the comments"] =
    "Klicken um Kommentare zu verstecken";
 $locale["Click to reverse sort order"] =
@@ -527,7 +539,7 @@
 $locale["Copyrights"] =
    "Urheberrechte";
 $locale["Couldn't change page '%s' to markup type '%s'."] =
-   "Konnte die Formattierung der Seite '%s' nicht auf '%s' ndern.";
+   "Konnte die Formatierung der Seite '%s' nicht auf '%s' ndern.";
 $locale["Couldn't chmod page '%s' to '%s'."] =
    "Konnte die Berechtigung der Seite '%s' nicht auf '%s' ndern.";
 $locale["Couldn't chown page '%s' to '%s'."] =
@@ -541,9 +553,9 @@
 $locale["Count"] =
    "Anzahl";
 $locale["Create a Wiki page by the provided name."] =
-   "Erzeuge neue Wiki Seite mit dem angegebenem Namen.";
+   "Erzeuge neue Wiki-Seite mit dem angegebenem Namen.";
 $locale["Create a Wiki page."] =
-   "Erzeuge eine neue Wiki Seite.";
+   "Erzeuge eine neue Wiki-Seite.";
 $locale["Create a new (sub)page"] =
    "Erzeuge eine neue (Unter)Seite";
 $locale["Create: %s"] =
@@ -552,6 +564,8 @@
    "NeueSeite";
 $locale["CreateToc"] =
    "InhaltsVerzeichnis";
+$locale["CreateToc disabled for old markup"] =
+   "InhaltsVerzeichnis deaktiviert fr altes Markup";
 $locale["CreateTocPlugin"] =
    "InhaltsVerzeichnisPlugin";
 $locale["Created by CreatePage"] =
@@ -587,7 +601,7 @@
 $locale["DebugInfo"] =
    "DebugInfo";
 $locale["Default InterWiki map file not loaded."] =
-   "Standard-Datei der InterWiki-Karte nicht geladen.";
+   "Standard-Datei der InterWikiListe nicht geladen.";
 $locale["Default language: '%s'"] =
    "Standardsprache fr dieses Wiki: %s";
 $locale["Default preferences will be used."] =
@@ -642,6 +656,8 @@
    "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen";
 $locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] =
    "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt.";
+$locale["Do you really want to reset the password of user %s?"] =
+   "Wollen Sie wirklich das Passwort von Benutzer %s zurcksetzen?";
 $locale["Don't cache this page."] =
    "Cache diese Seite nicht.";
 $locale["Double redirect not allowed."] =
@@ -655,9 +671,9 @@
 $locale["Download the page contents"] =
    "Runterladen der Seite";
 $locale["Downloading html zip dumps"] =
-   "Das Herunterladen aller Wiki Seiten als HTML-Dateien in einer Zip Datei";
+   "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei";
 $locale["Downloading zip dumps"] =
-   "Das Herunterladen aller Wiki Seiten als gezippte Datei";
+   "Das Herunterladen aller Wiki-Seiten als gezippte Datei";
 $locale["Dump Pages"] =
    "Seiten Schreiben";
 $locale["Dump Pages as XHTML"] =
@@ -716,6 +732,8 @@
    "E-Mail Besttigung";
 $locale["Email not yet verified."] =
    "E-Mail noch nicht besttigt.";
+$locale["Email sent to the stored email address for user %s"] =
+   "EMail mit dem neuen Passwort fr Benutzer %s erfolgreich gesendet";
 $locale["Email verified."] =
    "E-Mail besttigt.";
 $locale["Embed hidden comments in WikiPages."] =
@@ -734,6 +752,10 @@
    "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Regulre Ausdrcke (fileglobbing) erlaubt.";
 $locale["Enter your UserId to sign in"] =
    "Tragen Sie bitte fr die Anmeldung im Wiki Ihren Benutzernamen ein";
+$locale["Error"] =
+   "Fehler";
+$locale["Error sending email with password for user %s."] =
+   "Fehler beim Versenden der EMail mit dem neuen Passwort fr Benutzer %s.";
 $locale["Error: Empty search string."] =
    "Fehler: Leeres Suchwort.";
 $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] =
@@ -761,11 +783,13 @@
 $locale["Failed to set LDAP protocol version to 3"] =
    "Fehler beim Setzen der LDAP Protokoll Version 3";
 $locale["Fatal PhpWiki Error"] =
-   "Fataler PhpWiki Fehler";
+   "Fataler PhpWiki-Fehler";
 $locale["File names may only contain alphanumeric characters and dot, underscore or dash."] =
    "Dateinamen drfen nur folgende Zeichen enthalten: alphanumerische Zeichen, Punkt, Unterstrich und Bindestrich.";
 $locale["File successfully uploaded."] =
    "Datei erfolgreich hochgeladen.";
+$locale["FileInfo"] =
+   "DateiInfo";
 $locale["Files with extension %s are not allowed."] =
    "Dateien mit der Endung %s sind nicht erlaubt.";
 $locale["FindPage"] =
@@ -833,7 +857,7 @@
 $locale["H"] =
    "H.";
 $locale["HasHomePage"] =
-   "HaHomePage";
+   "HasHomePage";
 $locale["Headline text"] =
    "berschrift";
 $locale["Height"] =
@@ -847,7 +871,7 @@
 $locale["Hide %s:"] =
    "%s verstecken:";
 $locale["Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections."] =
-   "LinkIcons ausblenden oder einblenden (unter Voraussetzung da es mit dem ausgewhlter Darstellung untersttzt wurde). Werde wertvoll sein fr die die mit Text-only browsers anschauen oder langsamer Konnexionen.";
+   "LinkIcons ausblenden oder einblenden (unter der Voraussetzung, dass es durch die ausgewhlte Darstellung untersttzt wird). Dies ist sinnvoll fr Text-Browser und langsame Verbindungen.";
 $locale["Hilight referred search terms."] =
    "Hebe externe Suchwrter hervor.";
 $locale["History of all major and minor edits by %s to page %s."] =
@@ -941,7 +965,7 @@
 $locale["InterWiki Address"] =
    "InterWiki-Adresse";
 $locale["InterWikiMap"] =
-   "InterWikiKarte";
+   "InterWikiListe";
 $locale["InterWikiSearch"] =
    "InterWikiSuche";
 $locale["Invalid ACL"] =
@@ -970,8 +994,6 @@
    "JabberAnwesend";
 $locale["Keep up to %d major edits, but keep them no longer than %d days."] =
    "Aufbewahrung grerer nderungen fr %d, aber nicht lnger als %d Tage.";
-$locale["LDAP_AUTH_HOST not defined"] =
-   "LDAP_AUTH_HOST nicht definiert";
 $locale["Language"] =
    "Sprache";
 $locale["Last"] =
@@ -1017,7 +1039,7 @@
 $locale["List PageHistory for %s"] =
    "Das nderungsprotokoll fr %s auflisten";
 $locale["List all once authenticated users."] =
-   "Liste alle eingetragen Benutzer.";
+   "Liste alle eingetragenen Benutzer.";
 $locale["List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user."] =
    "Liste aller Versionen eines Autors mit Diff-Links, oder eine SeitenProtokoll-hnliche Liste einer Seite nur fr einen Autor.";
 $locale["List all pages in this wiki."] =
@@ -1061,7 +1083,7 @@
 $locale["Loading '%s'"] =
    "%s wird geladen";
 $locale["Loading InterWikiMap from external file %s."] =
-   "Die InterWikikarte wird von der externen Datei %s geladen.";
+   "Die InterWikiListe wird von der externen Datei %s geladen.";
 $locale["Loading files"] =
    "Das Dateienladen in diesem Wiki";
 $locale["Loading up virgin wiki"] =
@@ -1147,7 +1169,7 @@
 $locale["Next Month"] =
    "Nchster Monat";
 $locale["No Blog Entries"] =
-   "Keine Blog Eintrge";
+   "Keine Blog-Eintrge";
 $locale["No LDAP in this PHP version"] =
    "Kein LDAP in dieser PHP Version";
 $locale["No changes found"] =
@@ -1189,7 +1211,7 @@
 $locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window.  In this case, the width preference will be ignored."] =
    "Beachten Sie bitte, dass viele Browser die Breite der Textbox automatisch an ihre Fensterbreite anpassen. In diesem Fall wird die hier eingegebene Breite ignoriert.";
 $locale["Note, that user accounts with bouncing emails will be disabled."] =
-   "Beachten Sie bitte, da Benutzer mit ungltigen E-Mail Addressen gelscht werden.";
+   "Beachten Sie bitte, dass Benutzer mit ungltigen E-Mail-Addressen gelscht werden.";
 $locale["Note:"] =
    "Hinweis:";
 $locale["Note: Only if you create your personal HomePage with same the pagename as your user id, you will be able to store your UserPreferences. Otherwise not."] =
@@ -1220,6 +1242,8 @@
    "Nur Dateien mit der Endung HTML sind erlaubt";
 $locale["Oops! Revision %s of %s seems to have been deleted!"] =
    "Hoppla! Es scheint, die Version %s von %s wurde gelscht!";
+$locale["Operation undone"] =
+   "Aktion rckgngig gemacht";
 $locale["Optimizing database"] =
    "Datenbank wird optimiert";
 $locale["Original (1.2 or 1.0)"] =
@@ -1233,7 +1257,7 @@
 $locale["Other version"] =
    "Andere Version";
 $locale["Our users created a total of %d pages."] =
-   "Unsere Benutezr erzeugten insgesamt %d Seiten.";
+   "Unsere Benutzer erzeugten insgesamt %d Seiten.";
 $locale["Owner"] =
    "Besitzer";
 $locale["Owner: %s"] =
@@ -1265,7 +1289,7 @@
 $locale["Page could not be updated. %s doesn't exist!\n"] =
    "Seite konnte nicht gendert werden. %s existiert nicht!\n";
 $locale["Page names with prefix '%s'"] =
-   "Seitenamen mit dem Anfangswort %s";
+   "Seitennamen mit dem Anfangswort %s";
 $locale["Page names with suffix '%s'"] =
    "Seitennamen mit Endwort %s";
 $locale["Page now locked."] =
@@ -1291,7 +1315,7 @@
 $locale["PageGroup for %s"] =
    "SeitenGruppe fr %s";
 $locale["PageGroupTest"] =
-   "SeitenGruppeTest";
+   "SeitenGruppenTest";
 $locale["PageGroupTest/Four"] =
    "SeitenGruppenTest/Vier";
 $locale["PageGroupTest/One"] =
@@ -1318,6 +1342,8 @@
    "Passwort wurde nicht gendert.";
 $locale["Password:"] =
    "Passwort:";
+$locale["PasswordReset"] =
+   "PasswortZurcksetzen:";
 $locale["Perform searches on InterWiki sites listed in InterWikiMap."] =
    "Durchsuchen im InterWiki sites die im InterWikiMap verzeichnet sind.";
 $locale["Permanently remove all selected pages."] =
@@ -1361,7 +1387,7 @@
 $locale["PhpWikiAdministration/Chown"] =
    "PhpWikiSystemverwalten/Chown";
 $locale["PhpWikiAdministration/Markup"] =
-   "PhpWikiSystemverwalten/Formattierung";
+   "PhpWikiSystemverwalten/Formatierung";
 $locale["PhpWikiAdministration/Remove"] =
    "PhpWikiSystemverwalten/Lschen";
 $locale["PhpWikiAdministration/Rename"] =
@@ -1379,7 +1405,7 @@
 $locale["Please contact your PhpWiki administrator for assistance."] =
    "Bitte bitten Sie Ihren PhpWiki Administrator um Untersttzung.";
 $locale["Please ensure that %s is writable, or redefine %s in config/config.ini."] =
-   "Bitte berprfen Sie, da %s nderbar ist, oder ndern Sie %s in config/config.ini.";
+   "Bitte berprfen Sie, dass %s nderbar ist, oder ndern Sie %s in config/config.ini.";
 $locale["Please set ENCRYPTED_PASSWD to false in config/config.ini and probably change ADMIN_PASSWD."] =
    "Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren Sie config/config.ini und berprfen sie auch ADMIN_PASSWD.";
 $locale["Please set ENCRYPTED_PASSWD to true in config/config.ini."] =
@@ -1433,7 +1459,7 @@
 $locale["Previous Author"] =
    "Voriger Autor";
 $locale["Previous Major Revision"] =
-   "Vorige grssere Neubearbeitung";
+   "Vorige grere Neubearbeitung";
 $locale["Previous Month"] =
    "Voriger Monat";
 $locale["Previous Revision"] =
@@ -1473,7 +1499,7 @@
 $locale["Raw HTML"] =
    "Reine HTML-Befehle";
 $locale["Raw HTML is disabled in this wiki."] =
-   "HTML-Befehle sind in diesem Wiki ausser Kraft gesetzt.";
+   "HTML-Befehle sind in diesem Wiki auer Kraft gesetzt.";
 $locale["RawHtmlPlugin"] =
    "RawHtmlPlugin";
 $locale["Recent Comments"] =
@@ -1558,12 +1584,16 @@
    "Verlangt Administratorenrechte zur Bearbeitung.";
 $locale["Reset"] =
    "Zurcksetzen";
+$locale["Reset password of user: "] =
+   "Setze Passwort von Benutzer zurck: ";
 $locale["Restore Anyway"] =
    "Ungeprft berschreiben";
 $locale["Return to %s"] =
    "Zurck zu %s";
 $locale["Revert"] =
    "Zurckspeichern";
+$locale["Revert: %s"] =
+   "Zurckspeichern: %s";
 $locale["Reverting to a previous version of pages"] =
    "Zurckspeichern einer lteren Version";
 $locale["Revision Not Found"] =
@@ -1573,7 +1603,7 @@
 $locale["RichTablePlugin"] =
    "ErweiterteTabellenPlugin";
 $locale["SOAP access"] =
-   "SOAP Zugriff";
+   "SOAP-Zugriff";
 $locale["SandBox"] =
    "SandKasten";
 $locale["Save"] =
@@ -1632,6 +1662,8 @@
    "Ausgewhlte Seiten: ";
 $locale["Selected page '%s' passed to '%s'."] =
    "Ausgewhlte Seite %s an %s bergeben.";
+$locale["Send email"] =
+   "Sende EMail";
 $locale["Serialized file %s"] =
    "Serialisierte Datei %s";
 $locale["Set Password"] =
@@ -1657,7 +1689,7 @@
 $locale["Show relative dates using 'Today' and 'Yesterday'"] =
    "Datum mit relativen Bezeichnungen, wie Heute und Gestern";
 $locale["Show summary information from the access log table."] =
-   "Zeige berblick ber die Access LOG Tabelle.";
+   "Zeige berblick ber die Access LOG-Tabelle.";
 $locale["Show summary information of the current user sessions."] =
    "Zeige berblick ber alle aktuellen Benutzersessions.";
 $locale["Show translations of various words or pages"] =
@@ -1670,8 +1702,6 @@
    "Abmelden";
 $locale["Sign in as:"] =
    "Anmelden als:";
-$locale["Sign in:"] =
-   "Anmelden:";
 $locale["SignIn"] =
    "AnMelden";
 $locale["SignOut"] =
@@ -1742,6 +1772,8 @@
    "Land eingeben";
 $locale["Subpage"] =
    "Unterseite";
+$locale["Substring \"%s\" found %s times. Replace with \"%s\"?"] =
+   "Substring \"%s\" %s mal gefunden. Ersetze mit \"%s\"?";
 $locale["Summary"] =
    "Zusammenfassung";
 $locale["Supplanted on:"] =
@@ -1753,7 +1785,7 @@
 $locale["Supported languages"] =
    "Untersttzte Sprachen";
 $locale["Supported themes"] =
-   "Unterstzte Benutzeroberflche";
+   "Untersttzte Benutzeroberflche";
 $locale["Switch to detailed list"] =
    "Wechsle zu detallierter Liste";
 $locale["Switch to summary"] =
@@ -1768,6 +1800,8 @@
    "Inhaltsverzeichnis";
 $locale["TeX directory not writable."] =
    "Keine Schreibrechte fr das TeX Verzeichnis.";
+$locale["Template"] =
+   "Benutzeroberflche";
 $locale["TermsOfUse"] =
    "BenutzungsBedingungen";
 $locale["TextFormattingRules"] =
@@ -1878,12 +1912,10 @@
    "Obere u. untere Werkzeugleisten";
 $locale["Top Recommendations"] =
    "Beste Bewertungungen";
-$locale["Topic"] =
-   "Thema";
 $locale["Total %d plugins: "] =
-   "%d Gesammte Zusatzprogramme: ";
+   "%d Gesamte Zusatzprogramme: ";
 $locale["Total of %d languages: "] =
-   "%d Sprache gesammt: ";
+   "%d Sprache gesamt: ";
 $locale["Total of %d themes: "] =
    "%d Benutzeroberflche gesamt: ";
 $locale["Transclude"] =
@@ -1912,10 +1944,14 @@
    "UNERREICHBAR";
 $locale["USER"] =
    "BENUTZER";
+$locale["Unable to bind LDAP server %s using %s %s"] =
+   "Konnte nicht mit LDAP Server %s verbinden mit %s %s";
 $locale["Unable to connect to IMAP server "] =
    "IMAP Server nicht gefunden ";
 $locale["Unable to connect to LDAP server %s"] =
    "Konnte LDAP Server %s nicht finden";
+$locale["Unable to find src='%s'"] =
+   "Konnte src='%s' nicht lesen";
 $locale["Unable to load: %s"] =
    "Konnte %s nicht laden";
 $locale["Unable to open directory '%s' for reading"] =
@@ -1931,7 +1967,7 @@
 $locale["Undo disabled"] =
    "Undo deaktiviert";
 $locale["Unexpected EOF in zip file"] =
-   "Unerwartetes Dateiende (EOF-Fehler) in ZIP Datei";
+   "Unerwartetes Dateiende (EOF-Fehler) in ZIP-Datei";
 $locale["UnfoldSubpages"] =
    "UnterseitenEntfalten";
 $locale["UnfoldSubpagesPlugin"] =
@@ -1971,7 +2007,7 @@
 $locale["Uploading failed."] =
    "Hochladen fehlgeschlagen.";
 $locale["Uploading zip dumps"] =
-   "Das Hochladen vonr ZIP-Speicherauszge in diesem Wiki";
+   "Das Hochladen von ZIP-Dumps in diesem Wiki";
 $locale["Use old markup"] =
    "Alte Formatierungssyntax verwenden";
 $locale["User page"] =
@@ -2023,13 +2059,13 @@
 $locale["Viewing redirecting page."] =
    "Zeige Redirekt-Seite.";
 $locale["Viewing the source of pages"] =
-   "DieQuelltextansicht der Seiten in diesem Wiki";
+   "Die Quelltextansicht der Seiten in diesem Wiki";
 $locale["Visited pages on this wiki, ordered by popularity:"] =
    "Die besuchten Seiten dieses Wikis, nach Popularitt geordnet:";
 $locale["W"] =
    "Br.";
 $locale["WARNING: InterWikiMap page is unlocked, so not using those links."] =
-   "ACHTUNG: Die InterWikiKarte Seite ist ungesperrt. Ignoriert.";
+   "ACHTUNG: Die InterWikiListe Seite ist ungesperrt. Ignoriert.";
 $locale["Wanted From"] =
    "Bentigt von";
 $locale["Wanted Pages for %s (%d total):"] =
@@ -2071,9 +2107,9 @@
 $locale["WikiAdminChown"] =
    "WikiAdminChown";
 $locale["WikiAdminMarkup"] =
-   "WikiAdminFormattierung";
+   "WikiAdminFormatierung";
 $locale["WikiAdminMarkup from %s to %s"] =
-   "WikiAdminFormattierung von %s auf %s";
+   "WikiAdminFormatierung von %s auf %s";
 $locale["WikiAdminRemove"] =
    "WikiAdminLschen";
 $locale["WikiAdminRename"] =
@@ -2129,13 +2165,13 @@
 $locale["You are viewing an old revision of this page."] =
    "Sie sehen eine alte Version dieser Seite.";
 $locale["You can personalize various settings in %s."] =
-   "Sie knnen knnen einige Eintellungen in %s individuell gestalten.";
+   "Sie knnen einige Einstellungen in %s individuell gestalten.";
 $locale["You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config.ini"] =
    "Sie haben vergessen ENCRYPTED_PASSWD auf true zu stellen. Bitte aktualisieren Sie config/config.ini";
 $locale["You have not made any changes so no new version has been saved."] =
    "Sie haben keine nderungen vorgenommen, deshalb konnte keine neue Version gespeichert werden.";
 $locale["You may sign in using any [WikiWord|AddingPages] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."] =
-   "Sie knnen sich mit jedem gewnschten [WikiWort|SeitenErzeugen] als Benutzernamen ins Wiki eintragen. (Auch %s u. deutsche Umlaute sind zulssig). Der Benutzername wird in Neuestenderungen als Link auf Ihre Homepage verwendet. Sie knnen Ihre Seite in die Browser Favoriten eintragen oder auch gleich als URL verwenden: ~http://www.wikiname.de/~IhrName";
+   "Sie knnen sich mit jedem gewnschten [WikiWort|SeitenErzeugen] als Benutzernamen ins Wiki eintragen. (Auch %s u. deutsche Umlaute sind zulssig). Der Benutzername wird in Neuestenderungen als Link auf Ihre Homepage verwendet.";
 $locale["You must be an administrator to %s."] =
    "Sie mssen Administratorrechte haben %s.";
 $locale["You must be an administrator to use this plugin."] =
@@ -2149,7 +2185,9 @@
 $locale["You must specify a directory to dump to"] =
    "Sie mssen zum Sichern ein Verzeichnis angeben.";
 $locale["You must wait for moderator approval."] =
-   "Sie mssen auf Moderator approval warten.";
+   "Sie mssen auf die Zustimmung des Moderators warten.";
+$locale["You need to ask an Administrator to reset this password. See below: "] =
+   "Sie mssen einen Administrator bitten, das Passwort zurckzusetzen. Siehe unten: ";
 $locale["You searched for: "] =
    "Sie suchten nach: ";
 $locale["You stored an empty password in your '%s' page."] =
@@ -2202,8 +2240,6 @@
    "hinzufgen ";
 $locale["argument '%s' not declared by plugin"] =
    "Argument %s nicht im Zusatzprogramm deklariert";
-$locale["argument '%s' not declared by plugin."] =
-   "Argument %s nicht im Zusatzprogramm deklariert.";
 $locale["authenticated"] =
    "authentifizierten";
 $locale["blog"] =
@@ -2219,7 +2255,7 @@
 $locale["case-exact"] =
    "Gro-/Kleinschreibung beachten";
 $locale["change page '%s' to markup type '%s'."] =
-   "Formattierung der Seite '%s' auf '%s' gendert.";
+   "Formatierung der Seite '%s' auf '%s' gendert.";
 $locale["check for ACCESS_LOG_SQL passwords in POST requests"] =
    "prfe auf ACCESS_LOG_SQL Passwrter in POST Requests";
 $locale["check for mysql 4.1.x/5.0.0 binary search on windows problem"] =
@@ -2252,18 +2288,16 @@
    "aktuelle Version";
 $locale["days"] =
    "Tage";
-$locale["db type:"] =
-   "Dbtyp:";
 $locale["default page permission"] =
    "Vorgabe Zugriffsrecht";
 $locale["diff"] =
    "diff";
 $locale["diff this page"] =
    "um von dieser Seite die nderungen anzuzeigen";
+$locale["download a html zip dump from this wiki"] =
+   "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen";
 $locale["download a zip dump from this wiki"] =
    "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen";
-$locale["download an html zip dump from this wiki"] =
-   "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen";
 $locale["dump html pages"] =
    "um von diesem Wiki HTML-Dateien lokal abzuspeichern";
 $locale["dump serial pages"] =
@@ -2294,6 +2328,8 @@
    "Stunden";
 $locale["invalid %s ignored"] =
    "ungltiges %s ignoriert";
+$locale["invalid argument %s"] =
+   "Ungltiger Parameter %s";
 $locale["invidual page permission"] =
    "individuelles Zugriffsrecht";
 $locale["latest comment by "] =
@@ -2305,7 +2341,7 @@
 $locale["locked"] =
    "gesperrt";
 $locale["major edits"] =
-   "Grssere nderungen";
+   "Grere nderungen";
 $locale["max: %d"] =
    "Max: %d";
 $locale["mean: %2.3f"] =
@@ -2328,6 +2364,8 @@
    "k.A.";
 $locale["name"] =
    "Name";
+$locale["new&nbsp;window"] =
+   "neues&nbsp;Fenster";
 $locale["newer than the existing page."] =
    "neuer als die bestehende Seite.";
 $locale["no RSS items"] =
@@ -2359,7 +2397,7 @@
 $locale["plain file %s"] =
    "Nur-Text-Datei %s";
 $locale["predecessor to the previous major change"] =
-   "Vorgnger zur vorherigen grsseren nderung";
+   "Vorgnger zur vorherigen greren nderung";
 $locale["previous revision"] =
    "vorige Neubearbeitung";
 $locale["recursive inclusion of page %s"] =
@@ -2392,8 +2430,6 @@
    "die Datei %s";
 $locale["the session.save_path directory '%s'"] =
    "das session.save_path Verzeichnis %s";
-$locale["timeout:"] =
-   "Zeitberschreitung:";
 $locale["to"] =
    "nach";
 $locale["today"] =
diff -ruN 11p1/locale/de/pgsrc/WunschZettelSeiten 12p3/locale/de/pgsrc/WunschZettelSeiten
--- 11p1/locale/de/pgsrc/WunschZettelSeiten	2004-04-11 06:09:59.000000000 -0500
+++ 12p3/locale/de/pgsrc/WunschZettelSeiten	2006-06-18 06:19:31.000000000 -0500
@@ -1,22 +1,22 @@
-Date: Sun, 11 Apr 2004 00:14:20 -0500
-Mime-Version: 1.0 (Produced by PhpWiki 1.3.8)
-X-Rcs-Id: $Id: WunschZettelSeiten,v 1.1 2004/04/11 11:09:59 rurban Exp $
+Date: Sun, 19 Mar 2006 00:14:20 -0500
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.12p3)
+X-Rcs-Id: $Id: WunschZettelSeiten,v 1.2 2005/09/27 17:31:25 rurban Exp $
 Content-Type: application/x-phpwiki;
   pagename=WunschZettelSeiten;
   flags="";
-  pgsrc_version="2 $Revision: 1.1 $";
+  pgsrc_version="2 $Revision: 1.2 $";
   markup=2;
   charset=iso-8859-1
 Content-Transfer-Encoding: binary
 
 Das ist eine Liste von Seiten, die in diesem Wiki zitiert werden, aber
 nicht noch nicht erzeugt wurden. Obwohl sie anscheinend bentigt werden, 
-kann es auch sein, da sie falsch geschriebene existierende Seiten sind, 
+kann es auch sein, dass sie falsch geschriebene existierende Seiten sind, 
 oder einfach zu triviale Seiten, um erzeugt zu werden.
 
-Am besten wre es natrlich, da solche Seiten nicht erzeugt werden,
-sondern die Referenz so auszubessern, da sie nicht mehr als ~WikiWort
-verlinkt werden.  Sie knnen entweder die Gorschreibung anpassen,
+Am besten wre es natrlich, dass solche Seiten nicht erzeugt werden,
+sondern die Referenz so auszubessern, dass sie nicht mehr als ~WikiWort
+verlinkt werden.  Sie knnen entweder die Groschreibung anpassen,
 oder den Link mit "~~" verhindern.
 
-<?plugin WantedPages ?>
\ No newline at end of file
+<?plugin WantedPages ?>
Files 11p1/locale/es/LC_MESSAGES/phpwiki.mo and 12p3/locale/es/LC_MESSAGES/phpwiki.mo differ
diff -ruN 11p1/locale/es/LC_MESSAGES/phpwiki.php 12p3/locale/es/LC_MESSAGES/phpwiki.php
--- 11p1/locale/es/LC_MESSAGES/phpwiki.php	2005-09-18 07:12:29.000000000 -0500
+++ 12p3/locale/es/LC_MESSAGES/phpwiki.php	2006-06-18 06:19:31.000000000 -0500
@@ -1,5 +1,13 @@
 <?php
 
+$locale[" ... around %s"] =
+   " ... alrededor de %s";
+$locale[" ... first %d bytes"] =
+   " ... primeros octetos de %d";
+$locale[" Sorry, cannot merge."] =
+   " Apesadumbrado, no puede combinarse.";
+$locale["#"] =
+   "#";
 $locale["%4d  %s\n"] =
    "%4d  %s\n";
 $locale["%d best incoming links: "] =
@@ -14,8 +22,12 @@
    "%d not-empty pginas";
 $locale["%d pages"] =
    "%d pginas";
+$locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] =
+   "%s %s %s se rechaza en este wiki para el usuario '%s' de %s (llano:  %s).";
 $locale["%s Kb (%s bytes)"] =
    "%s Kb (%s octetos)";
+$locale["%s at %s"] =
+   "%s en %s";
 $locale["%s b"] =
    "%s o";
 $locale["%s by %s"] =
@@ -26,16 +38,56 @@
    "%s octetos";
 $locale["%s days"] =
    "%s dias";
+$locale["%s has no subpages defined."] =
+   "%s: no hace ninguna pgina secundaria definir.";
+$locale["%s is disallowed on this wiki."] =
+   "%s se rechaza en este wiki.";
+$locale["%s is empty"] =
+   "%s es vaco";
+$locale["%s is listed at %s"] =
+   "%s se enumera en %s";
+$locale["%s is missing"] =
+   "%s falta";
+$locale["%s is not writable"] =
+   "%s no es escribible";
+$locale["%s is not writable."] =
+   "%s no es escribible.";
 $locale["%s not found"] =
    "%s: fichero no encontrado";
 $locale["%s: %s"] =
    "%s: %s";
+$locale["%s: Bad action"] =
+   "%s: Mala accin";
+$locale["%s: Can't open dba database"] =
+   "%s: No puede abrir la base de datos del DBA";
+$locale["%s: Date of new revision is %s"] =
+   "%s: La fecha de la nueva revisin es %s";
+$locale["%s: action forwarded to a moderator."] =
+   "%s: accin remitida a un asesor.";
+$locale["%s: error while handling error:"] =
+   "%s: error mientras que maneja error:";
 $locale["%s: file not found"] =
    "%s: fichero no encontrado";
+$locale["%s: no such class"] =
+   "%s: ninguna tal clase";
+$locale["%s: not a subclass of WikiPlugin."] =
+   "%s: no una subclase de WikiPlugin.";
 $locale["%s: not defined"] =
-   "%s: fichero no encontrado";
+   "%s: no definido";
+$locale["&version=-1 might help."] =
+   "&version=-1 pudo ayudar.";
+$locale["'%s': Bad page name"] =
+   "'%s': Mal nombre de la pgina";
+$locale["'%s': corrupt file"] =
+   "'%s': archivo corrupto";
 $locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] =
    "Copie sus cambios al portapapeles o a otro sitio temporal (p.ej. editor de textos).";
+$locale["(Redirected from %s)"] =
+   "(vuelto a dirigir de %s)";
+$locale["- saved to database as version %d"] =
+   "- ahorrado a la base de datos como versin %d";
+$locale["- version %d saved to database as version %d"] =
+   "- versin %d ahorrada a la base de datos como versin %d";
 $locale["... copied to %s"] =
    "... copia de [%s]";
 $locale["... not copied to %s"] =
@@ -46,24 +98,76 @@
    "1 da";
 $locale["<empty>"] =
    "<vaco>";
+$locale["<no matches>"] =
+   "<ningunos fsforos>";
 $locale["<none>"] =
    "<Ninguna>";
 $locale["<unknown>"] =
    "<desconocido>";
+$locale["ADMIN"] =
+   "ADMIN";
+$locale["ANON"] =
+   "ANN";
+$locale["Access"] =
+   "Acceso";
+$locale["Access for you is forbidden to %s."] =
+   "Tenga acceso para usted se prohbe %s.";
 $locale["Add Comment"] =
    "Agregue El Comentario";
 $locale["Add a Comment"] =
    "Agregue un comentario";
+$locale["Add this ACL"] =
+   "Agregue este ACL";
 $locale["AddCategory"] =
    "AgregueCategora";
+$locale["AddPageLink"] =
+   "AgregueElAcoplamientoDeLaPgina";
 $locale["AddPlugin"] =
    "AgreguePlugin";
+$locale["AddTemplate"] =
+   "AgregueLaPlantilla";
+$locale["Administrators"] =
+   "Administradores";
+$locale["All %s are listed below."] =
+   "Todos los %s se enumeran abajo.";
 $locale["AllPages"] =
    "TodasLasPginas";
 $locale["AllUsers"] =
    "TodasLasUsuarios";
+$locale["Allow / Deny"] =
+   "Permita/Niegue";
+$locale["Already deleted"] =
+   "Suprimido ya";
 $locale["An unnamed PhpWiki"] =
    "Un PhpWiki sin un nombre";
+$locale["Anonymous Users"] =
+   "Usuarios Annimos";
+$locale["Argument '%s' not declared by plugin."] =
+   "Parmetro '%s' no declarada por plugin.";
+$locale["Article"] =
+   "Artculo";
+$locale["Attempting to use the directory '%s' instead."] =
+   "El procurar utilizar el directorio '%s' en lugar de otro.";
+$locale["Authenticated Users"] =
+   "Usuarios Authenticados";
+$locale["Author will be logged as %s."] =
+   "Registrarn al autor como %s.";
+$locale["BOGO"] =
+   "BOGO";
+$locale["Back to the previous page."] =
+   "De nuevo a la pgina anterior.";
+$locale["BackLinks"] =
+   "AcoplamientosTraseros";
+$locale["BackLinks for %s"] =
+   "AcoplamientosTraseros por %s";
+$locale["Bad file type: %s"] =
+   "Mal tipo del archivo:  %s";
+$locale["Bogo Users"] =
+   "Usuarios Bogo";
+$locale["Bold text"] =
+   "Texto en negrilla";
+$locale["Browsing pages"] =
+   "Pginas el hojear";
 $locale["Calendar"] =
    "Calendario";
 $locale["CalendarList"] =
@@ -76,32 +180,58 @@
    "Cancelar";
 $locale["Cancel rating"] =
    "Cancelar";
-$locale["Category"] =
-   "Categora";
+$locale["Cannot create directory '%s'"] =
+   "No puede crear el directorio '%s'";
+$locale["Cannot open AUTH_GROUP_FILE %s"] =
+   "No puede abrir AUTH_GROUP_FILE %s";
 $locale["CategoryCategory"] =
    "CategoriaCategoria";
 $locale["CategoryGroup"] =
    "GrupoCategora";
+$locale["CategoryHomepage"] =
+   "CategoraHomepage";
 $locale["CategoryPage"] =
    "CategoraPgina";
 $locale["Change Password"] =
    "Change Contrasea";
+$locale["Change page attributes"] =
+   "Cambie las cualidades de la pgina";
+$locale["Check to add this ACL"] =
+   "Compruebe para agregar este ACL";
+$locale["Chown"] =
+   "Cambie a dueo";
+$locale["Click a button to get an example text"] =
+   "Chasque un botn para conseguir un texto del ejemplo";
+$locale["Click to de-/select all pages"] =
+   "Tecleo para de-/seleccionar todas las pginas";
 $locale["Click to reverse sort order"] =
    "Tecleo para invertir orden de la clase";
 $locale["Click to sort by %s"] =
    "Clase por %s";
 $locale["Close"] =
    "Cierre";
+$locale["Columns: %s."] =
+   "Columnas: %s.";
 $locale["Comment"] =
    "Commentario";
+$locale["Comment modified on %s by %s"] =
+   "Comentario modificado en %s por %s";
+$locale["Comments on %s by %s."] =
+   "Comentarios sobre %s por %s.";
 $locale["Complete."] =
    "Acabado.";
+$locale["Conflicting Edits!"] =
+   "El Estar en conflicto Corrige!";
 $locale["Content"] =
    "Contenido";
 $locale["Convert"] =
    "Convertido";
+$locale["Couldn't connect to %s"] =
+   "No poda conectar con %s";
 $locale["Create a Wiki page."] =
    "Cree una pgina de Wiki.";
+$locale["Create a new (sub)page"] =
+   "Cree una pgina (secundaria) nueva";
 $locale["Create: %s"] =
    "Cree: %s";
 $locale["CreatePage"] =
@@ -110,16 +240,46 @@
    "CreeToc";
 $locale["Created by CreatePage"] =
    "Cree par CreeLaPgina";
+$locale["Created directory '%s' for the page dump..."] =
+   "Directorio creado '%s' para la descarga de la pgina...";
+$locale["Creator"] =
+   "Creador";
 $locale["DB admin password:"] =
    "DB admin contrasea:";
 $locale["DB admin user:"] =
    "DB admin username:";
+$locale["Default InterWiki map file not loaded."] =
+   "Archivo del InterMapa de Wiki del defecto no cargado.";
+$locale["Default preferences will be used."] =
+   "Las preferencias del defecto sern utilizadas.";
+$locale["Del/+"] =
+   "-/+";
+$locale["Delete this ACL"] =
+   "Suprima este ACL";
 $locale["Describe %s here."] =
    "Describe %s aqu.";
+$locale["Description"] =
+   "Descripcin";
 $locale["Diff"] =
    "Diferencia";
 $locale["Diff: %s"] =
    "Diferencia de: %s";
+$locale["Differences between %s and %s of %s."] =
+   "Diferencias entre %s y %s de %s.";
+$locale["Discussion"] =
+   "Discusin";
+$locale["Download the page contents"] =
+   "Descargue el contenido de la pgina";
+$locale["Dump pages as XHTML"] =
+   "Pginas de la descarga como XHTML";
+$locale["Dump to directory"] =
+   "Descarga al directorio";
+$locale["Dumping Pages"] =
+   "Descargar Las Pginas";
+$locale["E-Mail address '%s' is not properly formatted"] =
+   "La direccin ' %s' del email no se ajusta a formato correctamente";
+$locale["E-Mail address '%s' is properly formatted"] =
+   "La direccin ' %s' del email se ajusta a formato correctamente";
 $locale["Edit"] =
    "Editar";
 $locale["Edit %s"] =
@@ -128,14 +288,36 @@
    "Corrija versin archivada";
 $locale["Edit this page"] =
    "Corrija esta pgina";
+$locale["Edit this page and all subpages"] =
+   "Corrija esta pgina y todas las pginas secundaria";
 $locale["Edit: %s"] =
    "Editar: %s";
 $locale["EditText"] =
    "Editar";
 $locale["Edited by: %s"] =
    "Editar: %s";
+$locale["Either %s is missing or DATABASE_TYPE != '%s'"] =
+   "Cualquier %s es que falta o DATABASE_TYPE != '%s'";
+$locale["Email Verification"] =
+   "Verificacin Del Email";
+$locale["Embedded image"] =
+   "Imagen encajada";
+$locale["Empty Preferences or format of UserPreferences cookie not recognised."] =
+   "Preferencias o formato vacas de la galleta de UsuarioPreferencias no reconocido.";
+$locale["Empty link to: %s"] =
+   "Acoplamiento vaco a: %s";
 $locale["Empty pagename!"] =
    "Escriba un nombre de pgina!";
+$locale["Every"] =
+   "Cada";
+$locale["External Links"] =
+   "Acoplamientos Externos";
+$locale["External link (remember http:// prefix)"] =
+   "Acoplamiento externo (recuerde http://  prefijo)";
+$locale["External links contain blocked domains:"] =
+   "Los acoplamientos externos contienen dominios bloqueados:";
+$locale["FORBIDDEN"] =
+   "PROHIBIDO";
 $locale["Fatal PhpWiki Error"] =
    "Error Fatal De PhpWiki";
 $locale["FindPage"] =
@@ -144,6 +326,8 @@
    "Primera";
 $locale["Full text search results for '%s'"] =
    "Resultados de la bsqueda en el texto completo para '%s'";
+$locale["FullDump"] =
+   "DescargaCompleta";
 $locale["FullTextSearch"] =
    "BsquedaDelTexto";
 $locale["Given password ignored."] =
@@ -152,10 +336,20 @@
    "Aceptar";
 $locale["GoodStyle"] =
    "BuenEstilo";
+$locale["Grant"] =
+   "Concesin";
+$locale["Group %s does not exist"] =
+   "El grupo %s no existe";
+$locale["Group page '%s' does not exist"] =
+   "La pgina '%s' del grupo no existe";
+$locale["Group/User"] =
+   "Grupo/Usuario";
 $locale["H"] =
    "Al";
 $locale["HasHomePage"] =
    "TienePginaPrincipal";
+$locale["Headline text"] =
+   "Texto del ttulo";
 $locale["Height"] =
    "Altura";
 $locale["Hits"] =
@@ -168,6 +362,18 @@
    "PginaPrincipalAlias";
 $locale["Horizontal line"] =
    "Linea horizontal";
+$locale["I'm sorry, there is no such page as %s."] =
+   "Estoy apesadumbrado, all no soy ninguna pgina tal como %s.";
+$locale["I'm sorry.  Version %d of %s is not in the database."] =
+   "Estoy apesadumbrado.  La versin %d de %s no est en la base de datos.";
+$locale["Ignore wiki formatting"] =
+   "No haga caso del formato del wiki";
+$locale["Illegal chars %s removed"] =
+   "Los carbones ilegales %s quitaron";
+$locale["Image map expired. Reload wiki page to recreate its html part."] =
+   "El mapa de imagen expir.  Recargue la pgina del wiki para reconstruir su pieza del HTML.";
+$locale["In the time since you started editing this page, another user has saved a new version of it."] =
+   "En el tiempo desde que usted comenz a corregir esta pgina, otro usuario ha ahorrado una nueva versin de ella.";
 $locale["Include of '%s' failed."] =
    "Insercin de '%s' fall.";
 $locale["Included from %s"] =
@@ -180,22 +386,38 @@
    "Relleno";
 $locale["Insert Categories (double-click)"] =
    "Relleno Categoras (doble-tecleo)";
+$locale["Insert PageLink (double-click)"] =
+   "Inserte el AcoplamientoDeLaPgina (doble-tecleo)";
 $locale["Insert Plugin (double-click)"] =
    "Relleno Plugin (doble-tecleo)";
+$locale["Insert Template (double-click)"] =
+   "Inserte la plantilla (doble-tecleo)";
+$locale["Insert non-formatted text here"] =
+   "Inserte el texto sin formatear aqu";
 $locale["Insufficient permissions."] =
    "Permisos escasos.";
 $locale["InterWiki"] =
    "InterWiki";
+$locale["InterWikiMap"] =
+   "InterMapaDeWiki";
 $locale["InterWikiSearch"] =
    "InterWikiBsqueda";
+$locale["Invalid [] syntax ignored"] =
+   "[] el sintaxis invlido no hizo caso";
 $locale["Invalid password or userid."] =
    "Contrasea o userid invlida.";
 $locale["Invalid password."] =
    "Contrasea invlido.";
+$locale["Invalid username '%s' for LDAP Auth"] =
+   "Username invlido ' %s' para LDAP Auth";
 $locale["Invalid username."] =
    "Username invlido.";
+$locale["Italic text"] =
+   "Texto del itlico";
 $locale["Last"] =
    "Final";
+$locale["Last Author"] =
+   "Autor Pasado";
 $locale["Last Modified"] =
    "modificado por ltima vez";
 $locale["Last Summary"] =
@@ -204,10 +426,34 @@
    "Editada por ltima vez %s.";
 $locale["Last edited on %s"] =
    "Editada por ltima vez %s.";
+$locale["LatestSnapshot"] =
+   "La Foto Ms ltima";
+$locale["Level 1 headline"] =
+   "Ttulo del nivel 1";
+$locale["Link to page"] =
+   "Acoplamiento a la pgina";
+$locale["List all pages which link to %s."] =
+   "Enumere todas las pginas que se liguen a %s.";
 $locale["List the most popular pages."] =
    "Las pginas ms populares.";
+$locale["List the user's ratings."] =
+   "Enumere los grados del usuario.";
+$locale["List this page and all subpages"] =
+   "Enumere esta pgina y todas las pginas secundaria";
 $locale["ListPages"] =
    "ListaPginas";
+$locale["ListSubpages"] =
+   "ListaPginasSecundaria";
+$locale["Load File"] =
+   "Archivo De la Carga";
+$locale["LoadDump"] =
+   "CargaDescarga";
+$locale["Loading '%s'"] =
+   "'%s' que carga";
+$locale["Loading InterWikiMap from external file %s."] =
+   "Cargamento InterMapaDeWiki del archivo externo %s.";
+$locale["Loading up virgin wiki"] =
+   "El cargar encima de wiki virginal";
 $locale["Lock"] =
    "Bloqueada";
 $locale["Lock Page"] =
@@ -215,11 +461,23 @@
 $locale["Locked"] =
    "Bloqueada";
 $locale["Locking pages"] =
-   "Bloquear Pgina";
+   "Bloquear pginas";
+$locale["MIME file %s"] =
+   "Archivo %s del MIME";
+$locale["Members:"] =
+   "Miembros:";
 $locale["Merge Edit"] =
    "Fusin Editar";
 $locale["Merge and Edit: %s"] =
    "Fusin y Editar: %s";
+$locale["Message"] =
+   "Mensaje";
+$locale["Method '%s' not implemented in this GROUP_METHOD %s"] =
+   "Mtodo ' %s' no puesto en ejecucio'n en este GROUP_METHOD %s";
+$locale["Minor Edit"] =
+   "El Menor de edad Corrige";
+$locale["Missing PagePermission:"] =
+   "Permiso que falta de la pgina:";
 $locale["ModeratedPage"] =
    "PginaModerada";
 $locale["Modern"] =
@@ -230,6 +488,8 @@
    "MasPopulares";
 $locale["Name"] =
    "Nombre de la Pgina";
+$locale["Never edited"] =
+   "Nunca corregido";
 $locale["New page"] =
    "Pgina nueva";
 $locale["New password"] =
@@ -240,18 +500,48 @@
    "Siguiente";
 $locale["Next Month"] =
    "El Mes Prximo";
+$locale["No LDAP in this PHP version"] =
+   "Ningn LDAP en esta versin de PHP";
+$locale["No changes found"] =
+   "Ningunos cambios encontrados";
+$locale["No changes."] =
+   "Ningunos cambios.";
+$locale["No comments found"] =
+   "Ningunos comentarios encontrados";
+$locale["No or not enough GROUP_DB SQL statements defined"] =
+   "No o no bastantes declaraciones de GROUP_DB SQL defini";
+$locale["No or unsupported GROUP_METHOD defined"] =
+   "No o GROUP_METHOD sin apoyo definido";
+$locale["No uploaded file to upload?"] =
+   "Ningn archivo uploaded a upload?";
 $locale["None"] =
    "Ninguna";
 $locale["Note:"] =
    "Nota:";
+$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] =
+   "Viejo UserPage %s sin la contrasea almacenada puesta al da con contrasea vaca. Fije una contrasea en su UsuarioPreferencias.";
 $locale["OldTextFormattingRules"] =
    "ViejoReglasDeFormatoDeTexto";
 $locale["Older page:"] =
    "Pgina ms viejo:";
+$locale["Oops! Revision %s of %s seems to have been deleted!"] =
+   "Oops! La revisin %s de %s se parece haber sido suprimida!";
+$locale["Operation undone"] =
+   "Operacin deshecha";
+$locale["Optimizing database"] =
+   "Base de datos ptima";
 $locale["OrphanedPages"] =
    "BuscarPgina";
+$locale["Other diffs:"] =
+   "Otros diffs:";
 $locale["Other version"] =
    "Altro versin";
+$locale["Overwrite All"] =
+   "Sobreescriba Todos";
+$locale["Owner"] =
+   "Dueo";
+$locale["Owner: %s"] =
+   "Dueo: %s";
 $locale["Page %s not found."] =
    "%s: Pgina no encontrado.";
 $locale["Page Content: "] =
@@ -262,12 +552,24 @@
    "Nombre de la Pgina";
 $locale["Page Version:"] =
    "Versin:";
+$locale["Page change"] =
+   "Cambio de la pgina";
 $locale["Page now locked."] =
    "Pgina bloqueada.";
 $locale["Page now unlocked."] =
    "Pgina desbloquear.";
 $locale["Page removed %s"] =
    "Pgina borrar %s";
+$locale["Page rename %s to %s"] =
+   "La pgina retitula %s a %s";
+$locale["Page successfully updated."] =
+   "Pgina actualizada con xito.";
+$locale["PageChange Notification Error: Couldn't send %s to %s"] =
+   "Error De la Notificacin Del Cambio De la Pgina: No poda enviar %s a %s";
+$locale["PageChange Notification of %s sent to %s"] =
+   "Pagine la notificacin del cambio de %s enviado a %s";
+$locale["PageDump"] =
+   "DescargeDeLaPgina";
 $locale["PageInfo"] =
    "InformacionDeLaPagina";
 $locale["Password cannot be changed."] =
@@ -278,6 +580,22 @@
    "Contrasea non actualizado.";
 $locale["Password:"] =
    "Contrasea:";
+$locale["PersonalPage login method:"] =
+   "Mtodo de la conexin de PersonalPage:";
+$locale["PhpWikiAdministration"] =
+   "AdministracinDePhpWiki";
+$locale["Please check it through before saving."] =
+   "Comprubelo por favor a travs antes de ahorrar.";
+$locale["Please contact your PhpWiki administrator for assistance."] =
+   "Entre en contacto con por favor a su administrador de PhpWiki para la ayuda.";
+$locale["Please ensure that %s is writable, or redefine %s in config/config.ini."] =
+   "Asegrese por favor de que %s sea escribible, o redefina %s en config/config.ini.";
+$locale["Please set ENCRYPTED_PASSWD to false in config/config.ini and probably change ADMIN_PASSWD."] =
+   "En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y probablemente cambio ADMIN_PASSWD.";
+$locale["Please set ENCRYPTED_PASSWD to true in config/config.ini."] =
+   "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini.";
+$locale["Please set a password in UserPreferences."] =
+   "Fije por favor una contrasea en UsuarioPreferencias.";
 $locale["Plugin %s disabled."] =
    "Plugin '%s' lisiado.";
 $locale["Plugin %s failed."] =
@@ -290,6 +608,10 @@
    "Previsualizar";
 $locale["Previous"] =
    "Anterior";
+$locale["Previous Author"] =
+   "Autor Anterior";
+$locale["Previous Major Revision"] =
+   "Revisin Importante Anterior";
 $locale["Previous Month"] =
    "Mes Anterior";
 $locale["Previous Revision"] =
@@ -300,12 +622,20 @@
    "Busqueda rpida";
 $locale["RandomPage"] =
    "PginaAlAzar";
+$locale["Recent Edits"] =
+   "Reciente Corrige";
 $locale["RecentChanges"] =
    "CambiosRecientes";
+$locale["RecentComments"] =
+   "ComentariosRecientes";
+$locale["RecentEdits"] =
+   "RecienteCorrige";
 $locale["References"] =
    "Referencias";
 $locale["Related Changes"] =
    "Cambios Relacionados";
+$locale["Related Links"] =
+   "Acoplamientos Relacionados";
 $locale["RelatedChanges"] =
    "CambiosRelacionados";
 $locale["Remove"] =
@@ -319,7 +649,19 @@
 $locale["Removed page '%s' successfully."] =
    "Pgina '%s' borrada satisfactoriamente.";
 $locale["Removing pages"] =
-   "Borrar pgina";
+   "Borrar pginas";
+$locale["Rename"] =
+   "Retitule";
+$locale["Replace with"] =
+   "Substituya por";
+$locale["Restore Anyway"] =
+   "Restore de todos modos";
+$locale["Return to %s"] =
+   "Vuelva a %s";
+$locale["Revert"] =
+   "Invierta";
+$locale["Revision Not Found"] =
+   "Revisin No encontrada";
 $locale["SandBox"] =
    "CajaDeArena";
 $locale["Save"] =
@@ -330,26 +672,66 @@
    "Ahorrando esta pgina sobreescribir la versin actual.";
 $locale["Search"] =
    "Buscar";
+$locale["Search & Replace"] =
+   "Busque Y Substituya";
 $locale["See %s tips for editing."] =
    "%s tips para editar.";
 $locale["Select"] =
    "Selecto";
+$locale["Serialized file %s"] =
+   "Archivo serializado %s";
 $locale["Set Password"] =
    "Set Contrasea";
+$locale["Set USE_DB_SESSION to false."] =
+   "Fije USE_DB_SESSION a falso.";
+$locale["SetAcl"] =
+   "Fije El Acl";
+$locale["Show all changes for:"] =
+   "Demuestre todos los cambios para:";
+$locale["Show changes for:"] =
+   "Demuestre los cambios para:";
+$locale["Show minor edits for:"] =
+   "El menor de edad de la demostracin corrige para:";
+$locale["Sign In"] =
+   "Muestra Adentro";
+$locale["Sign Out"] =
+   "Registro Hacia fuera";
+$locale["Signed Users"] =
+   "Usuarios Firmados";
 $locale["Size"] =
    "Tamao";
 $locale["Size:"] =
    "Tamao:";
+$locale["Skipped."] =
+   "Saltado.";
+$locale["Skipping"] =
+   "El saltar";
+$locale["Some internal editing error"] =
+   "Un cierto error interno el corregir";
+$locale["Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save."] =
+   "Algunos de los cambios no podan ser combinados automticamente. Busque por favor las secciones que comienzan con '%s', y terminando con '%s'. Usted necesitar corregir esas secciones a mano antes de que usted chasque excepto.";
 $locale["Someone has edited the page!"] =
    "Alguien ha modificado la pgina!";
 $locale["Sorry for the inconvenience."] =
    "Disculpe la inconveniencia.";
+$locale["Sorry, this page is not in the database."] =
+   "Apesadumbrada, esta pgina no est en la base de datos.";
 $locale["Sort by %s"] =
    "Clase por %s";
+$locale["Spam Prevention"] =
+   "Prevencin Del Spam";
+$locale["SpamAssassin reports: "] =
+   "Informes de SpamAssassin: ";
 $locale["String \"%s\" not found."] =
    "Secuencia \"%s\" no encontrado.";
+$locale["SubPages of %s:"] =
+   "PginasSecundaria de %s:";
+$locale["Substring \"%s\" found %s times. Replace with \"%s\"?"] =
+   "Subsecuencia \"%s\" tiempos encontrados de %s.  Substituya por \"%s\"?";
 $locale["Summary"] =
    "Comentarios";
+$locale["Supported handlers are: %s"] =
+   "Los tratantes apoyados son: %s";
 $locale["Synopsis"] =
    "Sinopsis";
 $locale["TextFormattingRules"] =
@@ -360,8 +742,46 @@
    "Gracias!";
 $locale["The %d most popular pages of this wiki:"] =
    "Las %d pginas ms populares de este wiki:";
+$locale["The %d most recent %s are listed below."] =
+   "Los %d la mayora del %s reciente se enumeran abajo.";
+$locale["The %d most recent %s during the past %s days are listed below."] =
+   "Los %d la mayora del %s reciente durante los ltimos das de %s se enumeran abajo.";
+$locale["The %d most recent %s during the past day are listed below."] =
+   "Los %d la mayora del %s reciente durante el ltimo da se enumeran abajo.";
+$locale["The %d oldest %s are listed below."] =
+   "Los %d el %s ms viejo se enumeran abajo.";
+$locale["The %d oldest %s during the past %s days are listed below."] =
+   "Los %d el %s ms viejo durante los ltimos das de %s se enumeran abajo.";
+$locale["The %d oldest %s during the past day are listed below."] =
+   "Los %d el %s ms viejo durante el ltimo da se enumeran abajo.";
+$locale["The %s files are in the %s directory. Please read the INSTALL file and move the database to a permanent location or risk losing all the pages!"] =
+   "Los archivos de %s estn en el directorio de %s. Lea por favor el archivo de la INSTALACIN y mueva la base de datos a una localizacin permanente o arriesgela el perder de todas las pginas!";
+$locale["The DBA handler %s is unsupported!"] =
+   "El tratante %s del DBA est sin apoyo!";
+$locale["The PhpWiki access log file"] =
+   "El fichero de diario del acceso de PhpWiki";
+$locale["The PhpWiki programming team"] =
+   "El equipo de programacin de PhpWiki";
+$locale["The crypt function is not available in this version of PHP."] =
+   "La funcin de la cripta no est disponible en esta versin de PHP.";
+$locale["The length of the password is shorter than the system policy allows."] =
+   "La longitud de la contrasea es ms corta que la poltica del sistema permite.";
+$locale["The length of the stored password is shorter than the system policy allows. Sorry, you cannot login.\n You have to ask the System Administrator to reset your password."] =
+   "La longitud de la contrasea almacenada es ms corta que la poltica del sistema permite. Apesadumbrado, usted no puede conexin.\n Usted tiene que pedir que el administrador de sistema reajuste su contrasea.";
+$locale["The most recent %s during the past %s days are listed below."] =
+   "Los %s ms recientes durante los ltimos das de %s se enumeran abajo.";
+$locale["The most recent %s during the past day are listed below."] =
+   "Los %s ms recientes durante el ltimo da se enumeran abajo.";
+$locale["The session.save_path directory"] =
+   "El directorio de session.save_path";
+$locale["There is no image creation data available to id '%s'. Please reload referring page."] =
+   "No hay datos de la creacin de la imagen disponibles para la identificacin '%s '. Por favor recarga que refiere la pgina.";
+$locale["This action requires moderator approval. Please be patient."] =
+   "Esta accin requiere la aprobacin del asesor.  Sea por favor paciente.";
 $locale["This is a minor change."] =
    "Esto es un cambio pequeo.";
+$locale["This page edit seems to contain spam and was therefore not saved."] =
+   "Esta pgina corrige se parece contener el Spam y por lo tanto no fue ahorrada.";
 $locale["This page has been locked by the administrator and cannot be edited."] =
    "Esta pgina ha sido bloqueada por el administrador y no puede ser editada.";
 $locale["This page has been locked by the administrator so your changes can not be saved."] =
@@ -376,20 +796,82 @@
    "BsquedaDeTtulos";
 $locale["Today"] =
    "Hoy";
-$locale["Topic"] =
-   "Asunto";
+$locale["Too many external links."] =
+   "Tambin muchos acoplamientos externos.";
+$locale["Top & bottom toolbars"] =
+   "Toolbars superiores y inferiores";
+$locale["Type word above:"] =
+   "Mecanografe la palabra arriba:";
+$locale["Typed in verification word mismatch ... are you a bot?"] =
+   "Mecanografan en la unin mal hecha de la palabra de la verificacin... le un BOT?";
+$locale["UNOBTAINABLE"] =
+   "INALCANZABLE";
+$locale["USER"] =
+   "USUARIO";
+$locale["Unable to bind LDAP server %s using %s %s"] =
+   "Incapaz atar el servidor %s de LDAP usando %s %s";
+$locale["Unable to connect to IMAP server "] =
+   "Incapaz conectar con el IMAP el servidor ";
+$locale["Unable to connect to LDAP server %s"] =
+   "Incapaz conectar con el servidor %s de LDAP";
+$locale["Unable to load: %s"] =
+   "Incapaz cargar:  %s";
+$locale["Undefined method %s for special group %s"] =
+   "Mtodo indefinido %s para el grupo especial %s";
+$locale["Undo"] =
+   "Deshaga";
+$locale["Undo Search & Replace"] =
+   "Deshaga La Bsqueda Y Substityala";
+$locale["Undo disabled"] =
+   "Deshaga lisiado";
+$locale["Unexpected EOF in zip file"] =
+   "EOF inesperado en archivo del zip";
+$locale["UnfoldSubpages"] =
+   "IncluyaPginasSecundaria";
+$locale["UnfoldSubpagesPlugin"] =
+   "IncluyaPginasSecundariaPlugin";
+$locale["Unknown special group '%s'"] =
+   "Grupo especial desconocido '%s'";
 $locale["Unlock"] =
    "Desbloquear";
 $locale["Unlock Page"] =
    "Desbloquear Pgina";
 $locale["Unlocking pages"] =
-   "Desbloquear Pgina";
+   "Desbloquear pginas";
+$locale["Unsupported ACL access type %s ignored."] =
+   "Tipo sin apoyo %s del acceso del ACL no hecho caso.";
+$locale["Unsupported argument: %s=%s"] =
+   "Discusin sin apoyo: %s=%s";
+$locale["UpLoad"] =
+   "UpLoad";
+$locale["UpLoadPlugin"] =
+   "UpLoadPlugin";
+$locale["Upgrade"] =
+   "Mejora";
+$locale["Upload File"] =
+   "Archivo Del Upload";
+$locale["Upload error: file only partially recieved"] =
+   "Error del upload: el archivo recieved solamente parcialmente";
+$locale["Upload error: file too big"] =
+   "Error del upload: archivo demasiado grande";
+$locale["Upload error: no file selected"] =
+   "Error del upload: ningn archivo seleccionado";
+$locale["Upload error: unknown error #"] =
+   "Error del upload: error desconocido #";
+$locale["Uploading %s"] =
+   "%s uploading";
 $locale["User preferences for user '%s':"] =
    "Preferencias por usuario '%s':";
 $locale["User: %s"] =
    "Usuario: %s";
 $locale["UserPreferences"] =
    "UsuarioPreferencias";
+$locale["UserRatings"] =
+   "GradosUsuario.";
+$locale["Users will not be able to sign in."] =
+   "Los usuarios no podrn firmar adentro.";
+$locale["Using directory '%s'"] =
+   "Usando el directorio '%s'";
 $locale["Version"] =
    "Versin";
 $locale["Version %d"] =
@@ -397,57 +879,195 @@
 $locale["Version %s"] =
    "Versin %s";
 $locale["Version %s, saved %s"] =
-   "versin %s de %s";
+   "versin %s, %s ahorrado";
 $locale["Version %s, saved on %s"] =
    "versin %s de %s";
 $locale["Versions are identical"] =
    "Las versiones son idnticas";
 $locale["View Source"] =
    "Vea la fuente";
+$locale["View Source: %s"] =
+   "Fuente De la Visin: %s";
 $locale["View the current version"] =
    "Vea la versin actual";
+$locale["View this page and all subpages"] =
+   "Opinin esta pgina y todas las pginas secundaria";
 $locale["W"] =
    "An";
+$locale["WARNING: InterWikiMap page is unlocked, so not using those links."] =
+   "ADVERTENCIA: Se abre la pgina de InterMapaDeWiki, tan no usando esos acoplamientos.";
+$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] =
+   "Recepcin a %s!\nSe verifica y ser utilizada su cuenta del email\npara enviar notificaciones del cambio de la pgina.\nVea %s";
 $locale["Width"] =
    "Anchura";
 $locale["Wiki Name"] =
    "Nombre de la Wiki";
+$locale["WikiDB::renamePage() not yet implemented for this backend"] =
+   "WikiDB::renamePage() no todava puesto en ejecucio'n para este backend";
+$locale["Yes"] =
+   "Si";
+$locale["You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config.ini"] =
+   "Usted se olvid de fijar ENCRYPTED_PASSWD para verdad. Ponga al da por favor su config/config.ini";
+$locale["You must be an administrator to %s."] =
+   "Usted debe ser administrador %s.";
+$locale["You must log in to %s."] =
+   "Usted debe abrirse una sesin %s.";
+$locale["You must sign in to %s."] =
+   "Usted debe firmar adentro %s.";
+$locale["You must specify a directory to dump to"] =
+   "Usted debe especificar un directorio para descargar a";
+$locale["You must wait for moderator approval."] =
+   "Usted debe esperar la aprobacin del asesor.";
+$locale["You searched for: "] =
+   "Usted busc para: ";
+$locale["You stored an empty password in your '%s' page."] =
+   "Usted almacen una contrasea vaca en su pgina de '%s'.";
+$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] =
+   "Su DB '%s' backend de WikiDB no se puede utilizar para DbSession.";
+$locale["Your access permissions are only for a BogoUser."] =
+   "Sus permisos de acceso estn solamente para un BogoUser.";
+$locale["Your are probably trying to edit/create an invalid version of this page."] =
+   "Su estn intentando corregir/crean probablemente una versin invlida de esta pgina.";
 $locale["Your careful attention to detail is much appreciated."] =
    "Se agradece una cuidadosa atencin a los detalles.";
+$locale["Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below."] =
+   "Sus cambios no se pueden ahorrar como son, desde hacer as que sobreescribiran los cambios del otro autor. As pues, se han combinado sus cambios y los del otro autor. El resultado se demuestra abajo.";
+$locale["Your home page has not been created yet so your preferences cannot not be saved."] =
+   "Su Home Page no se ha creado todava as que sus preferencias no pueden ser ahorradas.";
 $locale["Your home page is locked so your preferences cannot not be saved."] =
    "Su Home Page ha sido bloqueada as que sus preferencias no pueden ser ahorradas.";
+$locale["Your signature"] =
+   "Su firma";
 $locale["Your version"] =
    "Versin actual:";
+$locale["ZIP files of database"] =
+   "Archivos del ZIP de la base de datos";
+$locale["[%d] See [%s]"] =
+   "[%d] Vea [%s]";
+$locale["access this wiki via SOAP"] =
+   "para tener acceso a este wiki va SOAP";
+$locale["access this wiki via XML-RPC"] =
+   "para tener acceso a este wiki va Xml-RPC";
+$locale["add "] =
+   "agregue ";
+$locale["authenticated"] =
+   "authenticado";
 $locale["by %s"] =
    "por %s";
 $locale["cached pagedata:"] =
    "Pgina archivada:";
+$locale["content is identical to current version %d - no new revision created"] =
+   "el contenido es idntico a la versin actual %d - ninguna nueva revisin creada";
+$locale["couldn't move %s to %s"] =
+   "no poda mover %s a %s";
 $locale["couldn't open file '%s' for writing"] =
    "Error al escribir la pgina '%s'";
+$locale["create this page"] =
+   "para crear esta pgina";
 $locale["current version"] =
    "versin actual";
 $locale["days"] =
    "dias";
+$locale["diff this page"] =
+   "para diff esta pgina";
+$locale["download a html zip dump from this wiki"] =
+   "para descargar un HTML relampague la descarga de este wiki";
+$locale["download a zip dump from this wiki"] =
+   "para descargar un cierre relmpago descargue de este wiki";
+$locale["dump html pages"] =
+   "para las pginas del HTML de la descarga";
+$locale["dump serial pages"] =
+   "para las pginas del cuento por entregas de la descarga";
+$locale["edit this page"] =
+   "para corregir esta pgina";
+$locale["fixed"] =
+   "fijo";
+$locale["from %s"] =
+   "de %s";
+$locale["has edit conflicts - overwriting anyway"] =
+   "tiene corregir conflictos - sobreescribiendo de todos modos";
+$locale["has edit conflicts - skipped"] =
+   "tiene corregir los conflictos - saltados";
 $locale["hours"] =
    "horas";
+$locale["latest comment by "] =
+   "el comentario ms ltimo cerca ";
+$locale["load files into this wiki"] =
+   "para cargue los archivos en este wiki";
+$locale["lock this page"] =
+   "para trabar esta pgina";
 $locale["locked"] =
    "bloqueada";
+$locale["minor"] =
+   "de menor importancia";
 $locale["minutes"] =
    "minutas";
+$locale["missing required version argument"] =
+   "parmetro requerido de la versin que falta";
+$locale["mode"] =
+   "modo";
+$locale["n/a"] =
+   "n/a";
+$locale["name"] =
+   "Nombre";
+$locale["no page content"] =
+   "ningn contenido de la pgina";
+$locale["not authenticated"] =
+   "non authenticado";
+$locale["optional label | PageName"] =
+   "etiqueta opcional | NombreDePgina";
+$locale["optional label | http://www.example.com"] =
+   "etiqueta opcional | http://www.example.com";
+$locale["plain file %s"] =
+   "archivo llano %s";
+$locale["predecessor to the previous major change"] =
+   "precursor al cambio principal anterior";
 $locale["previous revision"] =
    "versin archivada";
+$locale["remove this page"] =
+   "para quitar esta pgina";
+$locale["renamed from %s"] =
+   "retitulado de %s";
+$locale["revert to a previous version of this page"] =
+   "para invertir a una versin anterior de esta pgina";
+$locale["revert to version %d"] =
+   "invierta a la versin %d";
+$locale["revision by previous author"] =
+   "revisin del autor anterior";
+$locale["same version page"] =
+   "la misma pgina de la versin";
+$locale["saved as "] =
+   "ahorrado como ";
+$locale["saved as %s"] =
+   "ahorrado como %s";
 $locale["the file '%s'"] =
    "el archivo %s";
+$locale["the session.save_path directory '%s'"] =
+   "el directorio '%s' de session.save_path";
 $locale["today"] =
    "hoy";
+$locale["too long"] =
+   "demasiado de largo";
+$locale["trailing cruft in plugin args: '%s'"] =
+   "absurdo que se arrastra en parmetros plugin: '%s'";
+$locale["unknown color %s ignored"] =
+   "el color desconocido %s no hizo caso";
 $locale["unlock this page"] =
-   "Desbloquear Pgina";
+   "para desbloquear pgina";
+$locale["upload a zip dump"] =
+   "para upload una descarga del cierre relmpago";
 $locale["users"] =
    "usuarios";
+$locale["verify the current action"] =
+   "para verificar la accin actual";
 $locale["version %d"] =
    "versin %d";
 $locale["version %s"] =
    "versin %s";
+$locale["view the source of this page"] =
+   "para visin la fuente de esta pgina";
+$locale["view this page"] =
+   "para visin esta pgina";
 $locale["weeks"] =
    "semanas";
 $locale["yesterday"] =
Files 11p1/locale/fr/LC_MESSAGES/phpwiki.mo and 12p3/locale/fr/LC_MESSAGES/phpwiki.mo differ
diff -ruN 11p1/locale/fr/LC_MESSAGES/phpwiki.php 12p3/locale/fr/LC_MESSAGES/phpwiki.php
--- 11p1/locale/fr/LC_MESSAGES/phpwiki.php	2005-09-18 07:12:29.000000000 -0500
+++ 12p3/locale/fr/LC_MESSAGES/phpwiki.php	2006-06-18 06:19:32.000000000 -0500
@@ -236,8 +236,6 @@
    "ADMIN";
 $locale["ANON"] =
    "ANONYME";
-$locale["AUTH_GROUP_FILE not defined"] =
-   "AUTH_GROUP_FILE non dfini";
 $locale["About"] =
    " propos de";
 $locale["Access"] =
@@ -330,6 +328,8 @@
    "tes-vous certain de renommer dfinitivement les pages slectionnes ?";
 $locale["Are you sure you want to permanently search & replace text in the selected files?"] =
    "Etes-vous sur de vouloir rechercher et remplacer dans les fichiers slectionnes ?";
+$locale["Argument '%s' not declared by plugin."] =
+   "argument '%s' non dclar par le plugin.";
 $locale["Arguments"] =
    "Arguments";
 $locale["Attempting to use the directory '%s' instead."] =
@@ -420,8 +420,6 @@
    "Impossible d'ouvrir AUTH_GROUP_FILE %s";
 $locale["Case insensitive?"] =
    "Sensible  la casse ?";
-$locale["Category"] =
-   "Catgorie";
 $locale["CategoryCategory"] =
    "CatgorieCatgorie";
 $locale["CategoryGroup"] =
@@ -446,7 +444,7 @@
    "Cochez une bote puis %s.";
 $locale["Check any two boxes to compare revisions."] =
    "Cochez une des botes pour comparer les rvisions.";
-$locale["Check to add this Acl"] =
+$locale["Check to add this ACL"] =
    "Vrifier pour ajouter cette ACL";
 $locale["Chmod"] =
    "Chmod";
@@ -754,6 +752,8 @@
    "Erreur Fatale de PhpWiki";
 $locale["File successfully uploaded."] =
    "Fichier transfr avec succs.";
+$locale["FileInfo"] =
+   "FichierInfo";
 $locale["Files with extension %s are not allowed."] =
    "%s: extension interdit.";
 $locale["FindPage"] =
@@ -946,8 +946,6 @@
    "JabberPresence";
 $locale["Keep up to %d major edits, but keep them no longer than %d days."] =
    "Garder jusqu' %d dition majeures, mais pas plus que %d jours.";
-$locale["LDAP_AUTH_HOST not defined"] =
-   "LDAP_AUTH_HOST non dfini";
 $locale["Language"] =
    "Langage";
 $locale["Last"] =
@@ -1656,8 +1654,6 @@
    "Dconnexion";
 $locale["Sign in as:"] =
    "Se connecter en tant que :";
-$locale["Sign in:"] =
-   "S'enregistrer :";
 $locale["SignIn"] =
    "Connexion";
 $locale["SignOut"] =
@@ -1868,8 +1864,6 @@
    "Trop de liens exterieurs.";
 $locale["Top & bottom toolbars"] =
    "Barres d'outils en haut et en bas";
-$locale["Topic"] =
-   "Sujet";
 $locale["Total %d plugins: "] =
    "%d plugins au total : ";
 $locale["Total of %d languages: "] =
@@ -1902,6 +1896,8 @@
    "INACCESSIBLE";
 $locale["USER"] =
    "UTILISATEUR";
+$locale["Unable to bind LDAP server %s using %s %s"] =
+   "Impossible de se connecter au serveur LDAP %s, avec %s %s";
 $locale["Unable to connect to IMAP server "] =
    "Impossible de se connecter au serveur IMAP ";
 $locale["Unable to connect to LDAP server %s"] =
@@ -1936,6 +1932,8 @@
    "Dverrouiller les pages";
 $locale["Unsupported ACL access type %s ignored."] =
    "Le type d'accs ACL %s n'est pas support. -- Ignor.";
+$locale["Unsupported argument: %s=%s"] =
+   "Argument %s=%s n'est pas support !";
 $locale["Up"] =
    "Haut";
 $locale["UpLoad"] =
@@ -2194,8 +2192,6 @@
    "toujours ignorer la page d'accueil.";
 $locale["argument '%s' not declared by plugin"] =
    "argument '%s' non dclar par le plugin";
-$locale["argument '%s' not declared by plugin."] =
-   "argument '%s' non dclar par le plugin.";
 $locale["authenticated"] =
    "authentifi";
 $locale["blog"] =
@@ -2250,12 +2246,6 @@
    "version actuelle";
 $locale["days"] =
    "jours";
-$locale["db backend:"] =
-   "db backend:";
-$locale["db type:"] =
-   "type de bd :";
-$locale["dba handler:"] =
-   "gestionnaire dba:";
 $locale["default page permission"] =
    "Permission de page par dfaut";
 $locale["diff"] =
@@ -2264,8 +2254,6 @@
    "diff de cette page";
 $locale["download a zip dump from this wiki"] =
    "tlcharger une sauvegarde compresse de ce wiki";
-$locale["download an html zip dump from this wiki"] =
-   "tlcharger une sauvegarde HTML compresse de ce wiki";
 $locale["dump html pages"] =
    "rcupration des pages HTML";
 $locale["dump serial pages"] =
@@ -2292,6 +2280,8 @@
    "Page d'accueil";
 $locale["invalid %s ignored"] =
    "%s non valable ignor";
+$locale["invalid argument %s"] =
+   "Argument non valable %s";
 $locale["invidual page permission"] =
    "Permission de page individuelle";
 $locale["latest comment by "] =
@@ -2390,8 +2380,6 @@
    "le fichier %s";
 $locale["the session.save_path directory '%s'"] =
    "le rpertoire 'session.save_path' '%s'";
-$locale["timeout:"] =
-   "temps mort :";
 $locale["to"] =
    "";
 $locale["today"] =
Files 11p1/locale/it/LC_MESSAGES/phpwiki.mo and 12p3/locale/it/LC_MESSAGES/phpwiki.mo differ
diff -ruN 11p1/locale/it/LC_MESSAGES/phpwiki.php 12p3/locale/it/LC_MESSAGES/phpwiki.php
--- 11p1/locale/it/LC_MESSAGES/phpwiki.php	2005-09-18 07:12:30.000000000 -0500
+++ 12p3/locale/it/LC_MESSAGES/phpwiki.php	2006-06-18 06:19:35.000000000 -0500
@@ -1,5 +1,7 @@
 <?php
 
+$locale[" Sorry, cannot merge."] =
+   " Spiacente, non pu fondersi.";
 $locale["%4d  %s\n"] =
    "%4d  %s\n";
 $locale["%d best incoming links: "] =
@@ -16,6 +18,10 @@
    "%s byte";
 $locale["%s days"] =
    "%s giorni";
+$locale["%s is listed at %s"] =
+   "%s  elencato a %s";
+$locale["%s not defined"] =
+   "%s: non definito";
 $locale["%s not found"] =
    "%s non trovato";
 $locale["%s of this page"] =
@@ -56,10 +62,22 @@
    "InsertoCategoria";
 $locale["AddPlugin"] =
    "InsertoPlugin";
+$locale["AddTemplate"] =
+   "AggiungaLaMascherina";
+$locale["Administrators"] =
+   "Coordinatori";
+$locale["Anonymous Users"] =
+   "Utenti Anonimi";
+$locale["Authenticated Users"] =
+   "Utenti Autenticati";
 $locale["Authenticated as %s"] =
    "Authenticata a %s";
 $locale["Author"] =
    "Autore";
+$locale["Author will be logged as %s."] =
+   "L'autore sar annotato come %s.";
+$locale["Bogo Users"] =
+   "Utenti Bogo";
 $locale["Calendar"] =
    "Calendario";
 $locale["CalendarList"] =
@@ -72,8 +90,6 @@
    "Annulla";
 $locale["Cancel rating"] =
    "Annulla";
-$locale["Category"] =
-   "Categoria";
 $locale["CategoryGroup"] =
    "CategoriaGruppo";
 $locale["CategoryPage"] =
@@ -82,6 +98,8 @@
    "Caratteri: %s.";
 $locale["Comment"] =
    "Commentario";
+$locale["Conflicting Edits!"] =
+   "Il Conflitto Pubblica!";
 $locale["Content"] =
    "Indice";
 $locale["Contents"] =
@@ -110,6 +128,10 @@
    "ModificaIlTesto";
 $locale["Edited by: %s"] =
    "Modifica: %s";
+$locale["Every"] =
+   "Ogni";
+$locale["External Links"] =
+   "Collegamenti Esterni";
 $locale["Fatal PhpWiki Error"] =
    "Errore Fatale Di PhpWiki";
 $locale["FindPage"] =
@@ -128,6 +150,8 @@
    "BuonStile";
 $locale["H"] =
    "A";
+$locale["HasHomePage"] =
+   "HaHomePage";
 $locale["Height"] =
    "Altezza";
 $locale["Home"] =
@@ -136,6 +160,8 @@
    "PaginaPrincipale";
 $locale["HomePageAlias"] =
    "PaginaPrincipaleAlias";
+$locale["In the time since you started editing this page, another user has saved a new version of it."] =
+   "Nel tempo da quando avete cominciato pubblicare questa pagina, un altro utente ha conservato una nuova versione di esso.";
 $locale["Include of '%s' failed."] =
    "Inserimento di '%s' fallito.";
 $locale["IncludePage"] =
@@ -156,6 +182,10 @@
    "Inserto Pagina (doppio-scatto)";
 $locale["Insert Plugin (double-click)"] =
    "Inserto Plugin (doppio-scatto)";
+$locale["Insert Template (double-click)"] =
+   "Inserto Mascherina (doppio-scatto)";
+$locale["JabberPresence"] =
+   "JabberPresenca";
 $locale["Last"] =
    "Ultima";
 $locale["Last Author"] =
@@ -178,8 +208,14 @@
    "Blocca la Pagina";
 $locale["Locked"] =
    "Bloccata";
+$locale["Locking pages"] =
+   "Blocca la Pagina";
 $locale["MIME file %s"] =
    "MIME archivio %s";
+$locale["Merge Edit"] =
+   "La Fusione Pubblica";
+$locale["Merge and Edit: %s"] =
+   "Fondasi e pubblichi: %s";
 $locale["ModeratedPage"] =
    "PaginaModerata";
 $locale["Modern"] =
@@ -204,6 +240,8 @@
    "Base di dati d'ottimizzazione";
 $locale["Other version"] =
    "Mostra il versione corrente";
+$locale["Overwrite All"] =
+   "Scriva sopra Tutti";
 $locale["Owner: %s"] =
    "Owner: %s";
 $locale["Page %s not found."] =
@@ -212,14 +250,26 @@
    "Pagina Bloccata";
 $locale["Page Name"] =
    "Nome Della Pagina";
+$locale["Page change"] =
+   "Cambiamento della pagina";
 $locale["Page now locked."] =
    "Pagina bloccata.";
 $locale["Page now unlocked."] =
    "Pagina sbloccata.";
 $locale["Page removed %s"] =
    "Pagina rimosso %s";
+$locale["Page rename %s to %s"] =
+   "La pagina cambia titolo %s a %s";
+$locale["PageChange Notification Error: Couldn't send %s to %s"] =
+   "Errore Di Notifica Del Cambiamento Della Pagina:  Non ha potuto trasmettere %s a %s";
+$locale["PageChange Notification of %s sent to %s"] =
+   "Pagini la notifica del cambiamento di %s trasmesso a %s";
+$locale["PhpWikiAdministration/Markup"] =
+   "AmministrazioneDiPhpWiki/Disposizione";
 $locale["PhpWikiAdministration/Remove"] =
    "AmministrazioneDiPhpWiki/Rimuovi";
+$locale["Please check it through before saving."] =
+   "Controllilo prego attraverso prima del risparmio.";
 $locale["Plugin %s disabled."] =
    "Plugin '%s' inabiliti.";
 $locale["Plugin %s failed."] =
@@ -240,14 +290,24 @@
    "Stampante";
 $locale["RecentChanges"] =
    "CambiamentiRecenti";
+$locale["Related Links"] =
+   "Collegamenti Relativi";
 $locale["Remove"] =
    "Rimuovi";
 $locale["Remove Page"] =
    "Rimuovi la Pagina";
 $locale["Remove this page"] =
    "Rimuovi la pagina";
+$locale["Removed by: %s"] =
+   "Rimosso vicino: %s";
 $locale["Removed page '%s' successfully."] =
    "La pagina '%s'  stata rimossa correttamente.";
+$locale["Removing pages"] =
+   "Rimuovi la pagina";
+$locale["Restore Anyway"] =
+   "Restore Comunque";
+$locale["Revert"] =
+   "Ritorni";
 $locale["Save"] =
    "Registra";
 $locale["Saved: %s"] =
@@ -260,12 +320,16 @@
    "Prescelto";
 $locale["Show minor edits for:"] =
    "Mostrare le modifiche secondarie per:";
+$locale["Signed Users"] =
+   "Utenti Firmati";
 $locale["Signed as %s"] =
    "Salvata a %s";
 $locale["Size"] =
    "Dimensione";
 $locale["Size:"] =
    "Dimensione:";
+$locale["Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save."] =
+   "Alcuni dei cambiamenti non hanno potuto essere uniti automaticamente. Cerchi prego le sezioni che cominciano con '%s 'e concludentesi con '%s '. Dovrete pubblicare a mano quelle sezioni prima che vi scattiate risparmi.";
 $locale["Someone has edited the page!"] =
    "Qualcuno ha modificato la pagina!";
 $locale["Sorry for the inconvenience."] =
@@ -306,6 +370,8 @@
    "Sblocca";
 $locale["Unlock Page"] =
    "Sblocca la Pagina";
+$locale["Unlocking pages"] =
+   "Sblocca la Pagina";
 $locale["UserPreferences"] =
    "Preferenze";
 $locale["Version"] =
@@ -332,14 +398,20 @@
    "Larghezza";
 $locale["Wiki Name"] =
    "Wiki Nome";
+$locale["WikiAdminMarkup"] =
+   "WikiAmministrazioneDisposizione";
 $locale["Yes"] =
    "Si";
 $locale["Your careful attention to detail is much appreciated."] =
    "La tua cura verso il dettaglio  molto apprezzata.";
+$locale["Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below."] =
+   "I vostri cambiamenti non possono essere conservati mentre sono, dal fare in modo da scriverebbero sopra i cambiamenti dell'altro autore. Cos, i vostri cambiamenti e quelli dell'altro autore sono stati uniti. Il risultato  indicato sotto.";
 $locale["Your home page is locked so your preferences cannot not be saved."] =
    "Questa pagina  stata bloccata dall'amministratore in modo da i vostri cambiamenti non possono essere salvati.";
 $locale["Your version"] =
    "versione corrente";
+$locale["authenticated"] =
+   "autenticato";
 $locale["by %s"] =
    "di %s";
 $locale["current version"] =
@@ -354,6 +426,8 @@
    "bloccata";
 $locale["name"] =
    "Nome";
+$locale["not authenticated"] =
+   "non autenticato";
 $locale["plain file %s"] =
    "archivio del testo %s";
 $locale["saved as "] =
Files 11p1/locale/ja/LC_MESSAGES/phpwiki.mo and 12p3/locale/ja/LC_MESSAGES/phpwiki.mo differ
diff -ruN 11p1/locale/ja/LC_MESSAGES/phpwiki.php 12p3/locale/ja/LC_MESSAGES/phpwiki.php
--- 11p1/locale/ja/LC_MESSAGES/phpwiki.php	2005-09-18 07:12:30.000000000 -0500
+++ 12p3/locale/ja/LC_MESSAGES/phpwiki.php	2006-06-18 06:19:36.000000000 -0500
@@ -444,12 +444,6 @@
    "ӥ";
 $locale["current version"] =
    "ߤΥС";
-$locale["db backend:"] =
-   "ǡ١Хå";
-$locale["db type:"] =
-   "ǡ١";
-$locale["dba handler:"] =
-   "dbaϥɥ顼";
 $locale["diff"] =
    "ʬ";
 $locale["edit area"] =
@@ -470,8 +464,6 @@
    "Υӥ";
 $locale["saved as %s"] =
    "%s ¸ޤ";
-$locale["timeout:"] =
-   "ॢ";
 $locale["today"] =
    "";
 $locale["too long"] =
diff -ruN 11p1/locale/Makefile 12p3/locale/Makefile
--- 11p1/locale/Makefile	2005-09-12 01:12:06.000000000 -0500
+++ 12p3/locale/Makefile	2006-06-18 06:19:37.000000000 -0500
@@ -82,8 +82,6 @@
 mo: it/LC_MESSAGES/phpwiki.mo it/LC_MESSAGES/phpwiki.php
 po: po/ja.po
 mo: ja/LC_MESSAGES/phpwiki.mo ja/LC_MESSAGES/phpwiki.php
-po: po/ja.utf-8.po
-mo: ja.utf-8/LC_MESSAGES/phpwiki.mo ja.utf-8/LC_MESSAGES/phpwiki.php
 po: po/nl.po
 mo: nl/LC_MESSAGES/phpwiki.mo nl/LC_MESSAGES/phpwiki.php
 po: po/sv.po
@@ -121,6 +119,8 @@
 ${POT_FILE}: ../lib/RssParser.php
 ${POT_FILE}: ../lib/RssWriter.php
 ${POT_FILE}: ../lib/RssWriter2.php
+${POT_FILE}: ../lib/SemanticWeb.php
+${POT_FILE}: ../lib/SpamBlocklist.php
 ${POT_FILE}: ../lib/Template.php
 ${POT_FILE}: ../lib/TextSearchQuery.php
 ${POT_FILE}: ../lib/Theme.php
@@ -134,9 +134,11 @@
 ${POT_FILE}: ../lib/WikiDB/backend/ADODB_mssql.php
 ${POT_FILE}: ../lib/WikiDB/backend/ADODB_mysql.php
 ${POT_FILE}: ../lib/WikiDB/backend/ADODB_oci8po.php
+${POT_FILE}: ../lib/WikiDB/backend/ADODB_postgres7.php
 ${POT_FILE}: ../lib/WikiDB/backend/ADODB_sqlite.php
 ${POT_FILE}: ../lib/WikiDB/backend/PDO.php
 ${POT_FILE}: ../lib/WikiDB/backend/PDO_mysql.php
+${POT_FILE}: ../lib/WikiDB/backend/PDO_pgsql.php
 ${POT_FILE}: ../lib/WikiDB/backend/PearDB.php
 ${POT_FILE}: ../lib/WikiDB/backend/PearDB_mysql.php
 ${POT_FILE}: ../lib/WikiDB/backend/PearDB_oci8.php
@@ -204,17 +206,20 @@
 ${POT_FILE}: ../lib/plugin/CalendarList.php
 ${POT_FILE}: ../lib/plugin/CategoryPage.php
 ${POT_FILE}: ../lib/plugin/Comment.php
+${POT_FILE}: ../lib/plugin/CreateBib.php
 ${POT_FILE}: ../lib/plugin/CreatePage.php
 ${POT_FILE}: ../lib/plugin/CreateToc.php
 ${POT_FILE}: ../lib/plugin/DeadEndPages.php
 ${POT_FILE}: ../lib/plugin/Diff.php
 ${POT_FILE}: ../lib/plugin/EditMetaData.php
 ${POT_FILE}: ../lib/plugin/ExternalSearch.php
+${POT_FILE}: ../lib/plugin/FileInfo.php
 ${POT_FILE}: ../lib/plugin/FoafViewer.php
 ${POT_FILE}: ../lib/plugin/FrameInclude.php
 ${POT_FILE}: ../lib/plugin/FullTextSearch.php
 ${POT_FILE}: ../lib/plugin/FuzzyPages.php
 ${POT_FILE}: ../lib/plugin/GoTo.php
+${POT_FILE}: ../lib/plugin/GoogleMaps.php
 ${POT_FILE}: ../lib/plugin/GooglePlugin.php
 ${POT_FILE}: ../lib/plugin/GraphViz.php
 ${POT_FILE}: ../lib/plugin/HelloWorld.php
@@ -239,6 +244,7 @@
 ${POT_FILE}: ../lib/plugin/PageHistory.php
 ${POT_FILE}: ../lib/plugin/PageInfo.php
 ${POT_FILE}: ../lib/plugin/PageTrail.php
+${POT_FILE}: ../lib/plugin/PasswordReset.php
 ${POT_FILE}: ../lib/plugin/PhotoAlbum.php
 ${POT_FILE}: ../lib/plugin/PhpHighlight.php
 ${POT_FILE}: ../lib/plugin/PhpWeather.php
@@ -250,6 +256,7 @@
 ${POT_FILE}: ../lib/plugin/RandomPage.php
 ${POT_FILE}: ../lib/plugin/RateIt.php
 ${POT_FILE}: ../lib/plugin/RawHtml.php
+${POT_FILE}: ../lib/plugin/RdfDefinition.php
 ${POT_FILE}: ../lib/plugin/RecentChanges.php
 ${POT_FILE}: ../lib/plugin/RecentChangesCached.php
 ${POT_FILE}: ../lib/plugin/RecentComments.php
@@ -265,6 +272,7 @@
 ${POT_FILE}: ../lib/plugin/SyntaxHighlighter.php
 ${POT_FILE}: ../lib/plugin/SystemInfo.php
 ${POT_FILE}: ../lib/plugin/TeX2png.php
+${POT_FILE}: ../lib/plugin/Template.php
 ${POT_FILE}: ../lib/plugin/TexToPng.php
 ${POT_FILE}: ../lib/plugin/TitleSearch.php
 ${POT_FILE}: ../lib/plugin/Transclude.php
@@ -373,7 +381,6 @@
 ${POT_FILE}: ../themes/Wordpress/themeinfo.php
 ${POT_FILE}: ../themes/alphatest.php
 ${POT_FILE}: ../themes/blog/lib/RecentChanges.php
-${POT_FILE}: ../themes/blog/templates/_info.tmpl
 ${POT_FILE}: ../themes/blog/templates/actionbar.tmpl
 ${POT_FILE}: ../themes/blog/templates/blogform.tmpl
 ${POT_FILE}: ../themes/blog/templates/body.tmpl
@@ -440,6 +447,7 @@
 ${POT_FILE}: ../themes/smaller/templates/navbar.tmpl
 ${POT_FILE}: ../themes/smaller/templates/signin.tmpl
 ${POT_FILE}: ../themes/smaller/themeinfo.php
+${POT_FILE}: ../themes/wikilens/templates/categorypage.tmpl
 ${POT_FILE}: ../themes/wikilens/templates/head.tmpl
 ${POT_FILE}: ../themes/wikilens/templates/navbar.tmpl
 ${POT_FILE}: ../themes/wikilens/themeinfo.php
Files 11p1/locale/nl/LC_MESSAGES/phpwiki.mo and 12p3/locale/nl/LC_MESSAGES/phpwiki.mo differ
diff -ruN 11p1/locale/po/de.po 12p3/locale/po/de.po
--- 11p1/locale/po/de.po	2005-09-18 07:12:25.000000000 -0500
+++ 12p3/locale/po/de.po	2006-06-18 06:19:37.000000000 -0500
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <rurban@x-ray.at>, Carsten Klapp "
 "<carstenklapp@users.sourceforge.net>, Helmer Pardun <pardunpress@t-online."
@@ -16,6 +16,14 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr ""
+
 #: ../lib/DbSession.php:50
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
@@ -44,13 +52,13 @@
 msgid "Undo disabled"
 msgstr "Undo deaktiviert"
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
 msgstr "Suchen & Ersetzen"
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -68,24 +76,24 @@
 msgstr "Ersetze mit"
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr "Schlieen"
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
-msgstr ""
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
+msgstr "Substring \"%s\" %s mal gefunden. Ersetze mit \"%s\"?"
 
 #: ../lib/EditToolbar.php:82
 #, php-format
@@ -94,124 +102,116 @@
 
 #: ../lib/EditToolbar.php:105
 msgid "Operation undone"
-msgstr ""
+msgstr "Aktion rckgngig gemacht"
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
 msgstr "Fetter Text"
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
 msgstr "Kursiver Text"
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
 msgstr "optionaler Name | SeitenName"
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 msgid "Link to page"
 msgstr "Link auf Seite"
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
 msgstr "optionaler Name | http://www.example.com"
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
 msgstr "Externer Link (http:// prefix)"
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
 msgstr "berschrift"
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
 msgstr "H1 berschrift"
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr "Beispiel.jpg"
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
 msgstr "Bild einfgen"
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
 msgstr "Fge unformatierten Text hier ein"
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
 msgstr "Keine Wiki Formatierung"
 
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 msgid "Your signature"
 msgstr "Deine Signatur"
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr "Horizontale Trennlinie"
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr "Speichern"
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 msgid "Undo Search & Replace"
 msgstr "Suchen & Ersetzen rckgngig machen"
 
-#: ../lib/EditToolbar.php:267
-msgid "Category"
-msgstr "Kategorie"
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr "Thema"
-
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 msgid "AddCategory"
 msgstr "NeueKategorie"
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr "Kategorien einfgen (Doppelklick)"
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr "Einfgen"
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 msgid "AddPlugin"
 msgstr "Plugin einfgen"
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr "Plugin einfgen (Doppelklick)"
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 msgid "AddPageLink"
 msgstr "SeitenLink einfgen"
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
 msgstr "SeitenLink einfgen (Doppelklick)"
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
-msgstr ""
+msgstr "NeueVorlage"
 
-#: ../lib/EditToolbar.php:363
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
 msgstr "Vorlage einfgen (Doppelklick)"
 
@@ -220,21 +220,21 @@
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler whrend der Fehlerbehandlung von:"
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: Datei nicht gefunden"
 
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
 
 # (namenlos=unbenannt; depends on interpretation)
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr "Unbenanntes PhpWiki"
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -244,7 +244,7 @@
 msgid "Invalid [] syntax ignored"
 msgstr "Ungltige [] syntax ignoriert"
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "unbekannte Farbe %s ignoriert"
@@ -278,7 +278,7 @@
 msgstr "... cirka %s"
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, php-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
@@ -311,7 +311,7 @@
 msgstr "Treffer"
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 msgid "Size"
 msgstr "Gre"
@@ -341,7 +341,7 @@
 msgid "Creator"
 msgstr "Erzeuger"
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -442,7 +442,7 @@
 msgstr "hinzufgen "
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
+msgid "Check to add this ACL"
 msgstr "Anklicken um diese ACL hinzuzufgen"
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
@@ -455,13 +455,13 @@
 #: ../themes/shamino_com/templates/info.tmpl:149
 #: ../themes/shamino_com/templates/info.tmpl:150
 msgid "InterWikiMap"
-msgstr "InterWikiKarte"
+msgstr "InterWikiListe"
 
 #: ../lib/PageType.php:140
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
-msgstr "ACHTUNG: Die InterWikiKarte Seite ist ungesperrt. Ignoriert."
+msgstr "ACHTUNG: Die InterWikiListe Seite ist ungesperrt. Ignoriert."
 
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -472,10 +472,10 @@
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
-msgstr "Die InterWikikarte wird von der externen Datei %s geladen."
+msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
 
 #: ../lib/PageType.php:372
 msgid "Moniker"
@@ -485,20 +485,20 @@
 msgid "InterWiki Address"
 msgstr "InterWiki-Adresse"
 
-# (Im Wortsinne heisst das eigentlich: "jngste = eben gemachte
+# (Im Wortsinne heit das eigentlich: "jngste = eben gemachte
 # nderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -507,39 +507,39 @@
 msgid "RecentChanges"
 msgstr "Neuestenderungen"
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
 msgstr ""
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
 msgstr "%s is nicht nderbar."
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
 msgstr "Die PhpWiki Zugriffslog Datei"
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
-"Bitte berprfen Sie, da %s nderbar ist, oder ndern Sie %s in config/"
+"Bitte berprfen Sie, dass %s nderbar ist, oder ndern Sie %s in config/"
 "config.ini."
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, php-format
 msgid "the file '%s'"
 msgstr "die Datei %s"
@@ -549,82 +549,86 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "Nicht untersttztes Argument: %s=%s"
 
-#: ../lib/Theme.php:392
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
+msgstr ""
+
+#: ../lib/Theme.php:388
 msgid "Never edited"
 msgstr "Noch nie bearbeitet."
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, php-format
 msgid "Version %s, saved %s"
 msgstr "Version %s. %s gespeichert"
 
 # (Usually a verb, never a noun; siehe nchste Reihe:
 # saved=gespeichert nicht "Speicherung am.")
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, php-format
 msgid "Last edited %s"
 msgstr "Zuletzt gendert %s"
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "Version %s. gespeichert am %s"
 
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, php-format
 msgid "Last edited on %s"
 msgstr "Zuletzt bearbeitet am %s"
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr "heute"
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr "gestern"
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, php-format
 msgid "Owner: %s"
 msgstr "Besitzer: %s"
 
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "von %s"
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Leerer Link zu: %s"
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr "Erzeugen: %s"
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "%s: Ungltiger Seitenname"
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -634,12 +638,12 @@
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -656,26 +660,28 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Anmelden"
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr "Seite Sperren"
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr "Seite Freigeben"
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr "Seite Lschen"
 
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -698,89 +704,89 @@
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
 msgstr "Externe Links"
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/WikiDB.php:230
+#: ../lib/WikiDB.php:233
 #, php-format
 msgid "Removed by: %s"
 msgstr "Gelscht von: %s"
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, php-format
 msgid "Page removed %s"
 msgstr "Seite gelscht %s"
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr "Seitennderung Benachrichtigung von %s an %s gesendet"
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr "Seitennderung Benachrichtigung Fehler: Konnte %s nicht an %s senden"
 
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, php-format
 msgid "renamed from %s"
 msgstr "umbenannt von %s"
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() fr dieses Backend noch nicht implementiert"
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 msgid "Page change"
 msgstr "Seiten nderung"
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 msgid "New page"
 msgstr "Neue Seite"
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite %s nach umbenennen %s"
 
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Beschreiben Sie %s hier."
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "Hoppla! Es scheint, die Version %s von %s wurde gelscht!"
@@ -823,7 +829,7 @@
 
 #: ../lib/WikiGroup.php:32
 msgid "HasHomePage"
-msgstr "HaHomePage"
+msgstr "HasHomePage"
 
 #: ../lib/WikiGroup.php:33
 msgid "Signed Users"
@@ -867,24 +873,26 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr "Keine oder zu wenige GROUP_DB SQL Statements definiert"
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
-msgstr "AUTH_GROUP_FILE nicht definiert"
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, php-format
+msgid "%s: not defined"
+msgstr "%s: nicht definiert"
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
 msgstr "Kann AUTH_GROUP_FILE %s nicht ffnen"
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
-msgstr "LDAP_AUTH_HOST nicht definiert"
+#: ../lib/WikiGroup.php:951
+#, php-format
+msgid "%s not defined"
+msgstr "%s nicht definiert"
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
 msgstr "Kein LDAP in dieser PHP Version"
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr "Konnte LDAP Server %s nicht finden"
@@ -897,7 +905,7 @@
 # must also be renamed to match what is here.
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -906,8 +914,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -919,7 +927,7 @@
 
 #: ../lib/WikiPlugin.php:125
 #, php-format
-msgid "argument '%s' not declared by plugin."
+msgid "Argument '%s' not declared by plugin."
 msgstr "Argument %s nicht im Zusatzprogramm deklariert."
 
 #: ../lib/WikiPlugin.php:235
@@ -937,17 +945,17 @@
 msgid "Plugin %s disabled."
 msgstr "Zusatzprogramm %s deaktiviert."
 
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, php-format
 msgid "Include of '%s' failed."
 msgstr "Das Einfgen von %s ist fehlgeschlagen."
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
 msgstr "Unbekannte Klasse: %s"
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr "%s scheint kein WikiPlugin zu sein."
@@ -960,17 +968,17 @@
 msgstr ""
 "Es sind keine Bilddaten vorhanden fr '%'. Bitte laden Sie die Seite neu."
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 msgid "Invalid username."
 msgstr "Ungltiger Benutzername."
 
@@ -1034,15 +1042,15 @@
 "einem leeren Password gespeichert. Setzen Sie ein Passwort in Ihren "
 "BenutzerEinstellungen."
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, php-format
 msgid "%s is missing"
 msgstr "%s Argument fehlt"
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
 msgstr ""
@@ -1051,7 +1059,12 @@
 msgid "Unable to connect to IMAP server "
 msgstr "IMAP Server nicht gefunden "
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr "Konnte nicht mit LDAP Server %s verbinden mit %s %s"
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr "Ungltiger Benutzername %s fr LDAP Auth"
@@ -1099,11 +1112,11 @@
 msgid "Default preferences will be used."
 msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr "Die Lnge des Passwortes ist krzer als vom System gefordert."
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -1113,11 +1126,11 @@
 "Sie knnen sich leider nicht anmelden.\n"
 " Sie mssen den System Administrator bitten, Ihr Passwort neu zu setzen."
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -1125,16 +1138,16 @@
 "Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren "
 "Sie config/config.ini und berprfen sie auch ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 "Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen."
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 msgid "Email Verification"
 msgstr "E-Mail Besttigung"
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1148,17 +1161,17 @@
 "versenden.\n"
 "Siehe %s"
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Kann %s Typ-Formatzeichenketten nicht mit %s vermischen."
@@ -1208,7 +1221,7 @@
 
 #: ../lib/diff.php:336 ../lib/plugin/Diff.php:139
 msgid "predecessor to the previous major change"
-msgstr "Vorgnger zur vorherigen grsseren nderung"
+msgstr "Vorgnger zur vorherigen greren nderung"
 
 # word substitution order changes here
 #: ../lib/diff.php:347 ../lib/plugin/Diff.php:149
@@ -1224,7 +1237,7 @@
 
 #: ../lib/diff.php:351 ../lib/plugin/Diff.php:153
 msgid "Previous Major Revision"
-msgstr "Vorige grssere Neubearbeitung"
+msgstr "Vorige grere Neubearbeitung"
 
 #: ../lib/diff.php:352 ../lib/plugin/Diff.php:154
 msgid "Previous Revision"
@@ -1256,7 +1269,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1264,7 +1277,7 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1275,99 +1288,113 @@
 msgid "BackLinks"
 msgstr "BackLinks"
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
 msgstr "BackLinks fr %s"
 
 # versandet (=full of sand) ;)
 # weitergeleitet von
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, php-format
 msgid "(Redirected from %s)"
 msgstr "(Weitergeleitet von %s)"
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
 msgstr "Sie suchten nach: "
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
-msgstr ""
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
+msgstr "SandKasten"
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr "Ihre Version"
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr "Andere Version"
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
 "Sie versuchen offenbar eine ungltige Version dieser Seite zu bearbeiten."
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
 msgstr "&version=-1 wird empfohlen."
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr "Bearbeite: %s"
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
 msgstr "Quelltext Ansicht: %s"
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr "Seite jetzt gesperrt."
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr "Seite jetzt freigegeben."
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, php-format
 msgid "Saved: %s"
 msgstr "Gespeichert: %s"
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 msgid "Too many external links."
 msgstr "Zu viele externe Links."
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
 msgstr "SpamAssassin sagt: "
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr ""
+
+#: ../lib/editpage.php:397
+#, php-format
+msgid "%s is listed at %s"
+msgstr "%s blockiert von %s"
+
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
 msgstr "AntiSpam"
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr "Diese Bearbeitung scheint Spam beinzuhalten und wurde ignoriert."
 
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr ""
 "Entschuldigen Sie bitte die hiermit fr Sie verbundenen Unannehmlichkeiten."
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr "Seite Gesperrt"
 
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
@@ -1375,7 +1402,7 @@
 "Diese Seite wurde vom Administrator fr die allgemeine Bearbeitung gesperrt. "
 "Ihre nderungen knnen deshalb nicht gespeichert werden."
 
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
@@ -1383,7 +1410,7 @@
 "(Kopieren Sie Ihre Vernderungen in die Zwischenablage. Sie knnen versuchen "
 "eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)"
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -1395,15 +1422,15 @@
 "enden. Sie mssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern "
 "klicken."
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
 msgstr "Bitte berprfen Sie erst alles, bevor Sie es abspeichern."
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
 msgstr "Widersprechende nderungen!"
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
@@ -1411,7 +1438,7 @@
 "Whrend der Zeit, seit Sie mit der Bearbeitung dieser Seite begonnen haben, "
 "hat ein anderer Benutzer bereits eine neuere Version gespeichert."
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
@@ -1422,23 +1449,19 @@
 "berschrieben. Deshalb sind Ihre und die nderungen des anderen Autors "
 "miteinander kombiniert worden. Das Ergebnis sehen Sie unten."
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 msgid "Convert"
 msgstr "Konvertieren"
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
 msgstr "%s wird als Autor aufgenommen."
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr "Zusammenfgen und Bearbeiten: %s"
@@ -1515,7 +1538,7 @@
 msgid "Dumping Pages"
 msgstr "Die Seiten werden geschrieben"
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 msgid "Skipped."
 msgstr "Ausgelassen."
 
@@ -1567,7 +1590,7 @@
 msgstr ""
 "hat unauflsbare Konflikte beim Speichern - wird ungeprft berschrieben"
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
 msgstr "Das PhpWiki Programmierer-Team"
 
@@ -1587,17 +1610,17 @@
 msgid "- saved to database as version %d"
 msgstr "- in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME-Datei %s"
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialisierte Datei %s"
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, php-format
 msgid "plain file %s"
 msgstr "Nur-Text-Datei %s"
@@ -1621,8 +1644,8 @@
 msgid " Sorry, cannot merge."
 msgstr " Konnte leider nicht automatisch einpflegen."
 
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
@@ -1633,296 +1656,328 @@
 msgid "missing required version argument"
 msgstr "Parameter version mu angegeben werden"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 msgid "no page content"
 msgstr "leerer Seiteninalt"
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 msgid "same version page"
 msgstr "selbe Version der Seite"
 
-#: ../lib/loadsave.php:904
+#: ../lib/loadsave.php:907
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
+msgstr "Sind Sie sicher?"
+
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr "Ja"
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../lib/loadsave.php:938
 #, php-format
 msgid "revert to version %d"
 msgstr "Speichere Version %d zurck."
 
-#: ../lib/loadsave.php:907
+#: ../lib/loadsave.php:943
 #, php-format
-msgid "- version %d saved to database as version %d"
-msgstr "- version %d in der Datenbank gespeichert als Version %d."
+msgid "Revert: %s"
+msgstr "Zurckspeichern: %s"
 
-#: ../lib/loadsave.php:921
+#: ../lib/loadsave.php:944
 #, php-format
-msgid "%s: not defined"
-msgstr "%s: nicht definiert"
+msgid "- version %d saved to database as version %d"
+msgstr "- version %d in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
-msgstr "Standard-Datei der InterWiki-Karte nicht geladen."
+msgstr "Standard-Datei der InterWikiListe nicht geladen."
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
 msgstr "bersprungen"
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
 msgstr "Konnte %s nicht laden"
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Ungltiger Dateityp: %s"
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
 msgstr "%s wird geladen"
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
 msgstr "Lade neue Seiten in das frische Wiki"
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
 msgstr "Keine Datei zum Hochladen?"
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
 msgstr "VERBOTEN"
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
 msgstr "ANON"
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
 msgstr "BOGO"
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
 msgstr "BENUTZER"
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
 msgstr "UNERREICHBAR"
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr "%s ist auf diesem Wiki nicht zugelassen."
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "authenticated"
 msgstr "authentifizierten"
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "not authenticated"
 msgstr "nicht authentifizierten"
 
 # Missing PagePermission:| access | pagename
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 "%s %s %s ist auf diesem Wiki fr %s Benutzer %s (Level: %s) nicht "
 "zugelassen."
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 msgid "Missing PagePermission:"
 msgstr "Fehlende Zugriffsberechtigung:"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
 msgstr "Sie mssen sich anmelden %s."
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
 msgstr "Sie mssen sich anmelden %s."
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr "Sie mssen Administratorrechte haben %s."
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 msgid "view this page"
 msgstr "um diese Seite anzuzeigen"
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 msgid "diff this page"
 msgstr "um von dieser Seite die nderungen anzuzeigen"
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 msgid "dump html pages"
 msgstr "um von diesem Wiki HTML-Dateien lokal abzuspeichern"
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 msgid "dump serial pages"
 msgstr "um von diesem Wiki die Seiten lokal abzuspeichern"
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 msgid "edit this page"
 msgstr "um diese Seite zu bearbeiten"
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 msgid "revert to a previous version of this page"
 msgstr "Zurckspeichern einer lteren Version dieser Seite."
 
 # Erzeugen??
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 msgid "create this page"
 msgstr "um diese Seite zu erzeugen"
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
 msgstr "um Seiten in dieses Wiki zu laden"
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 msgid "lock this page"
 msgstr "um diese Seite zu sperren"
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 msgid "remove this page"
 msgstr "um diese Seite zu lschen"
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 msgid "unlock this page"
 msgstr "um diese Seite zu entsperren"
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
 msgstr "um einen ZIP-Speicherauszug in dieses Wiki zu laden"
 
 # (verify=verwirklichen, in die Tat umsetzen, durch- oder ausfhren)
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
 msgstr "um die gegenwrtige Aktion durchzufhren"
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
 msgstr "um den Quelltext dieser Seiten anzusehen"
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
 msgstr "um via XML-RPC auf dieses Wiki zuzugreifen"
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 msgid "access this wiki via SOAP"
 msgstr "um via SOAP auf dieses Wiki zuzugreifen"
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
 msgstr "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen"
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
+#: ../lib/main.php:510
+msgid "download a html zip dump from this wiki"
 msgstr "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen"
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
 msgstr "Das Durchblttern der Seiten dieses Wikis"
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr "Die Inhalts-Differenz-Seiten dieses Wikis"
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr "Die Speicherung von Wiki Seiten als HTML-Dateien"
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr "Die Speicherung von Wiki Seiten als Dateien"
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr "ndern in diesem Wiki"
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr "Zurckspeichern einer lteren Version"
 
 # Erzeugen??
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr "Das Seitenerzeugung in diesem Wiki"
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr "Das Dateienladen in diesem Wiki"
 
-#: ../lib/main.php:540
+#: ../lib/main.php:542
 msgid "Locking pages"
 msgstr "Das Seitensperrung in diesem Wiki"
 
-#: ../lib/main.php:541
+#: ../lib/main.php:543
 msgid "Removing pages"
 msgstr "Die Seitenlschung in diesem Wiki"
 
-#: ../lib/main.php:542
+#: ../lib/main.php:544
 msgid "Unlocking pages"
 msgstr "Die Seitenfreigabe in diesem Wiki"
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
-msgstr "Das Hochladen vonr ZIP-Speicherauszge in diesem Wiki"
+msgstr "Das Hochladen von ZIP-Dumps in diesem Wiki"
 
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr "Besttigen Sie die gegenwrtige Aktion"
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
-msgstr "DieQuelltextansicht der Seiten in diesem Wiki"
+msgstr "Die Quelltextansicht der Seiten in diesem Wiki"
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr "XML-RPC Zugriff"
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 msgid "SOAP access"
-msgstr "SOAP Zugriff"
+msgstr "SOAP-Zugriff"
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
-msgstr "Das Herunterladen aller Wiki Seiten als gezippte Datei"
+msgstr "Das Herunterladen aller Wiki-Seiten als gezippte Datei"
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr ""
-"Das Herunterladen aller Wiki Seiten als HTML-Dateien in einer Zip Datei"
+"Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei"
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
-msgstr "Sie mssen auf Moderator approval warten."
+msgstr "Sie mssen auf die Zustimmung des Moderators warten."
 
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1930,28 +1985,28 @@
 msgid "ModeratedPage"
 msgstr "ModerierteSeite"
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: Ungltige Aktion"
 
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
-msgstr "Fataler PhpWiki Fehler"
+msgstr "Fataler PhpWiki-Fehler"
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 msgid "Chown"
 msgstr "Chown"
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
 msgstr "AclSetzen"
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1963,26 +2018,26 @@
 msgid "PageDump"
 msgstr "SeiteSpeichern"
 
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr "VolltextSuche"
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
 msgstr "Das session.save_path Verzeichnis"
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "das session.save_path Verzeichnis %s"
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "Versuche stattdessen das Verzeichnis %s zu verwenden."
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
 msgstr "Benutzer werden sich nicht anmelden knnen."
 
@@ -2007,8 +2062,8 @@
 msgid "Click to display all comments"
 msgstr "Klicken um Kommentare anzuzeigen"
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 msgid "Click to display"
 msgstr "Klicken um anzuzeigen"
 
@@ -2055,7 +2110,7 @@
 
 #: ../lib/plugin/AllUsers.php:41
 msgid "List all once authenticated users."
-msgstr "Liste alle eingetragen Benutzer."
+msgstr "Liste alle eingetragenen Benutzer."
 
 # (authentication=means verbrgt, beglaubigt, oder ganz einfach= durch
 # Nachweis berechtigte = authenticated User are in one simple term =
@@ -2063,7 +2118,7 @@
 #: ../lib/plugin/AllUsers.php:83
 #, php-format
 msgid "Authenticated users on this wiki (%d total):"
-msgstr "Eingetrage Benutzer in diesem Wiki (Gesamt: %d):"
+msgstr "Eingetragene Benutzer in diesem Wiki (Gesamt: %d):"
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:143
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
@@ -2140,7 +2195,7 @@
 msgid "hours"
 msgstr "Stunden"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr "Tage"
 
@@ -2154,7 +2209,7 @@
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "Show summary information from the access log table."
-msgstr "Zeige berblick ber die Access LOG Tabelle."
+msgstr "Zeige berblick ber die Access LOG-Tabelle."
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:240
 msgid "The requested information is available only to Administrators."
@@ -2223,7 +2278,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 msgid "AuthorHistory"
@@ -2254,8 +2309,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2298,8 +2353,8 @@
 msgid "List all pages which link to %s."
 msgstr "Alle Seiten, die mit %s verlinkt sind."
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
@@ -2333,7 +2388,7 @@
 msgid "%s pages link to %s:"
 msgstr "%s Seiten sind mit %s verlinkt:"
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2342,19 +2397,19 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
-msgstr "Blog Eintrge fr %s:"
+msgstr "Blog-Eintrge fr %s:"
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr "BlogArchiv"
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
-msgstr "Blog Archive:"
+msgstr "Blog-Archive:"
 
 #: ../lib/plugin/BlogJournal.php:22
 msgid "BlogJournal"
@@ -2364,13 +2419,13 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr "WikiBlog"
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
-msgstr "Keine Blog Eintrge"
+msgstr "Keine Blog-Eintrge"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
 #: ../themes/Crao/templates/head.tmpl:89
@@ -2379,7 +2434,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2395,12 +2450,12 @@
 msgid "Next Month"
 msgstr "Nchster Monat"
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr "Bearbeite %s"
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 msgid "CalendarList"
 msgstr "KalenderListe"
 
@@ -2410,7 +2465,7 @@
 
 #: ../lib/plugin/CategoryPage.php:48
 msgid "Create a Wiki page."
-msgstr "Erzeuge eine neue Wiki Seite."
+msgstr "Erzeuge eine neue Wiki-Seite."
 
 #: ../lib/plugin/Comment.php:22 ../themes/Crao/templates/blogform.tmpl:15
 #: ../themes/blog/templates/blogform.tmpl:21
@@ -2422,13 +2477,27 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr "Kommentar in WikiText verstecken."
 
+#: ../lib/plugin/CreateBib.php:36
+msgid "CreateBib"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr "Keine Seite angegeben"
+
 #: ../lib/plugin/CreatePage.php:39
 msgid "CreatePage"
 msgstr "NeueSeite"
 
 #: ../lib/plugin/CreatePage.php:43
 msgid "Create a Wiki page by the provided name."
-msgstr "Erzeuge neue Wiki Seite mit dem angegebenem Namen."
+msgstr "Erzeuge neue Wiki-Seite mit dem angegebenem Namen."
 
 #: ../lib/plugin/CreatePage.php:92
 #, php-format
@@ -2447,20 +2516,15 @@
 msgid "Automatically link headers at the top"
 msgstr "Verlinke berschriften mit Inhaltsverzeichnis"
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr "Keine Seite angegeben"
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
-msgstr ""
+msgstr "InhaltsVerzeichnis deaktiviert fr altes Markup"
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
-msgstr ""
+msgstr "Hier klicken um zu verstecken"
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 msgid "Table Of Contents"
 msgstr "Inhaltsverzeichnis"
 
@@ -2497,7 +2561,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr "Eingeben"
 
@@ -2515,6 +2579,21 @@
 "Weiterleitung der Suche zu einer externen Webseite aufgrund einer "
 "Formulareingabe"
 
+#: ../lib/plugin/FileInfo.php:39
+msgid "FileInfo"
+msgstr "DateiInfo"
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr "Erforderliches Argument %s fehlt."
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr "FoafBetrachter"
@@ -2565,6 +2644,7 @@
 "Seite. Nur ein Frame ist erlaubt."
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr "Fehler beim Einbetten der Seite %s: Rekursiver Selbstaufruf der Seite"
@@ -2595,7 +2675,12 @@
 msgid "only %d pages displayed"
 msgstr "nur %d Seiten angezeigt"
 
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr "Volltext-Suchresultate nach %s"
@@ -2643,6 +2728,30 @@
 msgid "Go"
 msgstr "Los"
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr "%s Argument fehlt"
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, php-format
+msgid "invalid argument %s"
+msgstr "Ungltiger Parameter %s"
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr "neues&nbsp;Fenster"
+
 #: ../lib/plugin/GooglePlugin.php:43
 msgid "GooglePlugin"
 msgstr "GoogleZusatzprogramm"
@@ -2663,12 +2772,16 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-msgid "empty source"
-msgstr "fehlender Quelltext"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, php-format
+msgid "Couldn't start commandline '%s'"
+msgstr "Konnte Programm %s nicht starten"
+
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2707,6 +2820,7 @@
 msgstr "Text von einer andere Seite einfgen."
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr "%s(%d): keine solche Version"
@@ -2786,7 +2900,7 @@
 #: ../lib/plugin/LikePages.php:67
 #, php-format
 msgid "Page names with prefix '%s'"
-msgstr "Seitenamen mit dem Anfangswort %s"
+msgstr "Seitennamen mit dem Anfangswort %s"
 
 # (nachwort=nachgestelltes Wort)
 #: ../lib/plugin/LikePages.php:70
@@ -2834,7 +2948,7 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 msgid "You must be logged in to view ratings."
 msgstr "Sie mssen sich anmelden um die Bewertungen zu sehen."
 
@@ -3079,7 +3193,7 @@
 "markup before rewrapping with emacs and checking into CVS."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 msgid "Warning:"
 msgstr "Achtung:"
 
@@ -3097,17 +3211,11 @@
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s: unbekannte Sektion>"
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr "Erforderliches Argument %s fehlt."
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr "Nchste"
@@ -3210,29 +3318,130 @@
 msgid "PageTrail Plugin"
 msgstr "PageTrail Plugin"
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+msgid "PasswordReset"
+msgstr "PasswortZurcksetzen:"
+
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr "Nachricht"
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr "Fehler"
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr "EMail mit dem neuen Passwort fr Benutzer %s erfolgreich gesendet"
+
+#: ../lib/plugin/PasswordReset.php:86
+#, php-format
+msgid "Error sending email with password for user %s."
+msgstr ""
+"Fehler beim Versenden der EMail mit dem neuen Passwort fr Benutzer %s."
+
+#: ../lib/plugin/PasswordReset.php:94
+msgid "Reset password of user: "
+msgstr "Setze Passwort von Benutzer zurck: "
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr "Sende EMail"
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+msgid "Already logged in"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr "BenutzerEinstellungen"
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr ""
+"Sie mssen einen Administrator bitten, das Passwort zurckzusetzen. Siehe "
+"unten: "
+
+#: ../lib/plugin/PasswordReset.php:174
+#, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr "Wollen Sie wirklich das Passwort von Benutzer %s zurcksetzen?"
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr "Ein EMail wird versendet."
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr "BilderAlbum"
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr ""
 "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen "
 "Beschreibungen"
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, php-format
 msgid "Invalid argument: %s=%s"
 msgstr "Ungltiger Parameter: %s=%s"
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 "URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, php-format
+msgid "Unable to find src='%s'"
+msgstr "Konnte src='%s' nicht lesen"
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, php-format
 msgid "Unable to read src='%s'"
 msgstr "Konnte src='%s' nicht lesen"
@@ -3297,6 +3506,10 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+msgid "empty source"
+msgstr "fehlender Quelltext"
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr "ZusatzprogrammManager"
@@ -3438,7 +3651,7 @@
 
 #: ../lib/plugin/RawHtml.php:74
 msgid "Raw HTML is disabled in this wiki."
-msgstr "HTML-Befehle sind in diesem Wiki ausser Kraft gesetzt."
+msgstr "HTML-Befehle sind in diesem Wiki auer Kraft gesetzt."
 
 #: ../lib/plugin/RawHtml.php:83 ../lib/plugin/RedirectTo.php:82
 #, php-format
@@ -3449,6 +3662,14 @@
 msgid "Raw HTML"
 msgstr "Reine HTML-Befehle"
 
+#: ../lib/plugin/RdfDefinition.php:42
+msgid "RdfDefinition"
+msgstr ""
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 #: ../lib/plugin/RecentChanges.php:105
 msgid "Deleted"
 msgstr "Gelscht"
@@ -3457,117 +3678,117 @@
 msgid "(diff)"
 msgstr "(diff)"
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr "(protok.)"
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr "nderungen"
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
-msgstr "Grssere nderungen"
+msgstr "Grere nderungen"
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr "Kleinere nderungen"
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 msgid "Recent Comments"
 msgstr "Neueste Kommentare"
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 msgid "comments"
 msgstr "Kommentare"
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr "Die %d jngste %s innerhalb des letzten Tages sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 "Die %d jngste %s innerhalb der letzten %s Tage sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr "Die %d jngste %s sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr "Die %d lteste %s innerhalb des letzten Tages sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 "Die %d lteste %s innerhalb der letzten %s Tage sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr "Die %d lteste %s sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr "Die jngste %s innerhalb des letzten Tages sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr "Die jngste %s innerhalb der letzten %s Tage sind unten aufgelistet."
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
 msgstr "Alle %s sind unten aufgelistet."
 
 # Kleinenderungen?
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr "Geringfgigenderungen"
 
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 msgid "No comments found"
 msgstr "Keine Kommentare gefunden."
 
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
 msgstr "Keine nderungen gefunden."
 
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr "TitelSuche"
 
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
 msgstr "Zeige kleinere nderungen innerhalb von:"
 
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
 msgstr "Zeige alle nderungen innerhalb von:"
 
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
 msgstr "Zeige nderungen innerhalb von:"
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr "1 Tag"
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr "%s Tagen"
@@ -3624,12 +3845,11 @@
 msgid "Related Changes"
 msgstr "Verlinkte nderungen"
 
-# (Im Wortsinne heisst das eigentlich: "jngste = eben gemachte
+# (Im Wortsinne heit das eigentlich: "jngste = eben gemachte
 # nderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 msgid "RelatedChanges"
 msgstr "Verlinktenderungen"
 
@@ -3670,7 +3890,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr "Alle BackLinks fr %s (rekursiv)"
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr "(max. Rekursionstiefe: %d)"
@@ -3709,65 +3929,44 @@
 msgid "invalid %s ignored"
 msgstr "ungltiges %s ignoriert"
 
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr "Konnte Programm %s nicht starten"
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr "Dbtyp:"
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr "Zeitberschreitung:"
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr "kein Cache verwendet"
 
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr "Seitendaten in den Cachespeicher aufgenommen:"
 
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr "Versionendaten in den Cachespeicher aufgenommen:"
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr ""
 "Aufbewahrung grerer nderungen fr %d, aber nicht lnger als %d Tage."
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr ""
 "Aufbewahrung kleinerer nderungen fr %d, aber nicht lnger als %d Tage."
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr "Aufbewahrung der neueren Beitrge der letzten %d Autoren fr %d Tage."
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3778,166 +3977,170 @@
 "aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als %"
 "d einzelne Autoren Revisionen."
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr "%d Seiten"
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr "%d nicht leere Seiten"
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr "noch nicht"
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr "%d Homepages"
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, php-format
 msgid "total hits: %d"
 msgstr "Anzahl aller Seitenaufrufe %d"
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr "Max: %d"
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr "Mittel: %2.3f"
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr "Median: %d"
 
 # Abbreviation in German for standard deviation / Standardabweichung?
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr "Standardabweichung: %2.3f"
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr "%d Seiten die weniger als %d aufgerufen haben (<%d%%)."
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr "%d Seite(n) die mehr als %d aufgerufen haben (>%d%%)."
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr "Anwendungsplatzbedarf: %d KB"
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, php-format
 msgid "Pagedata size: %d Kb"
 msgstr "Gre der Seitendaten: %d KB"
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
-msgstr "%d Gesammte Zusatzprogramme: "
+msgstr "%d Gesamte Zusatzprogramme: "
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
-msgstr "%d Sprache gesammt: "
+msgstr "%d Sprache gesamt: "
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr "Ihre Sprache: %s"
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr "Standardsprache fr dieses Wiki: %s"
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr "%d Benutzeroberflche gesamt: "
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr "Ihre Benutzeroberflche: %s"
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr "Darstellung des Systems: %s"
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr "Anwendungsname"
 
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr "PhpWikitriebwerksversion"
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr "Datenbank"
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr "Cache Statistiken"
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr "Seiten Statistiken"
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr "Benutzer Statistiken"
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr "Treffer Statistiken"
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr "Wikiname regexp"
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr "Eingebundene Bilder"
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr "Verfgbare Einschubprogramme"
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr "Untersttzte Sprachen"
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
-msgstr "Unterstzte Benutzeroberflche"
+msgstr "Untersttzte Benutzeroberflche"
 
 #: ../lib/plugin/TeX2png.php:29
 msgid "TeX2png"
@@ -3964,6 +4167,14 @@
 msgstr ""
 "Das geht leider nicht. Diese PHP Version kann keine PNG Bilder erzeugen."
 
+#: ../lib/plugin/Template.php:61
+msgid "Template"
+msgstr "Benutzeroberflche"
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr ""
@@ -3987,11 +4198,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr "Einbetten einer externen Webseite im Body dieser Wiki Seite."
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr "%s Argument fehlt"
-
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
 msgstr "Eingebettete Seite"
@@ -4074,19 +4280,6 @@
 msgid "Translate"
 msgstr "bersetzen"
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
 msgstr "UnterseitenEntfalten"
@@ -4167,22 +4360,6 @@
 msgid "Can't open the upload logfile."
 msgstr "Die Upload-Logdatei konnte nicht geffnet worden."
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr "BenutzerEinstellungen"
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
@@ -4191,11 +4368,6 @@
 "Fehler: Ihre Homepage Seite mu ein gltiges WikiWord sein. Die "
 "BenutzerEinstellungen knnen deshalb leider nicht gespeichert werden."
 
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr "Nachricht"
-
 #: ../lib/plugin/UserPreferences.php:105
 msgid "Your UserPreferences have been successfully deleted."
 msgstr "Ihre BenutzerEinstellungen wurden erfolgreich gelscht."
@@ -4204,14 +4376,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr "Ja"
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr "Falsches Password. Noch einmal eingeben."
@@ -4279,7 +4443,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr "Legende"
 
@@ -4403,7 +4567,7 @@
 #: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr ""
-"Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?"
+"Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?"
 
 #: ../lib/plugin/WikiAdminChmod.php:153
 msgid "Chmod"
@@ -4447,7 +4611,7 @@
 #: ../lib/plugin/WikiAdminSetAcl.php:100
 #, php-format
 msgid "Access denied to change page '%s'."
-msgstr "Zugang veweigert um Seite '%s' zu ndern."
+msgstr "Zugang verweigert um Seite '%s' zu ndern."
 
 #: ../lib/plugin/WikiAdminChown.php:74
 #, php-format
@@ -4471,7 +4635,7 @@
 #: ../lib/plugin/WikiAdminChown.php:156
 msgid "Are you sure you want to permanently chown the selected files?"
 msgstr ""
-"Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?"
+"Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?"
 
 #: ../lib/plugin/WikiAdminChown.php:160
 msgid "Chown selected pages"
@@ -4488,43 +4652,43 @@
 
 #: ../lib/plugin/WikiAdminMarkup.php:37
 msgid "WikiAdminMarkup"
-msgstr "WikiAdminFormattierung"
+msgstr "WikiAdminFormatierung"
 
 #: ../lib/plugin/WikiAdminMarkup.php:41
 msgid "Change the markup type of selected pages."
-msgstr "ndere den Formattierungstyp aller ausgewhlte Seiten."
+msgstr "ndere den Formatierungstyp aller ausgewhlte Seiten."
 
 #: ../lib/plugin/WikiAdminMarkup.php:78
 #, php-format
 msgid "WikiAdminMarkup from %s to %s"
-msgstr "WikiAdminFormattierung von %s auf %s"
+msgstr "WikiAdminFormatierung von %s auf %s"
 
 #: ../lib/plugin/WikiAdminMarkup.php:82
 #, php-format
 msgid "change page '%s' to markup type '%s'."
-msgstr "Formattierung der Seite '%s' auf '%s' gendert."
+msgstr "Formatierung der Seite '%s' auf '%s' gendert."
 
 #: ../lib/plugin/WikiAdminMarkup.php:86
 #, php-format
 msgid "Couldn't change page '%s' to markup type '%s'."
-msgstr "Konnte die Formattierung der Seite '%s' nicht auf '%s' ndern."
+msgstr "Konnte die Formatierung der Seite '%s' nicht auf '%s' ndern."
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
 #: ../lib/plugin/WikiAdminMarkup.php:103
 msgid "PhpWikiAdministration/Markup"
-msgstr "PhpWikiSystemverwalten/Formattierung"
+msgstr "PhpWikiSystemverwalten/Formatierung"
 
 #: ../lib/plugin/WikiAdminMarkup.php:152
 msgid ""
 "Are you sure you want to permanently change the markup type of the selected "
 "files?"
 msgstr ""
-"Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?"
+"Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?"
 
 #: ../lib/plugin/WikiAdminMarkup.php:156
 msgid "Change markup type"
-msgstr "ndere Formattierungs-Typ"
+msgstr "ndere Formatierungs-Typ"
 
 #: ../lib/plugin/WikiAdminMarkup.php:157
 msgid "Select the pages to change the markup type:"
@@ -4532,7 +4696,7 @@
 
 #: ../lib/plugin/WikiAdminMarkup.php:179
 msgid "Change markup"
-msgstr "ndere Formattierung"
+msgstr "ndere Formatierung"
 
 #: ../lib/plugin/WikiAdminRemove.php:40
 msgid "WikiAdminRemove"
@@ -4571,7 +4735,7 @@
 #: ../lib/plugin/WikiAdminRemove.php:190
 msgid "Are you sure you want to permanently remove the selected files?"
 msgstr ""
-"Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich lschen wollen?"
+"Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich lschen wollen?"
 
 #: ../lib/plugin/WikiAdminRemove.php:193
 msgid "Remove selected pages"
@@ -4642,7 +4806,7 @@
 #: ../lib/plugin/WikiAdminRename.php:168
 msgid "Are you sure you want to permanently rename the selected files?"
 msgstr ""
-"Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich umbenennen wollen?"
+"Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich umbenennen wollen?"
 
 #: ../lib/plugin/WikiAdminRename.php:173
 msgid "Select the pages to rename:"
@@ -4658,7 +4822,7 @@
 
 #: ../lib/plugin/WikiAdminRename.php:215
 msgid "Case insensitive?"
-msgstr "Gross/Kleinschreibung beachten?"
+msgstr "Gro-/Kleinschreibung beachten?"
 
 #: ../lib/plugin/WikiAdminRename.php:218
 msgid "Change pagename in all linked pages also?"
@@ -4709,7 +4873,7 @@
 "Are you sure you want to permanently search & replace text in the selected "
 "files?"
 msgstr ""
-"Sind Sie sicher, da Sie alle Wrter in den angegebenen Seiten ersetzen "
+"Sind Sie sicher, dass Sie alle Wrter in den angegebenen Seiten ersetzen "
 "wollen?"
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:189
@@ -4793,7 +4957,7 @@
 msgid ""
 "Are you sure you want to permanently change access to the selected files?"
 msgstr ""
-"Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?"
+"Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?"
 
 #: ../lib/plugin/WikiAdminSetAcl.php:215
 msgid "Selected Pages: "
@@ -4856,7 +5020,7 @@
 msgid "WikiAdminUtils says:"
 msgstr "WikiAdminUtils sagt:"
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr "OK"
 
@@ -4931,7 +5095,7 @@
 msgid "Verification Status"
 msgstr "Besttigungs-Status"
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr "ndere Besttigungs-Status"
 
@@ -4970,11 +5134,11 @@
 msgid "WikiForm: %s: unknown action"
 msgstr "WikiForm: %s: unbekannte Aktion"
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
+#: ../lib/plugin/WikiFormRich.php:181
 msgid "name"
 msgstr "Name"
 
@@ -5166,8 +5330,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5187,7 +5351,7 @@
 msgid "FrameIncludePlugin"
 msgstr "FrameEinbettenPlugin"
 
-# (Im Wortsinne heisst das eigentlich: "jngste = eben gemachte
+# (Im Wortsinne heit das eigentlich: "jngste = eben gemachte
 # nderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
 #: ../lib/plugin/_WikiTranslation.php:67
@@ -5236,7 +5400,7 @@
 
 #: ../lib/plugin/_WikiTranslation.php:79
 msgid "PageGroupTest"
-msgstr "SeitenGruppeTest"
+msgstr "SeitenGruppenTest"
 
 #: ../lib/plugin/_WikiTranslation.php:80
 msgid "PageGroupTest/Four"
@@ -5387,8 +5551,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5473,115 +5637,115 @@
 msgid "Back to the previous page."
 msgstr "Zurck zur vorigen Seite."
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 msgid "Invalid image size"
 msgstr "Ungltige Bildgre"
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr "phpwiki: URL Formfehler"
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr "Seite sperren, um den Link zu aktivieren"
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr "%s: Ungltiger Seitenname: %s"
 
 # z.B. fhrende Leerzeichen
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr "Fhrende %s nicht erlaubt"
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr "Steuerzeichen nicht erlaubt"
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
 msgstr "zu lang"
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr "Ungltiges Zeichen %s entfernt"
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
 msgstr "Version nicht gefunden"
 
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "Leider ist keine Version %d von %s in der Datenbank."
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr "Ungltige Version"
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, php-format
 msgid "%s b"
 msgstr "%s B"
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr "%s Bytes"
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr "%s k"
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr "%s KB (%s Bytes)"
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr "%s: Ungltiger Index in Array"
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s ist leer."
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr "Konnte Verzeichnis %s nicht zum Lesen ffnen"
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, php-format
 msgid "... (first %s words)"
 msgstr "... (erste %s Wrter)"
@@ -5628,7 +5792,7 @@
 msgid "CREATED"
 msgstr "ERZEUGT"
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr ""
 
@@ -5649,130 +5813,134 @@
 msgid "check for new session.sess_ip column"
 msgstr "prfe auf neue Spalte session.sess_ip column"
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr "HINZU"
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr "prfe auf mysql session.sess_id Korrektheit"
 
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 msgid "fixed"
 msgstr "Gendert"
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr "prfe mysql LOCK TABLE Rechte"
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr "FEHLER"
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "version <em>%s</em> nicht betroffen"
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr "prfe auf mysql page.id auto_increment Flag"
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr "prfe auf mysql 4.1.x/5.0.0 Binrsuch-Problem (nur Windows)"
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, php-format
 msgid "version <em>%s</em>"
 msgstr "version <em>%s</em>"
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 msgid "not affected"
 msgstr "nicht betroffen"
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr "AUSGEBESSERT"
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr "prfe auf ACCESS_LOG_SQL Passwrter in POST Requests"
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr "DB Admin Benutzername:"
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 msgid "DB admin password:"
 msgstr "DB Admin passwort:"
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr "KONVERTIERE"
 
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr ""
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr "Kann %s nicht nach %s verschieben"
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, php-format
 msgid "%s is not writable"
 msgstr "%s ist nicht nderbar"
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr ""
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -5805,27 +5973,27 @@
 msgid "Members:"
 msgstr "Mitglieder:"
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
-"Kann Daten nicht dekomprimieren: Die zlib Bibiliothek wurde in PHP nicht "
+"Kann Daten nicht dekomprimieren: Die zlib-Bibliothek wurde in PHP nicht "
 "installiert/aktiviert."
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
-msgstr "Konnte zip Datei %s nich ffnen zum lesen"
+msgstr "Konnte ZIP-Datei %s nicht zum Lesen ffnen"
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
-msgstr "Unerwartetes Dateiende (EOF-Fehler) in ZIP Datei"
+msgstr "Unerwartetes Dateiende (EOF-Fehler) in ZIP-Datei"
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
 msgstr "[%d] Siehe [%s]"
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr "Funoten"
 
@@ -5847,7 +6015,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5924,8 +6092,8 @@
 msgstr "Die aktuelle Version ansehen"
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr ""
@@ -5944,15 +6112,15 @@
 msgstr "Texteingabe Fenster"
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr "Achtung: Sie bearbeiten eine alte Version."
 
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr ""
@@ -5960,22 +6128,22 @@
 "berschrieben."
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr "H."
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr "Br."
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr "Justieren"
@@ -5984,84 +6152,76 @@
 msgid "Page Content: "
 msgstr "Inhalt: "
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr "Kleinere nderung."
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr "Alte Formatierungssyntax verwenden"
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Siehe %s Tips frs Edieren."
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr "GuterStil"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr "AlteTextFormatierungsRegeln"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr "bersicht"
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr "TextFormatierungsRegeln"
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr "WieManWikiBenutzt"
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr "SandKasten"
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -6098,11 +6258,6 @@
 msgid "Enter your UserId to sign in"
 msgstr "Tragen Sie bitte fr die Anmeldung im Wiki Ihren Benutzernamen ein"
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-msgid "Sign in:"
-msgstr "Anmelden:"
-
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
 #: ../themes/default/templates/comment.tmpl:18
@@ -6123,7 +6278,7 @@
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr "Drucker"
@@ -6132,13 +6287,13 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr "Modern"
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
 msgstr "Obere u. untere Werkzeugleisten"
 
@@ -6276,14 +6431,14 @@
 msgstr "Seitentyp:"
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 msgid "Diff previous Revision"
 msgstr "Diff zu voriger Version"
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 msgid "Diff previous Author"
@@ -6361,14 +6516,14 @@
 msgid "Page Execution took %s seconds"
 msgstr "Ausfhrung dieser Seite dauerte %s Sekunden"
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr "Ich mache nur kleinere nderungen. Protokolliere stattdessen in %s."
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr "Texteingabe Fenstergre"
@@ -6499,7 +6654,7 @@
 #: ../themes/default/templates/homepage.tmpl:10
 #, php-format
 msgid "You can personalize various settings in %s."
-msgstr "Sie knnen knnen einige Eintellungen in %s individuell gestalten."
+msgstr "Sie knnen einige Einstellungen in %s individuell gestalten."
 
 #: ../themes/default/templates/homepage.tmpl:13
 msgid "(Your preferences are stored as hidden data within this page)."
@@ -6522,8 +6677,7 @@
 "Sie knnen sich mit jedem gewnschten [WikiWort|SeitenErzeugen] als "
 "Benutzernamen ins Wiki eintragen. (Auch %s u. deutsche Umlaute sind "
 "zulssig). Der Benutzername wird in Neuestenderungen als Link auf Ihre "
-"Homepage verwendet. Sie knnen Ihre Seite in die Browser Favoriten eintragen "
-"oder auch gleich als URL verwenden: ~http://www.wikiname.de/~IhrName"
+"Homepage verwendet."
 
 #: ../themes/default/templates/login.tmpl:60
 msgid ""
@@ -6569,7 +6723,7 @@
 #: ../themes/default/templates/online.tmpl:22
 #, php-format
 msgid "Our users created a total of %d pages."
-msgstr "Unsere Benutezr erzeugten insgesamt %d Seiten."
+msgstr "Unsere Benutzer erzeugten insgesamt %d Seiten."
 
 #: ../themes/default/templates/online.tmpl:23
 #, php-format
@@ -6764,7 +6918,7 @@
 #: ../themes/default/templates/userprefs.tmpl:160
 msgid "Note, that user accounts with bouncing emails will be disabled."
 msgstr ""
-"Beachten Sie bitte, da Benutzer mit ungltigen E-Mail Addressen gelscht "
+"Beachten Sie bitte, dass Benutzer mit ungltigen E-Mail-Addressen gelscht "
 "werden."
 
 #: ../themes/default/templates/userprefs.tmpl:163
@@ -6805,9 +6959,9 @@
 "Hide or show LinkIcons (if supported by the current theme). Useful for text-"
 "only browsers or slow connections."
 msgstr ""
-"LinkIcons ausblenden oder einblenden (unter Voraussetzung da es mit dem "
-"ausgewhlter Darstellung untersttzt wurde). Werde wertvoll sein fr die die "
-"mit Text-only browsers anschauen oder langsamer Konnexionen."
+"LinkIcons ausblenden oder einblenden (unter der Voraussetzung, dass es durch "
+"die ausgewhlte Darstellung untersttzt wird). Dies ist sinnvoll fr Text-"
+"Browser und langsame Verbindungen."
 
 #: ../themes/default/templates/userprefs.tmpl:187
 #, php-format
@@ -6900,12 +7054,30 @@
 msgid "TermsOfUse"
 msgstr "BenutzungsBedingungen"
 
+#~ msgid "Sign in:"
+#~ msgstr "Anmelden:"
+
+#~ msgid "AUTH_GROUP_FILE not defined"
+#~ msgstr "AUTH_GROUP_FILE nicht definiert"
+
+#~ msgid "LDAP_AUTH_HOST not defined"
+#~ msgstr "LDAP_AUTH_HOST nicht definiert"
+
+#~ msgid "db type:"
+#~ msgstr "Dbtyp:"
+
+#~ msgid "timeout:"
+#~ msgstr "Zeitberschreitung:"
+
+#~ msgid "Category"
+#~ msgstr "Kategorie"
+
+#~ msgid "Topic"
+#~ msgstr "Thema"
+
 #~ msgid "Replaced link in %s."
 #~ msgstr "Link in %s ersetzt."
 
-#~ msgid "(no regex, case-sensitive)"
-#~ msgstr "(kein regulrer Ausdruck, Gross/Kleinschreibung beachten)"
-
 #~ msgid "Rename selected pages."
 #~ msgstr "Ausgewhlte Seiten umbenennen."
 
@@ -6946,7 +7118,7 @@
 #, fuzzy
 #~ msgid "Are you sure you want to save these access restrictions?"
 #~ msgstr ""
-#~ "Sind Sie sicher, da Sie die ausgewhlen Seiten wirklich ndern wollen?"
+#~ "Sind Sie sicher, dass Sie die ausgewhlen Seiten wirklich ndern wollen?"
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
@@ -7011,9 +7183,6 @@
 #~ msgid "No opinion"
 #~ msgstr "Keine Bewertung"
 
-#~ msgid "Unable to bind LDAP server %s"
-#~ msgstr "Konnte nicht LDAP Server %s verbinden"
-
 #~ msgid "Unable to connect to LDAP server "
 #~ msgstr "LDAP Server nicht gefunden"
 
@@ -7047,7 +7216,7 @@
 #~ msgid "Click to sort"
 #~ msgstr "Klicken Sie zu sortieren"
 
-# (Im Wortsinne heisst das eigentlich: "jngste = eben gemachte
+# (Im Wortsinne heit das eigentlich: "jngste = eben gemachte
 # nderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
 #~ msgid "Recent Changes"
@@ -7108,7 +7277,7 @@
 #~ msgstr "um HTML Seiten dieses Wikis zu ziehen"
 
 #~ msgid "dump serial pages from this wiki"
-#~ msgstr "um serienmssige Seiten dieses Wikis als Dateien zu speichern"
+#~ msgstr "um serienmige Seiten dieses Wikis als Dateien zu speichern"
 
 #~ msgid "create pages in this wiki"
 #~ msgstr "um Seiten in diesem Wiki zu erzeugen"
@@ -7136,9 +7305,6 @@
 #~ msgid "Selected"
 #~ msgstr "Ausgewhlt"
 
-#~ msgid "Removed page '%s' succesfully."
-#~ msgstr "Seite %s erfolgreich gelscht."
-
 #~ msgid "edit user preferences in this wiki"
 #~ msgstr "um Benutzer Einstellungen in diesem Wiki zu bearbeiten"
 
@@ -7240,7 +7406,7 @@
 #~ msgstr "(Version %s. zuletzt am %s gespeichert)"
 
 #~ msgid "previous major revision"
-#~ msgstr "Vorige grssere Revision"
+#~ msgstr "Vorige grere Revision"
 
 #~ msgid "Use your browser's <b>Back</b> button to go back to the edit page."
 #~ msgstr ""
@@ -7434,7 +7600,7 @@
 #~ "You must set the administrator account and password before you can log in."
 #~ msgstr ""
 #~ "Sie mssen zuerst den SystemAdministratorZugang mit einem Passwort "
-#~ "schtzen,bevor Sie sich anmelden knnen."
+#~ "schtzen, bevor Sie sich anmelden knnen."
 
 #~ msgid "You can log in using any valid WikiWord as a user ID."
 #~ msgstr ""
@@ -7443,7 +7609,7 @@
 
 #~ msgid "(Any password will work, except, of course for the admin user.)"
 #~ msgstr ""
-#~ "(Jedes Wort wird als Passwort akzeptiert, ausser demjeingen fr den "
+#~ "(Jedes Wort wird als Passwort akzeptiert, auer demjeingen fr den "
 #~ "SystemAdministrator.)"
 
 #~ msgid "RSS available"
diff -ruN 11p1/locale/po/es.po 12p3/locale/po/es.po
--- 11p1/locale/po/es.po	2005-09-18 07:12:26.000000000 -0500
+++ 12p3/locale/po/es.po	2006-06-18 06:19:37.000000000 -0500
@@ -3,15 +3,15 @@
 # Copyright (C) Copyright 1999, 2000, 2001, 2002 ThePhpWikiProgrammingTeam.
 # Copyright (C) 2000 Sandino Araico Snchez <sandino@sandino.net>.
 # Sandino Araico Snchez <sandino@sandino.net>, 2000.
-#
 # Ultima modificacin por Pablo Roca (proca@clavo.net)
 # version 1.3.4-pre
+# Reini google translated the rest. 1.3.11p1
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <proca@clavo.net>\n"
 "Language-Team: \n"
@@ -21,43 +21,53 @@
 "Date: 2001-01-12 16:10-0500\n"
 "From:  <proca@clavo.net>\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+"Mecanografan en la unin mal hecha de la palabra de la verificacin... le "
+"un BOT?"
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr "Mecanografe la palabra arriba:"
+
 #: ../lib/DbSession.php:50
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
-msgstr ""
+msgstr "Su DB '%s' backend de WikiDB no se puede utilizar para DbSession."
 
 #: ../lib/DbSession.php:51
 #, php-format
 msgid "Set USE_DB_SESSION to false."
-msgstr ""
+msgstr "Fije USE_DB_SESSION a falso."
 
 #: ../lib/DbaDatabase.php:18
 #, php-format
 msgid "The DBA handler %s is unsupported!"
-msgstr ""
+msgstr "El tratante %s del DBA est sin apoyo!"
 
 #: ../lib/DbaDatabase.php:19
 #, php-format
 msgid "Supported handlers are: %s"
-msgstr ""
+msgstr "Los tratantes apoyados son: %s"
 
 #: ../lib/EditToolbar.php:42
 msgid "Undo"
-msgstr ""
+msgstr "Deshaga"
 
 # lib/msql.php:237 lib/msql.php:312
 #: ../lib/EditToolbar.php:48
 msgid "Undo disabled"
-msgstr ""
+msgstr "Deshaga lisiado"
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
-msgstr ""
+msgstr "Busque Y Substituya"
 
 # lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -72,27 +82,27 @@
 
 #: ../lib/EditToolbar.php:61
 msgid "Replace with"
-msgstr ""
+msgstr "Substituya por"
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr "Cierre"
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
-msgstr ""
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
+msgstr "Subsecuencia \"%s\" tiempos encontrados de %s.  Substituya por \"%s\"?"
 
 #: ../lib/EditToolbar.php:82
 #, php-format
@@ -101,151 +111,141 @@
 
 #: ../lib/EditToolbar.php:105
 msgid "Operation undone"
-msgstr ""
+msgstr "Operacin deshecha"
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
-msgstr ""
+msgstr "Texto en negrilla"
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
-msgstr ""
+msgstr "Texto del itlico"
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
-msgstr ""
+msgstr "etiqueta opcional | NombreDePgina"
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 msgid "Link to page"
-msgstr ""
+msgstr "Acoplamiento a la pgina"
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
-msgstr ""
+msgstr "etiqueta opcional | http://www.example.com"
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
-msgstr ""
+msgstr "Acoplamiento externo (recuerde http://  prefijo)"
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
-msgstr ""
+msgstr "Texto del ttulo"
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
-msgstr ""
+msgstr "Ttulo del nivel 1"
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr ""
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
-msgstr ""
+msgstr "Imagen encajada"
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
-msgstr ""
+msgstr "Inserte el texto sin formatear aqu"
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
-msgstr ""
+msgstr "No haga caso del formato del wiki"
 
 # lib/pageinfo.php:70
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 msgid "Your signature"
-msgstr ""
+msgstr "Su firma"
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr "Linea horizontal"
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr "Guardar"
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
-msgstr ""
+msgstr "Chasque un botn para conseguir un texto del ejemplo"
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 msgid "Undo Search & Replace"
-msgstr ""
+msgstr "Deshaga La Bsqueda Y Substityala"
 
 # lib/diff.php:997
-#: ../lib/EditToolbar.php:267
-msgid "Category"
-msgstr "Categora"
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr "Asunto"
-
-# lib/diff.php:997
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 msgid "AddCategory"
 msgstr "AgregueCategora"
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr "Relleno Categoras (doble-tecleo)"
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr "Relleno"
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 msgid "AddPlugin"
 msgstr "AgreguePlugin"
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr "Relleno Plugin (doble-tecleo)"
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 msgid "AddPageLink"
-msgstr ""
+msgstr "AgregueElAcoplamientoDeLaPgina"
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
-msgstr ""
+msgstr "Inserte el AcoplamientoDeLaPgina (doble-tecleo)"
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
-msgstr ""
+msgstr "AgregueLaPlantilla"
 
-#: ../lib/EditToolbar.php:363
-#, fuzzy
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
-msgstr "Relleno Categoras (doble-tecleo)"
+msgstr "Inserte la plantilla (doble-tecleo)"
 
 #: ../lib/ErrorManager.php:210
 #, php-format
 msgid "%s: error while handling error:"
-msgstr ""
+msgstr "%s: error mientras que maneja error:"
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: fichero no encontrado"
 
 # lib/diff.php:997
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 msgid "CategoryGroup"
 msgstr "GrupoCategora"
 
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sin un nombre"
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -253,12 +253,12 @@
 
 #: ../lib/InlineParser.php:336
 msgid "Invalid [] syntax ignored"
-msgstr ""
+msgstr "[] el sintaxis invlido no hizo caso"
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
-msgstr ""
+msgstr "el color desconocido %s no hizo caso"
 
 #: ../lib/PageList.php:104
 #, php-format
@@ -276,20 +276,20 @@
 
 #: ../lib/PageList.php:298
 msgid "Click to de-/select all pages"
-msgstr ""
+msgstr "Tecleo para de-/seleccionar todas las pginas"
 
 #: ../lib/PageList.php:366 ../lib/plugin/UnfoldSubpages.php:132
 #, php-format
 msgid " ... first %d bytes"
-msgstr ""
+msgstr " ... primeros octetos de %d"
 
 #: ../lib/PageList.php:372
 #, php-format
 msgid " ... around %s"
-msgstr ""
+msgstr " ... alrededor de %s"
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, php-format
 msgid "%s not found"
 msgstr "%s: fichero no encontrado"
@@ -301,7 +301,7 @@
 
 #: ../lib/PageList.php:555 ../lib/plugin/FullTextSearch.php:107
 msgid "<no matches>"
-msgstr ""
+msgstr "<ningunos fsforos>"
 
 #: ../lib/PageList.php:934 ../lib/plugin/WikiAdminSearchReplace.php:171
 msgid "Content"
@@ -322,7 +322,7 @@
 msgstr "Nmero de hits"
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 msgid "Size"
 msgstr "Tamao"
@@ -342,17 +342,17 @@
 #: ../themes/default/templates/info.tmpl:65
 #: ../themes/shamino_com/templates/info.tmpl:71
 msgid "Last Author"
-msgstr ""
+msgstr "Autor Pasado"
 
 #: ../lib/PageList.php:968 ../lib/WikiGroup.php:36
 msgid "Owner"
-msgstr ""
+msgstr "Dueo"
 
 #: ../lib/PageList.php:970 ../lib/WikiGroup.php:37
 msgid "Creator"
-msgstr ""
+msgstr "Creador"
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -366,11 +366,11 @@
 
 #: ../lib/PageList.php:980
 msgid "Minor Edit"
-msgstr ""
+msgstr "El Menor de edad Corrige"
 
 #: ../lib/PageList.php:980
 msgid "minor"
-msgstr ""
+msgstr "de menor importancia"
 
 #: ../lib/PageList.php:982
 msgid "Markup"
@@ -379,31 +379,31 @@
 #: ../lib/PageList.php:1239 ../lib/plugin/WantedPagesOld.php:178
 #, php-format
 msgid "Columns: %s."
-msgstr ""
+msgstr "Columnas: %s."
 
 #: ../lib/PagePerm.php:292
 msgid "List this page and all subpages"
-msgstr ""
+msgstr "Enumere esta pgina y todas las pginas secundaria"
 
 #: ../lib/PagePerm.php:293
 msgid "View this page and all subpages"
-msgstr ""
+msgstr "Opinin esta pgina y todas las pginas secundaria"
 
 #: ../lib/PagePerm.php:294
 msgid "Edit this page and all subpages"
-msgstr ""
+msgstr "Corrija esta pgina y todas las pginas secundaria"
 
 #: ../lib/PagePerm.php:295
 msgid "Create a new (sub)page"
-msgstr ""
+msgstr "Cree una pgina (secundaria) nueva"
 
 #: ../lib/PagePerm.php:296
 msgid "Download the page contents"
-msgstr ""
+msgstr "Descargue el contenido de la pgina"
 
 #: ../lib/PagePerm.php:297
 msgid "Change page attributes"
-msgstr ""
+msgstr "Cambie las cualidades de la pgina"
 
 #: ../lib/PagePerm.php:298
 msgid "Remove this page"
@@ -412,48 +412,48 @@
 #: ../lib/PagePerm.php:347
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
-msgstr ""
+msgstr "Tipo sin apoyo %s del acceso del ACL no hecho caso."
 
 #: ../lib/PagePerm.php:558
 msgid "Access"
-msgstr ""
+msgstr "Acceso"
 
 #: ../lib/PagePerm.php:560
 msgid "Group/User"
-msgstr ""
+msgstr "Grupo/Usuario"
 
 #: ../lib/PagePerm.php:561
 msgid "Grant"
-msgstr ""
+msgstr "Concesin"
 
 #: ../lib/PagePerm.php:562
 msgid "Del/+"
-msgstr ""
+msgstr "-/+"
 
 #: ../lib/PagePerm.php:563 ../lib/plugin/PluginManager.php:90
 #: ../lib/plugin/WikiAdminSetAcl.php:230
 msgid "Description"
-msgstr ""
+msgstr "Descripcin"
 
 #: ../lib/PagePerm.php:584
 msgid "Add this ACL"
-msgstr ""
+msgstr "Agregue este ACL"
 
 #: ../lib/PagePerm.php:608
 msgid "Allow / Deny"
-msgstr ""
+msgstr "Permita/Niegue"
 
 #: ../lib/PagePerm.php:620
 msgid "Delete this ACL"
-msgstr ""
+msgstr "Suprima este ACL"
 
 #: ../lib/PagePerm.php:646
 msgid "add "
-msgstr ""
+msgstr "agregue "
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
-msgstr ""
+msgid "Check to add this ACL"
+msgstr "Compruebe para agregar este ACL"
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
 #: ../lib/plugin/InterWikiSearch.php:55 ../lib/plugin/WantedPages.php:54
@@ -465,13 +465,15 @@
 #: ../themes/shamino_com/templates/info.tmpl:149
 #: ../themes/shamino_com/templates/info.tmpl:150
 msgid "InterWikiMap"
-msgstr ""
+msgstr "InterMapaDeWiki"
 
 #: ../lib/PageType.php:140
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
+"ADVERTENCIA: Se abre la pgina de InterMapaDeWiki, tan no usando esos "
+"acoplamientos."
 
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -480,12 +482,12 @@
 #: ../themes/default/templates/navbar.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:13
 msgid "Discussion"
-msgstr ""
+msgstr "Discusin"
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
-msgstr ""
+msgstr "Cargamento InterMapaDeWiki del archivo externo %s."
 
 #: ../lib/PageType.php:372
 msgid "Moniker"
@@ -496,17 +498,17 @@
 msgstr ""
 
 # lib/stdlib.php:384 lib/stdlib.php:445
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -515,37 +517,39 @@
 msgid "RecentChanges"
 msgstr "CambiosRecientes"
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
-msgstr ""
+msgstr "Error del upload: archivo demasiado grande"
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
-msgstr ""
+msgstr "Error del upload: el archivo recieved solamente parcialmente"
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
-msgstr ""
+msgstr "Error del upload: ningn archivo seleccionado"
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
-msgstr ""
+msgstr "Error del upload: error desconocido #"
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
-msgstr ""
+msgstr "%s no es escribible."
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
-msgstr ""
+msgstr "El fichero de diario del acceso de PhpWiki"
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
+"Asegrese por favor de que %s sea escribible, o redefina %s en config/config."
+"ini."
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, php-format
 msgid "the file '%s'"
 msgstr "el archivo %s"
@@ -555,80 +559,84 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, php-format
 msgid "Unsupported argument: %s=%s"
+msgstr "Discusin sin apoyo: %s=%s"
+
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
 msgstr ""
 
-#: ../lib/Theme.php:392
+#: ../lib/Theme.php:388
 msgid "Never edited"
-msgstr ""
+msgstr "Nunca corregido"
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
-msgstr ""
+msgstr "%s en %s"
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, php-format
 msgid "Version %s, saved %s"
-msgstr "versin %s de %s"
+msgstr "versin %s, %s ahorrado"
 
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, php-format
 msgid "Last edited %s"
 msgstr "Editada por ltima vez %s."
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "versin %s de %s"
 
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, php-format
 msgid "Last edited on %s"
 msgstr "Editada por ltima vez %s."
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr "hoy"
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr "ayer"
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, php-format
 msgid "Owner: %s"
-msgstr ""
+msgstr "Dueo: %s"
 
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "por %s"
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
-msgstr ""
+msgstr "Acoplamiento vaco a: %s"
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr "Cree: %s"
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
-msgstr ""
+msgstr "'%s': Mal nombre de la pgina"
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -638,12 +646,12 @@
 msgid "Edit"
 msgstr "Editar"
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr "Diferencia"
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -658,29 +666,31 @@
 #: ../themes/smaller/templates/signin.tmpl:16
 #: ../themes/smaller/templates/signin.tmpl:27
 msgid "Sign Out"
-msgstr ""
+msgstr "Registro Hacia fuera"
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
-msgstr ""
+msgstr "Muestra Adentro"
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr "Bloquear Pgina"
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr "Desbloquear Pgina"
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr "Borrar Pgina"
 
 # lib/fullsearch.php:48
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -704,100 +714,101 @@
 msgstr "BsquedaDeTtulos"
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s: indefinido"
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
-msgstr ""
+msgstr "Acoplamientos Relacionados"
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
-msgstr ""
+msgstr "Acoplamientos Externos"
 
-#: ../lib/WikiDB.php:230
+#: ../lib/WikiDB.php:233
 #, php-format
 msgid "Removed by: %s"
 msgstr "Borrar par: %s"
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, php-format
 msgid "Page removed %s"
 msgstr "Pgina borrar %s"
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
-msgstr ""
+msgstr "Pagine la notificacin del cambio de %s enviado a %s"
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr ""
+"Error De la Notificacin Del Cambio De la Pgina: No poda enviar %s a %s"
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, php-format
 msgid "renamed from %s"
-msgstr ""
+msgstr "retitulado de %s"
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
-msgstr ""
+msgstr "WikiDB::renamePage() no todava puesto en ejecucio'n para este backend"
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
-msgstr ""
+msgstr "%s: La fecha de la nueva revisin es %s"
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 msgid "Optimizing database"
-msgstr ""
+msgstr "Base de datos ptima"
 
 # lib/pageinfo.php:21
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 msgid "Page change"
-msgstr ""
+msgstr "Cambio de la pgina"
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 msgid "New page"
 msgstr "Pgina nueva"
 
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, php-format
 msgid "Edited by: %s"
 msgstr "Editar: %s"
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, php-format
 msgid "Page rename %s to %s"
-msgstr ""
+msgstr "La pgina retitula %s a %s"
 
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Describe %s aqu."
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
-msgstr ""
+msgstr "Oops! La revisin %s de %s se parece haber sido suprimida!"
 
 #: ../lib/WikiDB/backend/dba.php:22 ../lib/WikiDB/backend/dba.php:24
 #, php-format
 msgid "%s: Can't open dba database"
-msgstr ""
+msgstr "%s: No puede abrir la base de datos del DBA"
 
 #: ../lib/WikiDB/backend/file.php:111
 #, php-format
 msgid "'%s': corrupt file"
-msgstr ""
+msgstr "'%s': archivo corrupto"
 
 #: ../lib/WikiDB/dba.php:16 ../lib/WikiDB/file.php:47
 #, php-format
@@ -805,22 +816,25 @@
 "The %s files are in the %s directory. Please read the INSTALL file and move "
 "the database to a permanent location or risk losing all the pages!"
 msgstr ""
+"Los archivos de %s estn en el directorio de %s. Lea por favor el archivo "
+"de la INSTALACIN y mueva la base de datos a una localizacin permanente o "
+"arriesgela el perder de todas las pginas!"
 
 #: ../lib/WikiGroup.php:26 ../lib/WikiGroup.php:131
 msgid "No or unsupported GROUP_METHOD defined"
-msgstr ""
+msgstr "No o GROUP_METHOD sin apoyo definido"
 
 #: ../lib/WikiGroup.php:29
 msgid "Every"
-msgstr ""
+msgstr "Cada"
 
 #: ../lib/WikiGroup.php:30
 msgid "Anonymous Users"
-msgstr ""
+msgstr "Usuarios Annimos"
 
 #: ../lib/WikiGroup.php:31
 msgid "Bogo Users"
-msgstr ""
+msgstr "Usuarios Bogo"
 
 #: ../lib/WikiGroup.php:32
 msgid "HasHomePage"
@@ -828,75 +842,77 @@
 
 #: ../lib/WikiGroup.php:33
 msgid "Signed Users"
-msgstr ""
+msgstr "Usuarios Firmados"
 
 #: ../lib/WikiGroup.php:34
 msgid "Authenticated Users"
-msgstr ""
+msgstr "Usuarios Authenticados"
 
 #: ../lib/WikiGroup.php:35
 msgid "Administrators"
-msgstr ""
+msgstr "Administradores"
 
 #: ../lib/WikiGroup.php:185 ../lib/WikiGroup.php:232 ../lib/WikiGroup.php:314
 #: ../lib/WikiGroup.php:373 ../lib/WikiGroup.php:389
 #, php-format
 msgid "Method '%s' not implemented in this GROUP_METHOD %s"
-msgstr ""
+msgstr "Mtodo ' %s' no puesto en ejecucio'n en este GROUP_METHOD %s"
 
 #: ../lib/WikiGroup.php:217
 #, php-format
 msgid "Undefined method %s for special group %s"
-msgstr ""
+msgstr "Mtodo indefinido %s para el grupo especial %s"
 
 #: ../lib/WikiGroup.php:358
 #, php-format
 msgid "Unknown special group '%s'"
-msgstr ""
+msgstr "Grupo especial desconocido '%s'"
 
 #: ../lib/WikiGroup.php:517
 #, php-format
 msgid "Group page '%s' does not exist"
-msgstr ""
+msgstr "La pgina '%s' del grupo no existe"
 
 #: ../lib/WikiGroup.php:576
 #, php-format
 msgid "Group %s does not exist"
-msgstr ""
+msgstr "El grupo %s no existe"
 
 #: ../lib/WikiGroup.php:616
 msgid "No or not enough GROUP_DB SQL statements defined"
-msgstr ""
+msgstr "No o no bastantes declaraciones de GROUP_DB SQL defini"
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
-msgstr ""
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, php-format
+msgid "%s: not defined"
+msgstr "%s: no definido"
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
-msgstr ""
+msgstr "No puede abrir AUTH_GROUP_FILE %s"
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
-msgstr ""
+#: ../lib/WikiGroup.php:951
+#, fuzzy, php-format
+msgid "%s not defined"
+msgstr "%s: no definido"
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
-msgstr ""
+msgstr "Ningn LDAP en esta versin de PHP"
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
-msgstr ""
+msgstr "Incapaz conectar con el servidor %s de LDAP"
 
 #: ../lib/WikiPlugin.php:88
 msgid "n/a"
-msgstr ""
+msgstr "n/a"
 
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -905,8 +921,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -914,17 +930,17 @@
 #: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:43
 msgid "PhpWikiAdministration"
-msgstr ""
+msgstr "AdministracinDePhpWiki"
 
 #: ../lib/WikiPlugin.php:125
 #, php-format
-msgid "argument '%s' not declared by plugin."
-msgstr ""
+msgid "Argument '%s' not declared by plugin."
+msgstr "Parmetro '%s' no declarada por plugin."
 
 #: ../lib/WikiPlugin.php:235
 #, php-format
 msgid "trailing cruft in plugin args: '%s'"
-msgstr ""
+msgstr "absurdo que se arrastra en parmetros plugin: '%s'"
 
 # lib/msql.php:237 lib/msql.php:312
 #: ../lib/WikiPlugin.php:378
@@ -939,20 +955,20 @@
 msgstr "Plugin '%s' lisiado."
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, php-format
 msgid "Include of '%s' failed."
 msgstr "Insercin de '%s' fall."
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
-msgstr ""
+msgstr "%s: ninguna tal clase"
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
-msgstr ""
+msgstr "%s: no una subclase de WikiPlugin."
 
 #: ../lib/WikiPluginCached.php:691
 #, php-format
@@ -960,18 +976,22 @@
 "There is no image creation data available to id '%s'. Please reload "
 "referring page."
 msgstr ""
+"No hay datos de la creacin de la imagen disponibles para la identificacin "
+"'%s '. Por favor recarga que refiere la pgina."
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
+"El mapa de imagen expir.  Recargue la pgina del wiki para reconstruir su "
+"pieza del HTML."
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 msgid "Invalid username."
 msgstr "Username invlido."
 
@@ -988,12 +1008,16 @@
 "You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config."
 "ini"
 msgstr ""
+"Usted se olvid de fijar ENCRYPTED_PASSWD para verdad. Ponga al da por "
+"favor su config/config.ini"
 
 #: ../lib/WikiUser.php:371
 msgid ""
 "Your home page has not been created yet so your preferences cannot not be "
 "saved."
 msgstr ""
+"Su Home Page no se ha creado todava as que sus preferencias no pueden ser "
+"ahorradas."
 
 #: ../lib/WikiUser.php:388
 msgid "Your home page is locked so your preferences cannot not be saved."
@@ -1004,11 +1028,13 @@
 #: ../lib/WikiUser.php:389
 msgid "Please contact your PhpWiki administrator for assistance."
 msgstr ""
+"Entre en contacto con por favor a su administrador de PhpWiki para la ayuda."
 
+# old-style. new style (1.3.x) is CategoryHomePages
 # lib/diff.php:997
 #: ../lib/WikiUser.php:443 ../themes/default/templates/homepage.tmpl:37
 msgid "CategoryHomepage"
-msgstr ""
+msgstr "CategoraHomepage"
 
 #: ../lib/WikiUser.php:465 ../lib/WikiUser.php:475
 #: ../themes/Crao/templates/navbar.tmpl:23
@@ -1023,55 +1049,61 @@
 "Old UserPage %s without stored password updated with empty password. Set a "
 "password in your UserPreferences."
 msgstr ""
+"Viejo UserPage %s sin la contrasea almacenada puesta al da con contrasea "
+"vaca. Fije una contrasea en su UsuarioPreferencias."
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, php-format
 msgid "%s is missing"
-msgstr ""
+msgstr "%s falta"
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
-msgstr ""
+msgstr "Cualquier %s es que falta o DATABASE_TYPE != '%s'"
 
 #: ../lib/WikiUser/IMAP.php:33
 msgid "Unable to connect to IMAP server "
-msgstr ""
+msgstr "Incapaz conectar con el IMAP el servidor "
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr "Incapaz atar el servidor %s de LDAP usando %s %s"
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
-msgstr ""
+msgstr "Username invlido ' %s' para LDAP Auth"
 
 # lib/msql.php:29 lib/mysql.php:36
 #: ../lib/WikiUser/POP3.php:59
-#, fuzzy, php-format
+#, php-format
 msgid "Couldn't connect to %s"
-msgstr ""
-"No se puede establecer conexin con la base de datos %s, me doy por vencido."
+msgstr "No poda conectar con %s"
 
 #: ../lib/WikiUser/PersonalPage.php:39 ../lib/WikiUser/PersonalPage.php:48
 #, php-format
 msgid "PersonalPage login method:"
-msgstr ""
+msgstr "Mtodo de la conexin de PersonalPage:"
 
 #: ../lib/WikiUser/PersonalPage.php:40 ../lib/WikiUser/PersonalPage.php:49
 #, php-format
 msgid "You stored an empty password in your '%s' page."
-msgstr ""
+msgstr "Usted almacen una contrasea vaca en su pgina de '%s'."
 
 #: ../lib/WikiUser/PersonalPage.php:41
 #, php-format
 msgid "Your access permissions are only for a BogoUser."
-msgstr ""
+msgstr "Sus permisos de acceso estn solamente para un BogoUser."
 
 #: ../lib/WikiUser/PersonalPage.php:42 ../lib/WikiUser/PersonalPage.php:51
 #, php-format
 msgid "Please set a password in UserPreferences."
-msgstr ""
+msgstr "Fije por favor una contrasea en UsuarioPreferencias."
 
 #: ../lib/WikiUser/PersonalPage.php:50
 #, php-format
@@ -1085,41 +1117,51 @@
 #: ../lib/WikiUserNew.php:628
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
+"Preferencias o formato vacas de la galleta de UsuarioPreferencias no "
+"reconocido."
 
 #: ../lib/WikiUserNew.php:632
 msgid "Default preferences will be used."
-msgstr ""
+msgstr "Las preferencias del defecto sern utilizadas."
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
+"La longitud de la contrasea es ms corta que la poltica del sistema "
+"permite."
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
 " You have to ask the System Administrator to reset your password."
 msgstr ""
+"La longitud de la contrasea almacenada es ms corta que la poltica del "
+"sistema permite. Apesadumbrado, usted no puede conexin.\n"
+" Usted tiene que pedir que el administrador de sistema reajuste su "
+"contrasea."
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
-msgstr ""
+msgstr "La funcin de la cripta no est disponible en esta versin de PHP."
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
+"En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y "
+"probablemente cambio ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
-msgstr ""
+msgstr "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini."
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 msgid "Email Verification"
-msgstr ""
+msgstr "Verificacin Del Email"
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1127,18 +1169,22 @@
 "will be used to send page change notifications.\n"
 "See %s"
 msgstr ""
+"Recepcin a %s!\n"
+"Se verifica y ser utilizada su cuenta del email\n"
+"para enviar notificaciones del cambio de la pgina.\n"
+"Vea %s"
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
-msgstr ""
+msgstr "La direccin ' %s' del email no se ajusta a formato correctamente"
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
-msgstr ""
+msgstr "La direccin ' %s' del email se ajusta a formato correctamente"
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
@@ -1161,7 +1207,7 @@
 #: ../lib/plugin/PageHistory.php:312 ../lib/plugin/PageInfo.php:59
 #, php-format
 msgid "I'm sorry, there is no such page as %s."
-msgstr ""
+msgstr "Estoy apesadumbrado, all no soy ninguna pgina tal como %s."
 
 #: ../lib/diff.php:292 ../lib/diff.php:394
 #, php-format
@@ -1181,7 +1227,7 @@
 
 #: ../lib/diff.php:320 ../lib/plugin/Diff.php:123
 msgid "revision by previous author"
-msgstr ""
+msgstr "revisin del autor anterior"
 
 #: ../lib/diff.php:326 ../lib/plugin/Diff.php:129
 msgid "previous revision"
@@ -1189,20 +1235,20 @@
 
 #: ../lib/diff.php:336 ../lib/plugin/Diff.php:139
 msgid "predecessor to the previous major change"
-msgstr ""
+msgstr "precursor al cambio principal anterior"
 
 #: ../lib/diff.php:347 ../lib/plugin/Diff.php:149
 #, php-format
 msgid "Differences between %s and %s of %s."
-msgstr ""
+msgstr "Diferencias entre %s y %s de %s."
 
 #: ../lib/diff.php:350 ../lib/plugin/Diff.php:152
 msgid "Other diffs:"
-msgstr ""
+msgstr "Otros diffs:"
 
 #: ../lib/diff.php:351 ../lib/plugin/Diff.php:153
 msgid "Previous Major Revision"
-msgstr ""
+msgstr "Revisin Importante Anterior"
 
 #: ../lib/diff.php:352 ../lib/plugin/Diff.php:154
 msgid "Previous Revision"
@@ -1210,7 +1256,7 @@
 
 #: ../lib/diff.php:353 ../lib/plugin/Diff.php:155
 msgid "Previous Author"
-msgstr ""
+msgstr "Autor Anterior"
 
 #: ../lib/diff.php:370 ../lib/plugin/Diff.php:172
 msgid "Newer page:"
@@ -1234,7 +1280,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1242,7 +1288,7 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1251,104 +1297,122 @@
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:25
 msgid "BackLinks"
-msgstr ""
+msgstr "AcoplamientosTraseros"
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
-msgstr ""
+msgstr "AcoplamientosTraseros por %s"
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, php-format
 msgid "(Redirected from %s)"
-msgstr ""
+msgstr "(vuelto a dirigir de %s)"
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
-msgstr ""
+msgstr "Usted busc para: "
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
-msgstr ""
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
+msgstr "CajaDeArena"
 
 # lib/pageinfo.php:70
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr "Versin actual:"
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr "Altro versin"
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
-msgstr ""
+msgstr "Un cierto error interno el corregir"
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
+"Su estn intentando corregir/crean probablemente una versin invlida de "
+"esta pgina."
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
-msgstr ""
+msgstr "&version=-1 pudo ayudar."
 
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr "Editar: %s"
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
-msgstr ""
+msgstr "Fuente De la Visin: %s"
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr "Pgina bloqueada."
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr "Pgina desbloquear."
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, php-format
 msgid "Saved: %s"
 msgstr "Guardar: %s"
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 msgid "Too many external links."
-msgstr ""
+msgstr "Tambin muchos acoplamientos externos."
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
-msgstr ""
+msgstr "Informes de SpamAssassin: "
+
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr "Los acoplamientos externos contienen dominios bloqueados:"
+
+#: ../lib/editpage.php:397
+#, php-format
+msgid "%s is listed at %s"
+msgstr "%s se enumera en %s"
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
-msgstr ""
+msgstr "Prevencin Del Spam"
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
+"Esta pgina corrige se parece contener el Spam y por lo tanto no fue "
+"ahorrada."
 
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr "Disculpe la inconveniencia."
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr "Pgina Bloqueada"
 
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
 msgstr ""
 "Esta pgina ha sido bloqueada por el administrador y no puede ser editada."
 
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
@@ -1356,81 +1420,85 @@
 "Copie sus cambios al portapapeles o a otro sitio temporal (p.ej. editor de "
 "textos)."
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
 "sections beginning with '%s', and ending with '%s'.  You will need to edit "
 "those sections by hand before you click Save."
 msgstr ""
+"Algunos de los cambios no podan ser combinados automticamente. Busque por "
+"favor las secciones que comienzan con '%s', y terminando con '%s'. Usted "
+"necesitar corregir esas secciones a mano antes de que usted chasque excepto."
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
-msgstr ""
+msgstr "Comprubelo por favor a travs antes de ahorrar."
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
-msgstr ""
+msgstr "El Estar en conflicto Corrige!"
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr ""
+"En el tiempo desde que usted comenz a corregir esta pgina, otro usuario ha "
+"ahorrado una nueva versin de ella."
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
 "have been combined. The result is shown below."
 msgstr ""
+"Sus cambios no se pueden ahorrar como son, desde hacer as que "
+"sobreescribiran los cambios del otro autor. As pues, se han combinado sus "
+"cambios y los del otro autor. El resultado se demuestra abajo."
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 msgid "Convert"
 msgstr "Convertido"
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
-msgstr ""
+msgstr "Registrarn al autor como %s."
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr "Fusin y Editar: %s"
 
 #: ../lib/loadsave.php:70
 msgid "ZIP files of database"
-msgstr ""
+msgstr "Archivos del ZIP de la base de datos"
 
 #: ../lib/loadsave.php:71
 msgid "Dump to directory"
-msgstr ""
+msgstr "Descarga al directorio"
 
 #: ../lib/loadsave.php:72
 msgid "Upload File"
-msgstr ""
+msgstr "Archivo Del Upload"
 
 #: ../lib/loadsave.php:73 ../lib/plugin/WikiForm.php:70
 msgid "Load File"
-msgstr ""
+msgstr "Archivo De la Carga"
 
 #: ../lib/loadsave.php:74
 msgid "Upgrade"
-msgstr ""
+msgstr "Mejora"
 
 #: ../lib/loadsave.php:76
 msgid "Dump pages as XHTML"
-msgstr ""
+msgstr "Pginas de la descarga como XHTML"
 
 #: ../lib/loadsave.php:95 ../lib/loadsave.php:96
 msgid "LoadDump"
-msgstr ""
+msgstr "CargaDescarga"
 
 #: ../lib/loadsave.php:110
 msgid "Complete."
@@ -1439,47 +1507,47 @@
 #: ../lib/loadsave.php:111
 #, php-format
 msgid "Return to %s"
-msgstr ""
+msgstr "Vuelva a %s"
 
 #: ../lib/loadsave.php:197
 msgid "FullDump"
-msgstr ""
+msgstr "DescargaCompleta"
 
 #: ../lib/loadsave.php:201
 msgid "LatestSnapshot"
-msgstr ""
+msgstr "La Foto Ms ltima"
 
 #: ../lib/loadsave.php:273 ../lib/loadsave.php:381
 msgid "You must specify a directory to dump to"
-msgstr ""
+msgstr "Usted debe especificar un directorio para descargar a"
 
 #: ../lib/loadsave.php:278 ../lib/loadsave.php:386
 #, php-format
 msgid "Cannot create directory '%s'"
-msgstr ""
+msgstr "No puede crear el directorio '%s'"
 
 #: ../lib/loadsave.php:280 ../lib/loadsave.php:388
 #, php-format
 msgid "Created directory '%s' for the page dump..."
-msgstr ""
+msgstr "Directorio creado '%s' para la descarga de la pgina..."
 
 #: ../lib/loadsave.php:283 ../lib/loadsave.php:391
 #, php-format
 msgid "Using directory '%s'"
-msgstr ""
+msgstr "Usando el directorio '%s'"
 
 #: ../lib/loadsave.php:286 ../lib/loadsave.php:394
 msgid "Dumping Pages"
-msgstr ""
+msgstr "Descargar Las Pginas"
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 msgid "Skipped."
-msgstr ""
+msgstr "Saltado."
 
 #: ../lib/loadsave.php:326
 #, php-format
 msgid "saved as %s"
-msgstr ""
+msgstr "ahorrado como %s"
 
 #: ../lib/loadsave.php:336 ../lib/loadsave.php:469
 #: ../lib/plugin/text2png.php:183
@@ -1494,7 +1562,7 @@
 
 #: ../lib/loadsave.php:476
 msgid "saved as "
-msgstr ""
+msgstr "ahorrado como "
 
 # lib/editpage.php:19
 #: ../lib/loadsave.php:514 ../lib/loadsave.php:533 ../lib/loadsave.php:550
@@ -1520,44 +1588,46 @@
 #: ../lib/loadsave.php:779
 #, php-format
 msgid "from %s"
-msgstr ""
+msgstr "de %s"
 
 #: ../lib/loadsave.php:795
 msgid "has edit conflicts - overwriting anyway"
-msgstr ""
+msgstr "tiene corregir conflictos - sobreescribiendo de todos modos"
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
-msgstr ""
+msgstr "El equipo de programacin de PhpWiki"
 
 #: ../lib/loadsave.php:803
 msgid "has edit conflicts - skipped"
-msgstr ""
+msgstr "tiene corregir los conflictos - saltados"
 
 #: ../lib/loadsave.php:814
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
+"el contenido es idntico a la versin actual %d - ninguna nueva revisin "
+"creada"
 
 #: ../lib/loadsave.php:828
 #, php-format
 msgid "- saved to database as version %d"
-msgstr ""
+msgstr "- ahorrado a la base de datos como versin %d"
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
-msgstr ""
+msgstr "Archivo %s del MIME"
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
-msgstr ""
+msgstr "Archivo serializado %s"
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, php-format
 msgid "plain file %s"
-msgstr ""
+msgstr "archivo llano %s"
 
 #: ../lib/loadsave.php:843
 msgid "Merge Edit"
@@ -1565,314 +1635,350 @@
 
 #: ../lib/loadsave.php:849
 msgid "Restore Anyway"
-msgstr ""
+msgstr "Restore de todos modos"
 
 #: ../lib/loadsave.php:857
 msgid "Overwrite All"
-msgstr ""
+msgstr "Sobreescriba Todos"
 
 #: ../lib/loadsave.php:864
 msgid " Sorry, cannot merge."
-msgstr ""
+msgstr " Apesadumbrado, no puede combinarse."
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
 msgid "Revert"
-msgstr ""
+msgstr "Invierta"
 
 #: ../lib/loadsave.php:885
 msgid "missing required version argument"
-msgstr ""
+msgstr "parmetro requerido de la versin que falta"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 msgid "no page content"
-msgstr ""
+msgstr "ningn contenido de la pgina"
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 msgid "same version page"
+msgstr "la misma pgina de la versin"
+
+#: ../lib/loadsave.php:907
+#, fuzzy
+msgid "Cancelled"
+msgstr "Cancelar"
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
 msgstr ""
 
-#: ../lib/loadsave.php:904
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr "Si"
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../lib/loadsave.php:938
 #, php-format
 msgid "revert to version %d"
-msgstr ""
+msgstr "invierta a la versin %d"
 
-#: ../lib/loadsave.php:907
-#, php-format
-msgid "- version %d saved to database as version %d"
-msgstr ""
+# lib/msql.php:237 lib/msql.php:312
+#: ../lib/loadsave.php:943
+#, fuzzy, php-format
+msgid "Revert: %s"
+msgstr "Invierta"
 
-#: ../lib/loadsave.php:921
+#: ../lib/loadsave.php:944
 #, php-format
-msgid "%s: not defined"
-msgstr "%s: fichero no encontrado"
+msgid "- version %d saved to database as version %d"
+msgstr "- versin %d ahorrada a la base de datos como versin %d"
 
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
-msgstr ""
+msgstr "Archivo del InterMapa de Wiki del defecto no cargado."
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
-msgstr ""
+msgstr "El saltar"
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
-msgstr ""
+msgstr "Incapaz cargar:  %s"
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
-msgstr ""
+msgstr "Mal tipo del archivo:  %s"
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
-msgstr ""
+msgstr "'%s' que carga"
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
-msgstr ""
+msgstr "El cargar encima de wiki virginal"
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
-msgstr ""
+msgstr "Ningn archivo uploaded a upload?"
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
-msgstr ""
+msgstr "%s uploading"
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
-msgstr ""
+msgstr "PROHIBIDO"
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
-msgstr ""
+msgstr "ANN"
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
-msgstr ""
+msgstr "BOGO"
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
-msgstr ""
+msgstr "USUARIO"
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
-msgstr ""
+msgstr "ADMIN"
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
-msgstr ""
+msgstr "INALCANZABLE"
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
-msgstr ""
+msgstr "%s se rechaza en este wiki."
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "authenticated"
-msgstr ""
+msgstr "authenticado"
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "not authenticated"
-msgstr ""
+msgstr "non authenticado"
 
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
+"%s %s %s se rechaza en este wiki para el usuario '%s' de %s (llano:  %s)."
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 msgid "Missing PagePermission:"
-msgstr ""
+msgstr "Permiso que falta de la pgina:"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
-msgstr ""
+msgstr "Usted debe firmar adentro %s."
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
-msgstr ""
+msgstr "Usted debe abrirse una sesin %s."
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
-msgstr ""
+msgstr "Tenga acceso para usted se prohbe %s."
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
-msgstr ""
+msgstr "Usted debe ser administrador %s."
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 msgid "view this page"
-msgstr ""
+msgstr "para visin esta pgina"
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 msgid "diff this page"
-msgstr ""
+msgstr "para diff esta pgina"
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 msgid "dump html pages"
-msgstr ""
+msgstr "para las pginas del HTML de la descarga"
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 msgid "dump serial pages"
-msgstr ""
+msgstr "para las pginas del cuento por entregas de la descarga"
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 msgid "edit this page"
-msgstr ""
+msgstr "para corregir esta pgina"
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 msgid "revert to a previous version of this page"
-msgstr ""
+msgstr "para invertir a una versin anterior de esta pgina"
 
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 msgid "create this page"
-msgstr ""
+msgstr "para crear esta pgina"
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
-msgstr ""
+msgstr "para cargue los archivos en este wiki"
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 msgid "lock this page"
-msgstr ""
+msgstr "para trabar esta pgina"
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 msgid "remove this page"
-msgstr ""
+msgstr "para quitar esta pgina"
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 msgid "unlock this page"
-msgstr "Desbloquear Pgina"
+msgstr "para desbloquear pgina"
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
-msgstr ""
+msgstr "para upload una descarga del cierre relmpago"
 
 # lib/pageinfo.php:70
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
-msgstr ""
+msgstr "para verificar la accin actual"
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
-msgstr ""
+msgstr "para visin la fuente de esta pgina"
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
-msgstr ""
+msgstr "para tener acceso a este wiki va Xml-RPC"
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 msgid "access this wiki via SOAP"
-msgstr ""
+msgstr "para tener acceso a este wiki va SOAP"
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
-msgstr ""
+msgstr "para descargar un cierre relmpago descargue de este wiki"
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
-msgstr ""
+#: ../lib/main.php:510
+msgid "download a html zip dump from this wiki"
+msgstr "para descargar un HTML relampague la descarga de este wiki"
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
-msgstr ""
+msgstr "Pginas el hojear"
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr ""
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr ""
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr ""
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr ""
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr ""
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr ""
 
-#: ../lib/main.php:540
+#: ../lib/main.php:542
 msgid "Locking pages"
-msgstr "Bloquear Pgina"
+msgstr "Bloquear pginas"
 
-#: ../lib/main.php:541
+#: ../lib/main.php:543
 msgid "Removing pages"
-msgstr "Borrar pgina"
+msgstr "Borrar pginas"
 
-#: ../lib/main.php:542
+#: ../lib/main.php:544
 msgid "Unlocking pages"
-msgstr "Desbloquear Pgina"
+msgstr "Desbloquear pginas"
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
 msgstr ""
 
 # lib/pageinfo.php:70
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
-msgstr ""
+msgstr "%s: accin remitida a un asesor."
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
+"Esta accin requiere la aprobacin del asesor.  Sea por favor paciente."
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
-msgstr ""
+msgstr "Usted debe esperar la aprobacin del asesor."
 
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1880,28 +1986,28 @@
 msgid "ModeratedPage"
 msgstr "PginaModerada"
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
-msgstr ""
+msgstr "%s: Mala accin"
 
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
 msgstr "Error Fatal De PhpWiki"
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 msgid "Chown"
-msgstr ""
+msgstr "Cambie a dueo"
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
-msgstr ""
+msgstr "Fije El Acl"
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 msgid "Rename"
-msgstr ""
+msgstr "Retitule"
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1911,31 +2017,31 @@
 #: ../themes/smaller/templates/actionbar.tmpl:39
 #: ../themes/smaller/templates/info.tmpl:11
 msgid "PageDump"
-msgstr ""
+msgstr "DescargeDeLaPgina"
 
 # lib/fullsearch.php:48
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr "BsquedaDelTexto"
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
-msgstr ""
+msgstr "El directorio de session.save_path"
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, php-format
 msgid "the session.save_path directory '%s'"
-msgstr ""
+msgstr "el directorio '%s' de session.save_path"
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
-msgstr ""
+msgstr "El procurar utilizar el directorio '%s' en lugar de otro."
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
-msgstr ""
+msgstr "Los usuarios no podrn firmar adentro."
 
 #: ../lib/plugin/AddComment.php:39
 msgid "AddComment"
@@ -1960,8 +2066,8 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 msgid "Click to display"
 msgstr ""
 
@@ -2090,7 +2196,7 @@
 msgid "hours"
 msgstr "horas"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr "dias"
 
@@ -2124,9 +2230,8 @@
 msgstr "<vaco>"
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:342
-#, fuzzy
 msgid "mode"
-msgstr "Moderno"
+msgstr "modo"
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:344
 #, fuzzy
@@ -2156,9 +2261,8 @@
 msgstr ""
 
 #: ../lib/plugin/AppendText.php:115
-#, fuzzy
 msgid "Page successfully updated."
-msgstr "Contrasea actualizado."
+msgstr "Pgina actualizada con xito."
 
 #: ../lib/plugin/AppendText.php:132
 #, php-format
@@ -2175,7 +2279,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 msgid "AuthorHistory"
@@ -2204,8 +2308,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2241,12 +2345,12 @@
 #: ../lib/plugin/BackLinks.php:35
 #, php-format
 msgid "List all pages which link to %s."
-msgstr ""
+msgstr "Enumere todas las pginas que se liguen a %s."
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #: ../lib/plugin/BackLinks.php:96
 #, php-format
@@ -2278,7 +2382,7 @@
 msgid "%s pages link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2287,17 +2391,17 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
 msgstr ""
 
@@ -2309,11 +2413,11 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
 msgstr ""
 
@@ -2324,7 +2428,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2340,12 +2444,12 @@
 msgid "Next Month"
 msgstr "El Mes Prximo"
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 msgid "CalendarList"
 msgstr "CalendarioLista"
 
@@ -2368,6 +2472,21 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr ""
 
+#: ../lib/plugin/CreateBib.php:36
+#, fuzzy
+msgid "CreateBib"
+msgstr "CreeToc"
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr ""
+
 #: ../lib/plugin/CreatePage.php:39
 msgid "CreatePage"
 msgstr "CreeLaPgina"
@@ -2393,20 +2512,15 @@
 msgid "Automatically link headers at the top"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr ""
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 msgid "Table Of Contents"
 msgstr ""
 
@@ -2442,7 +2556,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr ""
 
@@ -2459,6 +2573,23 @@
 msgid "Redirects to an external web site based on form input"
 msgstr ""
 
+# lib/pageinfo.php:26 lib/pageinfo.php:75
+#: ../lib/plugin/FileInfo.php:39
+#, fuzzy
+msgid "FileInfo"
+msgstr "Informacion"
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr ""
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr ""
@@ -2506,6 +2637,7 @@
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr ""
@@ -2535,7 +2667,12 @@
 msgid "only %d pages displayed"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr "Resultados de la bsqueda en el texto completo para '%s'"
@@ -2585,6 +2722,30 @@
 msgid "Go"
 msgstr "Aceptar"
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, php-format
+msgid "invalid argument %s"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr ""
+
 #: ../lib/plugin/GooglePlugin.php:43
 msgid "GooglePlugin"
 msgstr ""
@@ -2606,12 +2767,17 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-msgid "empty source"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
+
+# lib/msql.php:29 lib/mysql.php:36
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, php-format
+msgid "Couldn't start commandline '%s'"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2650,6 +2816,7 @@
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr ""
@@ -2775,13 +2942,13 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 msgid "You must be logged in to view ratings."
 msgstr ""
 
 #: ../lib/plugin/ListSubpages.php:34
 msgid "ListSubpages"
-msgstr ""
+msgstr "ListaPginasSecundaria"
 
 #: ../lib/plugin/ListSubpages.php:38
 msgid "Lists the names of all SubPages of the current page."
@@ -2794,7 +2961,7 @@
 #: ../lib/plugin/ListSubpages.php:84
 #, php-format
 msgid "SubPages of %s:"
-msgstr ""
+msgstr "PginasSecundaria de %s:"
 
 #: ../lib/plugin/ListSubpages.php:99 ../lib/plugin/UnfoldSubpages.php:101
 #: ../lib/plugin/UnfoldSubpages.php:116
@@ -2993,7 +3160,7 @@
 "markup before rewrapping with emacs and checking into CVS."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 msgid "Warning:"
 msgstr ""
 
@@ -3011,17 +3178,11 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr ""
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr "Siguiente"
@@ -3126,26 +3287,126 @@
 msgid "PageTrail Plugin"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+#, fuzzy
+msgid "PasswordReset"
+msgstr "Contrasea:"
+
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr "Mensaje"
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:86
+#, fuzzy, php-format
+msgid "Error sending email with password for user %s."
+msgstr "Contrasea o userid invlida."
+
+#: ../lib/plugin/PasswordReset.php:94
+msgid "Reset password of user: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+#, fuzzy
+msgid "Already logged in"
+msgstr "Suprimido ya"
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr "UsuarioPreferencias"
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:174
+#, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, php-format
 msgid "Invalid argument: %s=%s"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, php-format
+msgid "Unable to find src='%s'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, php-format
 msgid "Unable to read src='%s'"
 msgstr ""
@@ -3209,6 +3470,10 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+msgid "empty source"
+msgstr ""
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr ""
@@ -3360,6 +3625,15 @@
 msgid "Raw HTML"
 msgstr ""
 
+#: ../lib/plugin/RdfDefinition.php:42
+#, fuzzy
+msgid "RdfDefinition"
+msgstr "Definicin da %s: %s"
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 #: ../lib/plugin/RecentChanges.php:105
 #, fuzzy
 msgid "Deleted"
@@ -3369,120 +3643,124 @@
 msgid "(diff)"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 msgid "Recent Comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 msgid "comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr ""
+"Los %d la mayora del %s reciente durante el ltimo da se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
+"Los %d la mayora del %s reciente durante los ltimos das de %s se enumeran "
+"abajo."
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
-msgstr ""
+msgstr "Los %d la mayora del %s reciente se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
-msgstr ""
+msgstr "Los %d el %s ms viejo durante el ltimo da se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
+"Los %d el %s ms viejo durante los ltimos das de %s se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
-msgstr ""
+msgstr "Los %d el %s ms viejo se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
-msgstr ""
+msgstr "Los %s ms recientes durante el ltimo da se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
-msgstr ""
+msgstr "Los %s ms recientes durante los ltimos das de %s se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
-msgstr ""
+msgstr "Todos los %s se enumeran abajo."
 
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
-msgstr ""
+msgstr "RecienteCorrige"
 
 # lib/pageinfo.php:21
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 msgid "No comments found"
-msgstr ""
+msgstr "Ningunos comentarios encontrados"
 
 # lib/pageinfo.php:21
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
-msgstr ""
+msgstr "Ningunos cambios encontrados"
 
 # lib/fullsearch.php:48
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr "Una bsqueda de ttulos"
 
 # lib/pageinfo.php:21
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
-msgstr ""
+msgstr "El menor de edad de la demostracin corrige para:"
 
 # lib/pageinfo.php:21
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
-msgstr ""
+msgstr "Demuestre todos los cambios para:"
 
 # lib/pageinfo.php:21
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
-msgstr ""
+msgstr "Demuestre los cambios para:"
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr "1 da"
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr "%s dias"
@@ -3490,15 +3768,15 @@
 #: ../lib/plugin/RecentComments.php:17
 #: ../themes/MonoBook/templates/navbar.tmpl:14
 msgid "RecentComments"
-msgstr ""
+msgstr "ComentariosRecientes"
 
 #: ../lib/plugin/RecentComments.php:91
 msgid "latest comment by "
-msgstr ""
+msgstr "el comentario ms ltimo cerca "
 
 #: ../lib/plugin/RecentEdits.php:36
 msgid "Recent Edits"
-msgstr ""
+msgstr "Reciente Corrige"
 
 #: ../lib/plugin/RecentReferrers.php:14
 msgid "RecentReferrers"
@@ -3542,7 +3820,6 @@
 # lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 msgid "RelatedChanges"
 msgstr "CambiosRelacionados"
 
@@ -3582,7 +3859,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr ""
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr ""
@@ -3621,65 +3898,43 @@
 msgid "invalid %s ignored"
 msgstr ""
 
-# lib/msql.php:29 lib/mysql.php:36
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr ""
 
 # lib/diff.php:1015
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr "Pgina archivada:"
 
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3687,163 +3942,167 @@
 "more than %d unique author revisions."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr "%d pginas"
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr "%d not-empty pginas"
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, php-format
 msgid "total hits: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, php-format
 msgid "Pagedata size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
 msgstr ""
 
@@ -3871,6 +4130,14 @@
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+#: ../lib/plugin/Template.php:61
+msgid "Template"
+msgstr ""
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr ""
@@ -3892,11 +4159,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr ""
-
 # lib/msql.php:237 lib/msql.php:312
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
@@ -3980,22 +4242,9 @@
 msgid "Translate"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
-msgstr ""
+msgstr "IncluyaPginasSecundaria"
 
 #: ../lib/plugin/UnfoldSubpages.php:40
 msgid "Includes the content of all SubPages of the current page."
@@ -4013,9 +4262,9 @@
 msgstr "Insercin de '%s':"
 
 #: ../lib/plugin/UnfoldSubpages.php:160
-#, fuzzy, php-format
+#, php-format
 msgid "%s has no subpages defined."
-msgstr "%s: fichero no encontrado"
+msgstr "%s: no hace ninguna pgina secundaria definir."
 
 #: ../lib/plugin/UpLoad.php:46
 msgid "Upload files to the local InterWiki Upload:<filename>"
@@ -4071,33 +4320,13 @@
 msgid "Can't open the upload logfile."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr "UsuarioPreferencias"
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
 "cannot be saved."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr ""
-
+# UsuarioPreferencias
 #: ../lib/plugin/UserPreferences.php:105
 msgid "Your UserPreferences have been successfully deleted."
 msgstr ""
@@ -4106,14 +4335,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr ""
@@ -4133,7 +4354,7 @@
 # lib/pageinfo.php:21
 #: ../lib/plugin/UserPreferences.php:149
 msgid "No changes."
-msgstr ""
+msgstr "Ningunos cambios."
 
 #: ../lib/plugin/UserPreferences.php:153
 #, php-format
@@ -4142,12 +4363,11 @@
 
 #: ../lib/plugin/UserRatings.php:47
 msgid "UserRatings"
-msgstr ""
+msgstr "GradosUsuario."
 
 #: ../lib/plugin/UserRatings.php:51
-#, fuzzy
 msgid "List the user's ratings."
-msgstr "Las pginas ms populares."
+msgstr "Enumere los grados del usuario."
 
 #: ../lib/plugin/UserRatings.php:89
 #, php-format
@@ -4183,7 +4403,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr ""
 
@@ -4739,7 +4959,7 @@
 msgid "WikiAdminUtils says:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr ""
 
@@ -4814,7 +5034,7 @@
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr ""
 
@@ -4854,14 +5074,13 @@
 msgid "WikiForm: %s: unknown action"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
-#, fuzzy
+#: ../lib/plugin/WikiFormRich.php:181
 msgid "name"
-msgstr "Nombre de la Pgina"
+msgstr "Nombre"
 
 #: ../lib/plugin/WikiForum.php:52
 msgid "WikiForum"
@@ -5055,8 +5274,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5244,15 +5463,15 @@
 
 #: ../lib/plugin/_WikiTranslation.php:117
 msgid "UnfoldSubpagesPlugin"
-msgstr ""
+msgstr "IncluyaPginasSecundariaPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:118
 msgid "UpLoad"
-msgstr ""
+msgstr "UpLoad"
 
 #: ../lib/plugin/_WikiTranslation.php:119
 msgid "UpLoadPlugin"
-msgstr ""
+msgstr "UpLoadPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:120
 msgid "WabiSabi"
@@ -5268,8 +5487,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5293,7 +5512,7 @@
 #: ../lib/plugin/_WikiTranslation.php:319
 #, php-format
 msgid "%s is empty"
-msgstr ""
+msgstr "%s es vaco"
 
 #: ../lib/plugin/_WikiTranslation.php:438
 #, php-format
@@ -5322,16 +5541,16 @@
 
 #: ../lib/removepage.php:18
 msgid "Already deleted"
-msgstr ""
+msgstr "Suprimido ya"
 
 #: ../lib/removepage.php:19
 msgid "Sorry, this page is not in the database."
-msgstr ""
+msgstr "Apesadumbrada, esta pgina no est en la base de datos."
 
 #: ../lib/removepage.php:26
 #, fuzzy, php-format
 msgid "You are about to remove '%s'!"
-msgstr "Va a borrar '%s' permanentemente!"
+msgstr "Usted est a punto de quitar '%s'!"
 
 # lib/editpage.php:23
 #: ../lib/removepage.php:48
@@ -5348,117 +5567,117 @@
 
 #: ../lib/removepage.php:58
 msgid "Back to the previous page."
-msgstr ""
+msgstr "De nuevo a la pgina anterior."
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
-msgstr ""
+msgstr "demasiado de largo"
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, php-format
 msgid "Illegal chars %s removed"
-msgstr ""
+msgstr "Los carbones ilegales %s quitaron"
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
-msgstr ""
+msgstr "Revisin No encontrada"
 
 # lib/pageinfo.php:36
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
-msgstr ""
+msgstr "Estoy apesadumbrado.  La versin %d de %s no est en la base de datos."
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, php-format
 msgid "%s b"
 msgstr "%s o"
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr "%s octetos"
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr ""
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr "%s Kb (%s octetos)"
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -5505,7 +5724,7 @@
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr ""
 
@@ -5526,132 +5745,135 @@
 msgid "check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
-#, fuzzy
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 msgid "fixed"
-msgstr "modificado"
+msgstr "fijo"
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr ""
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, fuzzy, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "versin %s"
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, fuzzy, php-format
 msgid "version <em>%s</em>"
 msgstr "versin %s"
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 msgid "not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr "DB admin username:"
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 msgid "DB admin password:"
 msgstr "DB admin contrasea:"
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr ""
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
 # lib/msql.php:29 lib/mysql.php:36
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, php-format
 msgid "couldn't move %s to %s"
-msgstr ""
+msgstr "no poda mover %s a %s"
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, php-format
 msgid "%s is not writable"
-msgstr ""
+msgstr "%s no es escribible"
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr ""
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -5684,27 +5906,27 @@
 
 #: ../lib/wikilens/Utils.php:59
 msgid "Members:"
-msgstr ""
+msgstr "Miembros:"
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr ""
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
-msgstr ""
+msgstr "EOF inesperado en archivo del zip"
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
-msgstr ""
+msgstr "[%d] Vea [%s]"
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr "Referencias"
 
@@ -5726,7 +5948,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5802,8 +6024,8 @@
 msgstr "Vea la versin actual"
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr ""
@@ -5821,37 +6043,37 @@
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr ""
 
 # lib/pageinfo.php:70
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr "Ahorrando esta pgina sobreescribir la versin actual."
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr "Al"
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr "An"
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr ""
@@ -5860,84 +6082,76 @@
 msgid "Page Content: "
 msgstr "Contenido De la Pgina: "
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr "Esto es un cambio pequeo."
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s tips para editar."
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr "BuenEstilo"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr "ViejoReglasDeFormatoDeTexto"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr "Sinopsis"
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr "ReglasDeFormatoDeTexto"
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr "CajaDeArena"
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -5976,18 +6190,13 @@
 msgid "Enter your UserId to sign in"
 msgstr ""
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-msgid "Sign in:"
-msgstr ""
-
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
 #: ../themes/default/templates/comment.tmpl:18
 #: ../themes/default/templates/wikiblog.tmpl:19
 #, php-format
 msgid "Comment modified on %s by %s"
-msgstr ""
+msgstr "Comentario modificado en %s por %s"
 
 #: ../themes/Crao/templates/wikiblog.tmpl:25
 #: ../themes/blog/templates/wikiblog.tmpl:25
@@ -5995,13 +6204,13 @@
 #: ../themes/default/templates/wikiblog.tmpl:24
 #, php-format
 msgid "Comments on %s by %s."
-msgstr ""
+msgstr "Comentarios sobre %s por %s."
 
 #: ../themes/Hawaiian/themeinfo.php:29 ../themes/MacOSX/themeinfo.php:104
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr "Impresora"
@@ -6010,21 +6219,21 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr "Moderno"
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
-msgstr ""
+msgstr "Toolbars superiores y inferiores"
 
 #: ../themes/MonoBook/templates/actionbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:31
 #: ../themes/default/templates/navbar.tmpl:15
 msgid "Article"
-msgstr ""
+msgstr "Artculo"
 
 # lib/pageinfo.php:26 lib/pageinfo.php:75
 #: ../themes/MonoBook/templates/actionbar.tmpl:42
@@ -6156,14 +6365,14 @@
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 msgid "Diff previous Revision"
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 msgid "Diff previous Author"
@@ -6238,14 +6447,14 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr ""
@@ -6751,6 +6960,16 @@
 msgid "TermsOfUse"
 msgstr ""
 
+#~ msgid "Sign in"
+#~ msgstr "Muestra adentro"
+
+# lib/diff.php:997
+#~ msgid "Category"
+#~ msgstr "Categora"
+
+#~ msgid "Topic"
+#~ msgstr "Asunto"
+
 #, fuzzy
 #~ msgid "PreferenceApp"
 #~ msgstr "Preferencias"
@@ -6779,10 +6998,6 @@
 #~ msgstr "Copia de [%s]"
 
 #, fuzzy
-#~ msgid "RdfDefinition"
-#~ msgstr "Definicin da %s: %s"
-
-#, fuzzy
 #~ msgid "Continue"
 #~ msgstr "Contenido"
 
diff -ruN 11p1/locale/po/fr.po 12p3/locale/po/fr.po
--- 11p1/locale/po/fr.po	2005-09-18 07:12:26.000000000 -0500
+++ 12p3/locale/po/fr.po	2006-06-18 06:19:37.000000000 -0500
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <meignen.pierrick@wanadoo.fr>, Roland "
 "Trique <roland.trique@free.fr>, Stphane Gourichon <stephane.gourichon@lip6."
@@ -18,6 +18,14 @@
 "Date: 2001-09-22 00:00-0000\n"
 "From: Pierrick Meignen <meignen.pierrick@wanadoo.fr>\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr ""
+
 #: ../lib/DbSession.php:50
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
@@ -46,14 +54,14 @@
 msgid "Undo disabled"
 msgstr "Annuler dernire action dsactiv."
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
 msgstr "Recherche & Remplace"
 
 # lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -71,23 +79,23 @@
 msgstr "Remplacer par"
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr "Fermer"
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
 msgstr ""
 
 #: ../lib/EditToolbar.php:82
@@ -99,125 +107,116 @@
 msgid "Operation undone"
 msgstr ""
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
 msgstr "Texte en gras"
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
 msgstr "Texte en italique"
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
 msgstr "en option | PageName"
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 msgid "Link to page"
 msgstr "Lien vers la page"
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
 msgstr "en option | http://www.example.com"
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
 msgstr "Lien externe (http:// prefix)"
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
 msgstr "Texte de dbut de ligne"
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
 msgstr "Texte de dbut de ligne de niveau 1"
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr "Example.jpg"
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
 msgstr "Image embarque"
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
 msgstr "Insrer du texte non-format ici"
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
 msgstr "Ignorer le formatage wiki"
 
 # lib/pageinfo.php:64
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 msgid "Your signature"
 msgstr "Votre signature"
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr "Ligne horizontale"
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr "Prvisualiser"
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
 msgstr "Cliquer sur un bouton pour obtenir une exemple de texte"
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 msgid "Undo Search & Replace"
 msgstr "Undo Recherche & Remplace"
 
 # lib/diff.php:997
-#: ../lib/EditToolbar.php:267
-msgid "Category"
-msgstr "Catgorie"
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr "Sujet"
-
-# lib/diff.php:997
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 msgid "AddCategory"
 msgstr "AjoutezCatgorie"
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 msgid "AddPlugin"
 msgstr "AjoutezPlugin"
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 msgid "AddPageLink"
 msgstr "AjouterDesPagesLien"
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:363
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
 msgstr ""
 
@@ -226,21 +225,21 @@
 msgid "%s: error while handling error:"
 msgstr "%s : erreur pendant la gestion de l'erreur :"
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr "%s : fichier non trouv"
 
 # lib/diff.php:997
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 msgid "CategoryGroup"
 msgstr "CatgorieGroupes"
 
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sans titre"
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -250,7 +249,7 @@
 msgid "Invalid [] syntax ignored"
 msgstr "[] non valables, ignor"
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "%s color non valable ignor"
@@ -286,7 +285,7 @@
 msgstr "... autour de %s"
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, php-format
 msgid "%s not found"
 msgstr "%s non trouv"
@@ -320,7 +319,7 @@
 msgstr "Visites"
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 msgid "Size"
 msgstr "Taille"
@@ -351,7 +350,7 @@
 msgid "Creator"
 msgstr "Crateur"
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -451,7 +450,7 @@
 msgstr "ajouter"
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
+msgid "Check to add this ACL"
 msgstr "Vrifier pour ajouter cette ACL"
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
@@ -471,7 +470,7 @@
 msgstr ""
 
 # lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -482,7 +481,7 @@
 msgid "Discussion"
 msgstr "Entretien"
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Chargement de la CarteInterWiki depuis le fichiers %s."
@@ -496,17 +495,17 @@
 msgstr "Adresse InterWiki"
 
 # lib/stdlib.php:384 lib/stdlib.php:445
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -515,39 +514,39 @@
 msgid "RecentChanges"
 msgstr "DerniresModifs"
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
 msgstr ""
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
 msgstr "%s n'est pas accessible en criture."
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
 msgstr "Le journal d'vnement de PhpWiki"
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Veuillez vous assurer que %s est disponible en criture, ou redfinissez-le "
 "dans config/config.ini."
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, php-format
 msgid "the file '%s'"
 msgstr "le fichier %s"
@@ -557,83 +556,87 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, php-format
 msgid "Unsupported argument: %s=%s"
+msgstr "Argument %s=%s n'est pas support !"
+
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
 msgstr ""
 
-#: ../lib/Theme.php:392
+#: ../lib/Theme.php:388
 msgid "Never edited"
 msgstr "Jamais dite"
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
 msgstr "%s  %s"
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, php-format
 msgid "Version %s, saved %s"
 msgstr "Version %s, enregistre %s"
 
 # lib/diff.php:1003 lib/diff.php:1021
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, php-format
 msgid "Last edited %s"
 msgstr "Dernire modification %s"
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "Version %s, enregistre sur %s"
 
 # lib/diff.php:1003 lib/diff.php:1021
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, php-format
 msgid "Last edited on %s"
 msgstr "Dernire modification le %s"
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr "aujourd'hui"
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr "hier"
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, php-format
 msgid "Owner: %s"
 msgstr "Propritaire: %s"
 
 # lib/diff.php:1006 lib/diff.php:1024
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "par %s"
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Aucune correspondance de lien pour %s."
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr "Enregistre : %s"
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr "Google: %s"
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "%s : Nom de page invalide"
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -643,12 +646,12 @@
 msgid "Edit"
 msgstr "diter"
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -665,27 +668,29 @@
 msgid "Sign Out"
 msgstr "Dconnexion"
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Connexion"
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr "Vrrouiller la page"
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr "Dverrouiller la page"
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr "Supprimer la page"
 
 # lib/fullsearch.php:48
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -708,36 +713,36 @@
 msgid "TitleSearch"
 msgstr "RechercheParTitre"
 
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s: non dfini"
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
 msgstr "Liens correspondants"
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
 msgstr "Liens exterieurs"
 
-#: ../lib/WikiDB.php:230
+#: ../lib/WikiDB.php:233
 #, php-format
 msgid "Removed by: %s"
 msgstr "Enlev prs : %s"
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, php-format
 msgid "Page removed %s"
 msgstr "Page enleve %s"
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr "Les notifications de changement de la page %s ont t envoys  %s"
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
@@ -745,51 +750,51 @@
 "Erreur lors des notifications de changements de page: Impossible d'envoyer %"
 "s  %s"
 
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, php-format
 msgid "renamed from %s"
 msgstr "renomme  partir de %s"
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiBD::renamePage() pas encore implmente pour le Principal"
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s : la date de la nouvelle rvision est %s"
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 msgid "Optimizing database"
 msgstr "Optimisation de database"
 
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 msgid "Page change"
 msgstr ""
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 msgid "New page"
 msgstr "Nouvelle page"
 
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, php-format
 msgid "Edited by: %s"
 msgstr "dit par : %s"
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "retitrez la page de '%s'  '%s'"
 
 # lib/display.php:31 lib/editpage.php:50
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Dcrire %s ici."
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "Ouille ! La rvision %s de %s semble avoir t efface !"
@@ -876,24 +881,26 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr "Aucun ou pas assez de GROUP_DB dfinis pour SQL"
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
-msgstr "AUTH_GROUP_FILE non dfini"
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, php-format
+msgid "%s: not defined"
+msgstr "%s : non dfini"
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
 msgstr "Impossible d'ouvrir AUTH_GROUP_FILE %s"
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
-msgstr "LDAP_AUTH_HOST non dfini"
+#: ../lib/WikiGroup.php:951
+#, fuzzy, php-format
+msgid "%s not defined"
+msgstr "%s : non dfini"
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
 msgstr "Pas de LDAP dans cette version de php"
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr "Impossible de se connecter au serveur LDAP %s"
@@ -904,7 +911,7 @@
 
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -913,8 +920,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -926,7 +933,7 @@
 
 #: ../lib/WikiPlugin.php:125
 #, php-format
-msgid "argument '%s' not declared by plugin."
+msgid "Argument '%s' not declared by plugin."
 msgstr "argument '%s' non dclar par le plugin."
 
 #: ../lib/WikiPlugin.php:235
@@ -945,17 +952,17 @@
 msgstr "Plugin %s dsactiv."
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, php-format
 msgid "Include of '%s' failed."
 msgstr "L'insertion de '%s' a chou."
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
 msgstr "<%s : pas de section de ce type>"
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr "%s n'est pas une sous classe de WikiPlugin."
@@ -967,17 +974,17 @@
 "referring page."
 msgstr "Aucune image ne correspond  l'id %s. Veuillez recharger cette page."
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 msgid "Invalid username."
 msgstr "Mot de identifiant d'utilisateur invalide."
 
@@ -1038,15 +1045,15 @@
 "L'anciene page %s sans mot de passe attribu a t mise  jour avec un mot "
 "de passe vide. Dfinissez un mot de passe dans vos PrfrencesUtilisateurs."
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, php-format
 msgid "%s is missing"
 msgstr "%s est manquant"
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
 msgstr "%s est manquant ou DATABASE_TYPE != '%s'"
@@ -1055,7 +1062,12 @@
 msgid "Unable to connect to IMAP server "
 msgstr "Impossible de se connecter au serveur IMAP "
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr "Impossible de se connecter au serveur LDAP %s, avec %s %s"
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr "Mot de identifiant d'utilisateur '%s' pour LDAP Auth invalide."
@@ -1102,11 +1114,11 @@
 msgid "Default preferences will be used."
 msgstr "Les prfrences par dfaut seront utilises."
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -1115,12 +1127,12 @@
 "La taille de votre mot de passe est trop petite, vous ne pouvez pas vous "
 "connecter. Veuillez contacter l'administrateur pour le changer."
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 "La fonction de cryptage n'est pas disponible dans cette version de PHP."
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -1128,15 +1140,15 @@
 "Veuillez dfinir ENCRYPTED_PASSWD  false dans config/config.ini et "
 "probablement l'ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "Veuillez dfinir ENCRYPTED_PASSWD  true dans config/config.ini."
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 msgid "Email Verification"
 msgstr "Verrification de l'email"
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1149,17 +1161,17 @@
 "sera utilis pour les notifications de changements de pages.\n"
 "Voir %s"
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr "L'adresse '%s' ne semble pas tre une adresse correcte."
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr "L'adresse E-Mail '%s' semble tre une adresse correcte."
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Impossible de mlanger les chanes de type '%s' et '%s'"
@@ -1260,7 +1272,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1268,7 +1280,7 @@
 msgid "%s: %s"
 msgstr "%s : %s"
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1279,97 +1291,111 @@
 msgid "BackLinks"
 msgstr "RtroLiens"
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
 msgstr "RtroLiens pour %s"
 
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, php-format
 msgid "(Redirected from %s)"
 msgstr "(Redirig de %s)"
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
 msgstr ""
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
-msgstr ""
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
+msgstr "BacSable"
 
 # lib/pageinfo.php:64
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr "Votre version"
 
 # lib/pageinfo.php:70
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr "L'autre version"
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr "Vous lisez une ancienne rvision de cette page."
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
 msgstr ""
 
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr "diter : %s"
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
 msgstr "Afficher la Source : %s"
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr "La page est maintenant verrouille."
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr "La page est maintenant dverrouille."
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, php-format
 msgid "Saved: %s"
 msgstr "Enregistre : %s"
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 msgid "Too many external links."
 msgstr "Trop de liens exterieurs."
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
 msgstr ""
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr ""
+
+#: ../lib/editpage.php:397
+#, fuzzy, php-format
+msgid "%s is listed at %s"
+msgstr "%s pages pointent vers %s :"
+
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
 msgstr ""
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
 
 # lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr "Dsol pour la gne occasionne."
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr "Page Verrouille"
 
 # lib/editpage.php:31 lib/savepage.php:52
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
@@ -1378,7 +1404,7 @@
 "pas pu tre enregistre."
 
 # lib/savepage.php:24
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
@@ -1386,7 +1412,7 @@
 "(Copiez vos modifications dans le presse-papier. Vous pouvez essayer "
 "d'diter une page diffrente ou sauver votre texte dans un diteur)."
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -1397,15 +1423,15 @@
 "Veuillez regarder les sections commenant par '%s', et se terminant par '%"
 "s'. Vous devrez diter ces sections  la main avant cliquer sur Enregistrer."
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
 msgstr "Veuillez la vrifier avant de la sauver."
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
 msgstr "Conflit d'ditions !"
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
@@ -1413,7 +1439,7 @@
 "Depuis que vous avez commenc  diter cette page, un autre utilisateur en a "
 "enregistr une nouvelle version."
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
@@ -1423,21 +1449,17 @@
 "celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de "
 "l'autre auteur ont t combines. Le rsultat est affich ci-dessous."
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 msgid "Convert"
 msgstr "Converti"
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
 msgstr "L'auteur sera enregistr sous le nom %s."
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr "Fusioner et diter : %s"
@@ -1511,7 +1533,7 @@
 msgid "Dumping Pages"
 msgstr "Rcupration des pages"
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 msgid "Skipped."
 msgstr "Ignor."
 
@@ -1565,7 +1587,7 @@
 msgid "has edit conflicts - overwriting anyway"
 msgstr "conflits d'dition - craser quand mme "
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
 msgstr "L'quipe de dveloppement de PhpWiki"
 
@@ -1583,17 +1605,17 @@
 msgid "- saved to database as version %d"
 msgstr "- sauve dans la base de donnes sous la version %d"
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
 msgstr "fichier MIME %s"
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
 msgstr "Fichier srialis %s"
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, php-format
 msgid "plain file %s"
 msgstr "fichier simple %s"
@@ -1614,8 +1636,8 @@
 msgid " Sorry, cannot merge."
 msgstr " Dsol, impossible de fusionner."
 
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
@@ -1626,294 +1648,328 @@
 msgid "missing required version argument"
 msgstr "argument de version requis manquant"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 msgid "no page content"
 msgstr "pas de sommaire de page"
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 msgid "same version page"
 msgstr "mme version de page"
 
+#: ../lib/loadsave.php:907
+#, fuzzy
+msgid "Cancelled"
+msgstr "Annuler"
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
+msgstr ""
+
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr "Oui"
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr "Annuler"
+
 # lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/loadsave.php:904
+#: ../lib/loadsave.php:938
 #, php-format
 msgid "revert to version %d"
 msgstr "revenir  la version %d"
 
-#: ../lib/loadsave.php:907
+#: ../lib/loadsave.php:943
+#, fuzzy, php-format
+msgid "Revert: %s"
+msgstr "Rinitialiser"
+
+#: ../lib/loadsave.php:944
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d sauve dans la base de donnes sous la version %d"
 
-#: ../lib/loadsave.php:921
-#, php-format
-msgid "%s: not defined"
-msgstr "%s : non dfini"
-
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
 msgstr "Carte InterWiki par dfaut non charge."
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
 msgstr "Ignor"
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
 msgstr "Impossible de charger : %s"
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Mauvais type de fichier : %s"
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
 msgstr "Chargement ' %s '"
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
 msgstr "Chargement d'un wiki vierge"
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
 msgstr "Pas de fichier  dposer ?"
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
 msgstr "Dpt de %s"
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
 msgstr "INTERDIT"
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
 msgstr "ANONYME"
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
 msgstr "BOGO"
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
 msgstr "UTILISATEUR"
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
 msgstr "INACCESSIBLE"
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr "L'action %s est interdite sur ce wiki."
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "authenticated"
 msgstr "authentifi"
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "not authenticated"
 msgstr "non authentifi"
 
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 "%s %s %s est interdite sur ce wiki pour %s l'utilisateur '%s' (niveau : %s)."
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 msgid "Missing PagePermission:"
 msgstr "Permission de page individuelle absente:"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
 msgstr "Vous devez vous inscrire pour %s."
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
 msgstr "Vous devez vous connecter pour %s."
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr "L'accs  %s vous est interdit."
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr "Vous devez tre un administrateur pour %s."
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 msgid "view this page"
 msgstr "voir cette page"
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 msgid "diff this page"
 msgstr "diff de cette page"
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 msgid "dump html pages"
 msgstr "rcupration des pages HTML"
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 msgid "dump serial pages"
 msgstr "rcupration des pages srialises"
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 msgid "edit this page"
 msgstr "diter cette page"
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 msgid "revert to a previous version of this page"
 msgstr "revenir  une prcdente version de cette page."
 
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 msgid "create this page"
 msgstr "crer cette page"
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
 msgstr "chargement des fichiers sur ce wiki"
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 msgid "lock this page"
 msgstr "verrouiller cette page"
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 msgid "remove this page"
 msgstr "supprimer cette page"
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 msgid "unlock this page"
 msgstr "dverrouiller la Page"
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
 msgstr "dposer un fichier zip"
 
 # lib/pageinfo.php:64
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
 msgstr "vrifier l'action actuelle"
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
 msgstr "voir la source de cette page"
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
 msgstr "accder  ce wiki via XML-RPC"
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 msgid "access this wiki via SOAP"
 msgstr "accder  ce wiki via SOAP"
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
 msgstr "tlcharger une sauvegarde compresse de ce wiki"
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
+#: ../lib/main.php:510
+#, fuzzy
+msgid "download a html zip dump from this wiki"
 msgstr "tlcharger une sauvegarde HTML compresse de ce wiki"
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
 msgstr "Navigation en cours"
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr "Comparaison des pages"
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr "Rcupration des pages HTML"
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr "Rcupration des pages srialises"
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr "ditions des pages"
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr "Cration des pages"
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr "Chargement des fichiers"
 
-#: ../lib/main.php:540
+#: ../lib/main.php:542
 msgid "Locking pages"
 msgstr "Verrouillage des pages"
 
-#: ../lib/main.php:541
+#: ../lib/main.php:543
 msgid "Removing pages"
 msgstr "Suppression des pages"
 
-#: ../lib/main.php:542
+#: ../lib/main.php:544
 msgid "Unlocking pages"
 msgstr "Dverrouiller les pages"
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
 msgstr "Dposer la sauvegarde compresse"
 
 # lib/pageinfo.php:64
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr "Vrifier l'action actuelle"
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
 msgstr "Visualisation de la source des pages"
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr "Accs XML-RPC"
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 msgid "SOAP access"
 msgstr "Accs SOAP"
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
 msgstr "Tlchargement des sauvegardes compresses"
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr "Tlchargement des sauvegardes html compresses"
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
 msgstr ""
 
 # lib/display.php:14
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1921,29 +1977,29 @@
 msgid "ModeratedPage"
 msgstr "PageModre"
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s : Mauvaise action"
 
 # lib/stdlib.php:36
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
 msgstr "Erreur Fatale de PhpWiki"
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 msgid "Chown"
 msgstr "Chown"
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
 msgstr "DfinirAcl"
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1956,26 +2012,26 @@
 msgstr "RcuprationDeLaPage"
 
 # lib/fullsearch.php:48
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr "RechercheEnTexteIntgral"
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
 msgstr "Le rpertoire 'session.save_path'"
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "le rpertoire 'session.save_path' '%s'"
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "Tentative d'utilisation du rpertoire '%s'  la place."
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
 msgstr "Les utilisateurs ne pourront pas s'inscrire."
 
@@ -2000,8 +2056,8 @@
 msgid "Click to display all comments"
 msgstr "Cliquez pour afficher tout commente"
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 msgid "Click to display"
 msgstr "Cliquez pour afficher"
 
@@ -2130,7 +2186,7 @@
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr "jours"
 
@@ -2213,7 +2269,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 msgid "AuthorHistory"
@@ -2244,8 +2300,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2287,8 +2343,8 @@
 msgid "List all pages which link to %s."
 msgstr "Affiche toutes les pages lie  %s."
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
@@ -2322,7 +2378,7 @@
 msgid "%s pages link to %s:"
 msgstr "%s pages pointent vers %s :"
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2331,17 +2387,17 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
 msgstr ""
 
@@ -2353,11 +2409,11 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr "WikiBlog"
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
 msgstr ""
 
@@ -2368,7 +2424,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2384,12 +2440,12 @@
 msgid "Next Month"
 msgstr "Mois suivant"
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr "diter %s"
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 msgid "CalendarList"
 msgstr "ListeDuCalendrier"
 
@@ -2412,6 +2468,21 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr "Cacher des commentaires dans une PageWiki."
 
+#: ../lib/plugin/CreateBib.php:36
+#, fuzzy
+msgid "CreateBib"
+msgstr "CrerUneTdm"
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr "aucune page indique"
+
 # lib/display.php:14
 #: ../lib/plugin/CreatePage.php:39
 msgid "CreatePage"
@@ -2439,20 +2510,15 @@
 msgid "Automatically link headers at the top"
 msgstr "Crer une table des matires des titres et sous-titres en haut"
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr "aucune page indique"
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 msgid "Table Of Contents"
 msgstr "Table des matires"
 
@@ -2491,7 +2557,7 @@
 "Ajouter ou changer le niveau de page 'key=>value'. Notez que vous pouvez "
 "supprimer une cl en lui attribuant une valeur nulle."
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr "Valider"
 
@@ -2508,6 +2574,21 @@
 msgid "Redirects to an external web site based on form input"
 msgstr "Redirige vers un site externe bas sur un formulaire"
 
+#: ../lib/plugin/FileInfo.php:39
+msgid "FileInfo"
+msgstr "FichierInfo"
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr "Un argument requis '%s' est manquant."
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr ""
@@ -2555,6 +2636,7 @@
 "Affiche une url dans une cadre interne  la page. Un seul cadre autoris."
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr "insertion rcursive de la page %s"
@@ -2584,8 +2666,13 @@
 msgid "only %d pages displayed"
 msgstr "Seulement %d pages affiches"
 
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
 # lib/fullsearch.php:48
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr "Rsultats de la recherche en texte intgral de ' %s '"
@@ -2635,6 +2722,30 @@
 msgid "Go"
 msgstr "OK"
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr "%s paramtre manquant"
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, php-format
+msgid "invalid argument %s"
+msgstr "Argument non valable %s"
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr ""
+
 #: ../lib/plugin/GooglePlugin.php:43
 msgid "GooglePlugin"
 msgstr "PluginGoogle"
@@ -2655,12 +2766,16 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-msgid "empty source"
-msgstr "source vide"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, php-format
+msgid "Couldn't start commandline '%s'"
+msgstr "Impossible de lancer la ligne de commande '%s'"
+
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2683,9 +2798,8 @@
 msgstr "Dposer"
 
 #: ../lib/plugin/HtmlConverter.php:78
-#, fuzzy
 msgid "Only files with extension HTML are allowed"
-msgstr "%s: extension interdit."
+msgstr ""
 
 #: ../lib/plugin/HtmlConverter.php:81
 msgid "Copy the output below and paste it into your Wiki page."
@@ -2700,6 +2814,7 @@
 msgstr "Inclure le texte d'une autre PageWiki."
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr "%s(%d) : rvision inexistante"
@@ -2824,7 +2939,7 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr "Liste des pages qui sont explicitement donnes en argument."
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 msgid "You must be logged in to view ratings."
 msgstr "Vous devez vous connecter pour voir les scores."
 
@@ -3053,7 +3168,7 @@
 "Les dveloppeurs de PhpWiki devraient inspecter manuellement les balises des "
 "fichiers tlchargs avant de les diter sous emacs, et vrifier les CVS."
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 msgid "Warning:"
 msgstr "Attention:"
 
@@ -3071,17 +3186,11 @@
 msgid "Contents"
 msgstr "Contenu"
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s : pas de section de ce type>"
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr "Un argument requis '%s' est manquant."
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr "Suivant"
@@ -3186,28 +3295,130 @@
 msgid "PageTrail Plugin"
 msgstr "Pour suivre les pages  la trace"
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+#, fuzzy
+msgid "PasswordReset"
+msgstr "Mot de passe :"
+
+# lib/msql.php:31 lib/msql.php:37
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr "Message"
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:86
+#, fuzzy, php-format
+msgid "Error sending email with password for user %s."
+msgstr "Mot de passe ou identifiant d'utilisateur invalide."
+
+#: ../lib/plugin/PasswordReset.php:94
+#, fuzzy
+msgid "Reset password of user: "
+msgstr "Mot de passe ou identifiant d'utilisateur invalide."
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+msgid "Already logged in"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr "PrfrencesUtilisateurs"
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+#, fuzzy
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr "Vous devez tre un administrateur pour utiliser ce plugin."
+
+#: ../lib/plugin/PasswordReset.php:174
+#, fuzzy, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr "Voulez-vous rellement effacer toutes vos PrfrencesUtilisateurs ?"
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr "AlbumPhotos"
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr ""
 "Affiche un groupe de photos listes dans un fichier texte avec des "
 "descriptions facultatives."
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, php-format
 msgid "Invalid argument: %s=%s"
 msgstr "Argument non valable : %s=%s"
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr "Mauvaise url dans la source : retirez tous les <, >, \""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, fuzzy, php-format
+msgid "Unable to find src='%s'"
+msgstr "Impossible de lire src=%s"
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, php-format
 msgid "Unable to read src='%s'"
 msgstr "Impossible de lire src=%s"
@@ -3273,6 +3484,10 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+msgid "empty source"
+msgstr "source vide"
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr "GestionsDesPlugins"
@@ -3428,6 +3643,14 @@
 msgid "Raw HTML"
 msgstr "HTML Pur"
 
+#: ../lib/plugin/RdfDefinition.php:42
+msgid "RdfDefinition"
+msgstr ""
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 #: ../lib/plugin/RecentChanges.php:105
 msgid "Deleted"
 msgstr "Supprim"
@@ -3436,124 +3659,124 @@
 msgid "(diff)"
 msgstr "(diff)"
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr "(hist)"
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr "ditions"
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
 msgstr "ditions majeures"
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr "ditions mineures"
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 msgid "Recent Comments"
 msgstr "Commentaires rcents"
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 msgid "comments"
 msgstr "commentaires"
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr ""
 "Les %d %s les plus rcentes pendant le dernier jour sont listes ci-dessous."
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 "Les %d %s les plus rcentes pendant les derniers %s jours sont listes ci-"
 "dessous."
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr "Les %d %s les plus rcentes sont listes ci-dessous."
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr ""
 "Les %d %s les plus anciennes pendant le dernier jour sont listes ci-dessous."
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 "Les %d %s les plus anciennes pendant les derniers %s jours sont listes ci-"
 "dessous."
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr "Les %d %s les plus anciennes sont listes ci-dessous."
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr ""
 "Les %s les plus rcentes pendant le dernier jour sont listes ci-dessous."
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr ""
 "Les %s les plus rcentes pendant les derniers %s jours sont listes ci-"
 "dessous."
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
 msgstr "Toutes les %s sont numres ci-dessous."
 
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr "ditionsRcentes"
 
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 msgid "No comments found"
 msgstr "Aucune diffrence trouve"
 
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
 msgstr "Aucun commentaire trouv"
 
 # lib/fullsearch.php:48
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr "Recherche par titre"
 
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
 msgstr "Afficher les ditions mineures pour :"
 
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
 msgstr "Indiquer toutes les modifications pour :"
 
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
 msgstr "Indiquer les modifications pour :"
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr "1 jour"
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr "%s jours"
@@ -3613,7 +3836,6 @@
 # lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 msgid "RelatedChanges"
 msgstr "ChangementsLis"
 
@@ -3653,7 +3875,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr "Obtenir rcursivement des RtroLiens ou liens"
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr "(niveau maximum de rcursivit: %d)"
@@ -3692,66 +3914,45 @@
 msgid "invalid %s ignored"
 msgstr "%s non valable ignor"
 
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr "Impossible de lancer la ligne de commande '%s'"
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr "InfosSystme"
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr "Affiche les informations de bas niveau pour PhpWiki."
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr "type de bd :"
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr "db backend:"
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr "gestionnaire dba:"
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr "temps mort :"
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr "pas de cache utilis"
 
 # lib/diff.php:1015
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr "page bufferise :"
 
 # lib/pageinfo.php:70
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr "version bufferise :"
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr "Garder jusqu' %d dition majeures, mais pas plus que %d jours."
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr "Garder jusqu' %d dition mineures, mais pas plus que %d jours."
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr ""
 "Garder les dernires contributions des derniers %d auteurs jusqu' %d jours."
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3762,164 +3963,168 @@
 "auteurs depuis les %d derniers jours (mme s'il y en a plus que %d), mais ne "
 "conservez en aucun cas plus que %d rvisions par auteur."
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr "%d pages"
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr "%d pages non vides"
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr "pas encore"
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr "%d pages d'accueil"
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, php-format
 msgid "total hits: %d"
 msgstr "%d visites totales"
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr "maximum : %d"
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr "moyenne : %2.3f"
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr "mdiane : %d"
 
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr "cart-type : %2.3f"
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr "%d pages ayant eu moins de %d visiteurs (<%d%%)."
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr "%d pages ayant eu plus de %d visiteurs (>%d%%)."
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr "Taille de l'application : %d Kb"
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, php-format
 msgid "Pagedata size: %d Kb"
 msgstr "Taille des donnes de la page : %d Kb"
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
 msgstr "%d plugins au total : "
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
 msgstr "%d langages au total : "
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr "Langage actuel : %s"
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr "Langage par dfaut : %s"
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr "%d thmes au total: "
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr "Thme actuel : '%s'"
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr "Thme par dfaut : '%s'"
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr "argument inconnu pour SystemInfo (%s)"
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr "Nom de l'application"
 
 # lib/pageinfo.php:64
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr "Version de PhpWiki"
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr "Base de donnes"
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr "Statistiques de cache"
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr "Statistiques de page"
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr "Statistiques d'utilisateur"
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr "Statistiques de visites"
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr "Expiration des paramtres"
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr "regexp du WikiNom"
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr "Protocoles autoriss"
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr "Images intgres"
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr "Plugins disponibles"
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr "Langages supports"
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
 msgstr "Thmes supports"
 
@@ -3950,6 +4155,15 @@
 msgstr ""
 "Dsol, cette version de PHP ne peut pas crer des fichiers d'image PNG."
 
+#: ../lib/plugin/Template.php:61
+#, fuzzy
+msgid "Template"
+msgstr "Thme"
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr "Pour convertir des formules TeX en image."
@@ -3972,11 +4186,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr "Inclure une page externe dans le corps de la WikiPage."
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr "%s paramtre manquant"
-
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
 msgstr "Page insres"
@@ -4061,19 +4270,6 @@
 msgid "Translate"
 msgstr "Traduire"
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr "Annuler"
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
 msgstr "ListeDesSousPages"
@@ -4151,22 +4347,6 @@
 msgid "Can't open the upload logfile."
 msgstr "Erreur: Impossible d'ouvrir le journal des fichiers dposs."
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr "PrfrencesUtilisateurs"
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
@@ -4175,12 +4355,6 @@
 "La page d'Accueil d'un utilisateur doit tre un NomWiki valide. "
 "PrfrencesUtilisateurs ne peuvent pas tre sauves."
 
-# lib/msql.php:31 lib/msql.php:37
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr "Message"
-
 #: ../lib/plugin/UserPreferences.php:105
 msgid "Your UserPreferences have been successfully deleted."
 msgstr "Vos PrfrencesUtilisateurs ont t effaces avec succs."
@@ -4189,14 +4363,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr "Voulez-vous rellement effacer toutes vos PrfrencesUtilisateurs ?"
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr "Oui"
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr "Mot de passe invalide, essayez encore."
@@ -4267,7 +4433,7 @@
 "Reprsenter la structure du wiki par un graphe utilisant l'outil dot de "
 "graphviz."
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr "Lgende"
 
@@ -4845,7 +5011,7 @@
 msgid "WikiAdminUtils says:"
 msgstr "WikiAdminUtils dit :"
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr "OK"
 
@@ -4920,7 +5086,7 @@
 msgid "Verification Status"
 msgstr "Vrification du statut"
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr "Changer la vrification du statut"
 
@@ -4959,11 +5125,11 @@
 msgid "WikiForm: %s: unknown action"
 msgstr "FormulaireWiki : %s : action inconnue"
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
+#: ../lib/plugin/WikiFormRich.php:181
 msgid "name"
 msgstr "nom"
 
@@ -5163,8 +5329,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5373,8 +5539,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5462,114 +5628,114 @@
 msgid "Back to the previous page."
 msgstr "Retournez  la page prcdente."
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr "MAUVAIS URL -- retirez tous les <, >, \""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 msgid "Invalid image size"
 msgstr "Taille d'image non valables"
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr "MAUVAIS phpwiki: URL"
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr "Verrouillez la page pour permettre le lien"
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr "'%s': Nom de page invalide : : %s"
 
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr "Mener %s n'est pas permis"
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr "Espace blanc converti en espace simple"
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr "Caractres de contrle, non autoriss"
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
 msgstr "trop long"
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr "Illgal %s supprimes"
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
 msgstr "Rvision Non Trouve"
 
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "Je suis dsol. La version %d de %s n'est pas dans la base de donnes."
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr "Mauvaise Version"
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr "-???"
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, php-format
 msgid "%s b"
 msgstr "%s b"
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr "%s octets"
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr "%s k"
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr "%s Ko (%s octets)"
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr "%s : index d'argument hors intervalle"
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s est vide."
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr "Impossible d'ouvrir le rpertoire '%s' en lecture"
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, php-format
 msgid "... (first %s words)"
 msgstr "... (%s premiers mots)"
@@ -5616,7 +5782,7 @@
 msgid "CREATED"
 msgstr "CR"
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr "rechercher des mises  jour ncessaire dans la base de donnes"
 
@@ -5637,133 +5803,137 @@
 msgid "check for new session.sess_ip column"
 msgstr "recherche une nouvelle colonne session.sess_ip"
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr "AJOUT"
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr "recherche une nouvelle colonne session.sess_ip"
 
 # lib/diff.php:1003 lib/diff.php:1021
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 #, fuzzy
 msgid "fixed"
 msgstr "Dernire modification"
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr "CHOU"
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "version <em>%s</em> non affecte"
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr "vrifie le marqueur auto_increment pour page.id"
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr "vrifier la recherche binaire de bug pour mysql 4.1.x (Windows)"
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, php-format
 msgid "version <em>%s</em>"
 msgstr "version <em>%s</em>"
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 msgid "not affected"
 msgstr "non affecte"
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr "CORRIG"
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr "DB admin nom de user :"
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 msgid "DB admin password:"
 msgstr "DB admin mot de passe :"
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr "recherche une extra colonne page.cached_html"
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr ""
 
 # ??
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr "recherche les mises  jour ncessaire des plugin argument"
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr "impossible de dplacer %s en %s"
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, php-format
 msgid "%s is not writable"
 msgstr "%s n'est pas accessible en criture"
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr "vrifie les mises  jour de configuration ncessaire"
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr "Mise  jour dsactive, vous n'tes pas administrateur"
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr "Mise  jour du PhpWiki"
 
@@ -5797,27 +5967,27 @@
 msgid "Members:"
 msgstr "Membres :"
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
 "Impossible de dcompresser les donnes : le support de zlib n'a pas t "
 "valid dans ce PHP"
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr "Impossible d'ouvrir le fichier zip '%s' en lecture"
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
 msgstr "Fin de fichier (EOF) inattendue dans le fichier Zip"
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
 msgstr "[%d] Voir [%s]"
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr "Rfrences"
 
@@ -5839,7 +6009,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5918,8 +6088,8 @@
 msgstr "Visualiser la version actuelle"
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr "Prvisualisation uniquement ! Modifications non enregistres."
@@ -5938,36 +6108,36 @@
 msgstr "Zone d'dition"
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr "Avertissement : Vous ditez une version archive."
 
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr "Enregistrer cette page crasera la version actuelle."
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr "H"
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr "L"
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr "Ajuster"
@@ -5976,84 +6146,76 @@
 msgid "Page Content: "
 msgstr "Contenu de la page : "
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr "Modification mineure."
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr "Anciennes rgles"
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Voir les conseils pour diter les pages dans %s."
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr "StyleCorrect"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr "RglesDeFormatageDesTextes"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr "Vue d'ensemble"
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr "RglesDeFormatageDesTextes"
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr "CommentUtiliserWiki"
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr "BacSable"
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -6091,11 +6253,6 @@
 msgid "Enter your UserId to sign in"
 msgstr "Entrez votre identifiant utilisateur pour vous connecter"
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-msgid "Sign in:"
-msgstr "S'enregistrer :"
-
 # lib/diff.php:1003 lib/diff.php:1021
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
@@ -6118,7 +6275,7 @@
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr "Imprimante"
@@ -6127,13 +6284,13 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr "Moderne"
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
 msgstr "Barres d'outils en haut et en bas"
 
@@ -6272,14 +6429,14 @@
 msgstr "Type de Page :"
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 msgid "Diff previous Revision"
 msgstr "Diffrence avec la rvision prcdente"
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 msgid "Diff previous Author"
@@ -6356,8 +6513,8 @@
 msgid "Page Execution took %s seconds"
 msgstr "L'excution de la page a pris %s seconds"
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
@@ -6365,7 +6522,7 @@
 "Je ne fais que des modifications mineures. Veuillez rediriger les logs "
 "habituels vers %s."
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr "ditez la taille de la zone"
@@ -6897,6 +7054,38 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Warning"
+#~ msgstr "Attention:"
+
+#~ msgid "AUTH_GROUP_FILE not defined"
+#~ msgstr "AUTH_GROUP_FILE non dfini"
+
+#~ msgid "LDAP_AUTH_HOST not defined"
+#~ msgstr "LDAP_AUTH_HOST non dfini"
+
+#~ msgid "Sign in:"
+#~ msgstr "S'enregistrer :"
+
+# lib/diff.php:997
+#~ msgid "Category"
+#~ msgstr "Catgorie"
+
+#~ msgid "Topic"
+#~ msgstr "Sujet"
+
+#~ msgid "db type:"
+#~ msgstr "type de bd :"
+
+#~ msgid "db backend:"
+#~ msgstr "db backend:"
+
+#~ msgid "dba handler:"
+#~ msgstr "gestionnaire dba:"
+
+#~ msgid "timeout:"
+#~ msgstr "temps mort :"
+
+#, fuzzy
 #~ msgid "Replaced link in %s."
 #~ msgstr "Lien remplac dans %s."
 
@@ -6968,10 +7157,6 @@
 #~ "Erreur lors des notifications de changements de page: Impossible "
 #~ "d'envoyer %s  %s"
 
-#, fuzzy
-#~ msgid "CreateBib"
-#~ msgstr "CrerUneTdm"
-
 # lib/editpage.php:19
 #, fuzzy
 #~ msgid "Welcome to %s"
@@ -7068,9 +7253,6 @@
 #~ msgid "No opinion"
 #~ msgstr "Pas d'opinion"
 
-#~ msgid "Unable to bind LDAP server %s"
-#~ msgstr "Impossible de se connecter au serveur LDAP %s"
-
 #~ msgid "Unable to connect to LDAP server "
 #~ msgstr "Impossible de se connecter au serveur LDAP "
 
diff -ruN 11p1/locale/po/it.po 12p3/locale/po/it.po
--- 11p1/locale/po/it.po	2005-09-18 07:12:26.000000000 -0500
+++ 12p3/locale/po/it.po	2006-06-18 06:19:38.000000000 -0500
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Marco Milanesi <kpanic@ada2.unipv.it>\n"
 "Language-Team: \n"
@@ -15,6 +15,14 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr ""
+
 #: ../lib/DbSession.php:50
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
@@ -43,13 +51,13 @@
 msgid "Undo disabled"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
 msgstr ""
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -67,23 +75,23 @@
 msgstr ""
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr ""
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
 msgstr ""
 
 #: ../lib/EditToolbar.php:82
@@ -95,145 +103,136 @@
 msgid "Operation undone"
 msgstr ""
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
 msgstr ""
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 msgid "Link to page"
 msgstr ""
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
 msgstr ""
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
 msgstr ""
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr ""
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
 msgstr ""
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
 msgstr ""
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
 msgstr ""
 
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 msgid "Your signature"
 msgstr ""
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr ""
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr "Registra"
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr ""
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:267
-msgid "Category"
-msgstr "Categoria"
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr ""
-
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 msgid "AddCategory"
 msgstr "InsertoCategoria"
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr "Inserto Categorias (doppio-scatto)"
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr "Inserto"
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 msgid "AddPlugin"
 msgstr "InsertoPlugin"
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr "Inserto Plugin (doppio-scatto)"
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 msgid "AddPageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
 msgstr "Inserto Pagina (doppio-scatto)"
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
-msgstr ""
+msgstr "AggiungaLaMascherina"
 
-#: ../lib/EditToolbar.php:363
-#, fuzzy
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
-msgstr "Inserto Categorias (doppio-scatto)"
+msgstr "Inserto Mascherina (doppio-scatto)"
 
 #: ../lib/ErrorManager.php:210
 #, php-format
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: archivio non trovato"
 
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 msgid "CategoryGroup"
 msgstr "CategoriaGruppo"
 
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -243,7 +242,7 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -277,7 +276,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, php-format
 msgid "%s not found"
 msgstr "%s non trovato"
@@ -310,7 +309,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 msgid "Size"
 msgstr "Dimensione"
@@ -340,7 +339,7 @@
 msgid "Creator"
 msgstr ""
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -440,7 +439,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
+msgid "Check to add this ACL"
 msgstr ""
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
@@ -459,7 +458,7 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -470,7 +469,7 @@
 msgid "Discussion"
 msgstr ""
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
@@ -483,17 +482,17 @@
 msgid "InterWiki Address"
 msgstr ""
 
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -502,37 +501,37 @@
 msgid "RecentChanges"
 msgstr "CambiamentiRecenti"
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
 msgstr ""
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
 msgstr ""
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
 msgstr ""
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, php-format
 msgid "the file '%s'"
 msgstr ""
@@ -542,80 +541,84 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
-#: ../lib/Theme.php:392
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
+msgstr ""
+
+#: ../lib/Theme.php:388
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, php-format
 msgid "Version %s, saved %s"
 msgstr "Versione %s, salvata %s"
 
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, php-format
 msgid "Last edited %s"
 msgstr "Ultima modifica %s"
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "Versione %s, salvata su %s"
 
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, php-format
 msgid "Last edited on %s"
 msgstr "Ultima modifica su %s"
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr "oggi"
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr "ieri"
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, php-format
 msgid "Owner: %s"
 msgstr "Owner: %s"
 
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "di %s"
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr "Salvata: %s"
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
 msgstr ""
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -625,12 +628,12 @@
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -647,26 +650,28 @@
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr ""
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr "Blocca la Pagina"
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr "Sblocca la Pagina"
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr "Rimuovi la Pagina"
 
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -689,85 +694,87 @@
 msgid "TitleSearch"
 msgstr "RicercaSuTutto"
 
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin '%s': non definito"
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
-msgstr ""
+msgstr "Collegamenti Relativi"
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
-msgstr ""
+msgstr "Collegamenti Esterni"
 
-#: ../lib/WikiDB.php:230
-#, fuzzy, php-format
+#: ../lib/WikiDB.php:233
+#, php-format
 msgid "Removed by: %s"
-msgstr "Modifica: %s"
+msgstr "Rimosso vicino: %s"
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, php-format
 msgid "Page removed %s"
 msgstr "Pagina rimosso %s"
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
-msgstr ""
+msgstr "Pagini la notifica del cambiamento di %s trasmesso a %s"
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr ""
+"Errore Di Notifica Del Cambiamento Della Pagina:  Non ha potuto trasmettere %"
+"s a %s"
 
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, php-format
 msgid "renamed from %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 msgid "Optimizing database"
 msgstr "Base di dati d'ottimizzazione"
 
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 msgid "Page change"
-msgstr ""
+msgstr "Cambiamento della pagina"
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 msgid "New page"
 msgstr "Nuova pagina"
 
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifica: %s"
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, php-format
 msgid "Page rename %s to %s"
-msgstr ""
+msgstr "La pagina cambia titolo %s a %s"
 
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Descrivi %s qui."
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr ""
@@ -795,31 +802,31 @@
 
 #: ../lib/WikiGroup.php:29
 msgid "Every"
-msgstr ""
+msgstr "Ogni"
 
 #: ../lib/WikiGroup.php:30
 msgid "Anonymous Users"
-msgstr ""
+msgstr "Utenti Anonimi"
 
 #: ../lib/WikiGroup.php:31
 msgid "Bogo Users"
-msgstr ""
+msgstr "Utenti Bogo"
 
 #: ../lib/WikiGroup.php:32
 msgid "HasHomePage"
-msgstr ""
+msgstr "HaHomePage"
 
 #: ../lib/WikiGroup.php:33
 msgid "Signed Users"
-msgstr ""
+msgstr "Utenti Firmati"
 
 #: ../lib/WikiGroup.php:34
 msgid "Authenticated Users"
-msgstr ""
+msgstr "Utenti Autenticati"
 
 #: ../lib/WikiGroup.php:35
 msgid "Administrators"
-msgstr ""
+msgstr "Coordinatori"
 
 #: ../lib/WikiGroup.php:185 ../lib/WikiGroup.php:232 ../lib/WikiGroup.php:314
 #: ../lib/WikiGroup.php:373 ../lib/WikiGroup.php:389
@@ -851,24 +858,26 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
-msgstr ""
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, php-format
+msgid "%s: not defined"
+msgstr "%s: non definito"
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
 msgstr ""
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
-msgstr ""
+#: ../lib/WikiGroup.php:951
+#, php-format
+msgid "%s not defined"
+msgstr "%s: non definito"
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
 msgstr ""
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
@@ -879,7 +888,7 @@
 
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -888,8 +897,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -901,7 +910,7 @@
 
 #: ../lib/WikiPlugin.php:125
 #, php-format
-msgid "argument '%s' not declared by plugin."
+msgid "Argument '%s' not declared by plugin."
 msgstr ""
 
 #: ../lib/WikiPlugin.php:235
@@ -919,17 +928,17 @@
 msgid "Plugin %s disabled."
 msgstr "Plugin '%s' inabiliti."
 
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, php-format
 msgid "Include of '%s' failed."
 msgstr "Inserimento di '%s' fallito."
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
 msgstr ""
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
@@ -941,17 +950,17 @@
 "referring page."
 msgstr ""
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 msgid "Invalid username."
 msgstr ""
 
@@ -1003,15 +1012,15 @@
 "password in your UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, php-format
 msgid "%s is missing"
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
 msgstr ""
@@ -1020,7 +1029,12 @@
 msgid "Unable to connect to IMAP server "
 msgstr ""
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr ""
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
@@ -1067,36 +1081,36 @@
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 msgid "Email Verification"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1105,17 +1119,17 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
@@ -1210,7 +1224,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1218,7 +1232,7 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1229,93 +1243,107 @@
 msgid "BackLinks"
 msgstr ""
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
 msgstr ""
 
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, php-format
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
 msgstr ""
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr "versione corrente"
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr "Mostra il versione corrente"
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
 msgstr ""
 
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr "Modifica: %s"
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
 msgstr ""
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr "Pagina bloccata."
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr "Pagina sbloccata."
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, php-format
 msgid "Saved: %s"
 msgstr "Salvata: %s"
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 msgid "Too many external links."
 msgstr ""
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
 msgstr ""
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr ""
+
+#: ../lib/editpage.php:397
+#, php-format
+msgid "%s is listed at %s"
+msgstr "%s  elencato a %s"
+
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
 msgstr ""
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
 
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr "Scusa per l'inconveniente."
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr "Pagina Bloccata"
 
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
@@ -1323,7 +1351,7 @@
 "Questa pagina  stata bloccata dall'amministratore in modo da i vostri "
 "cambiamenti non possono essere salvati."
 
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
@@ -1331,53 +1359,58 @@
 "(Copia le tue modifiche nella clipboard. Potete provare a modificare "
 "un'altra pagina o registra il vostro testo in un editor di testo.)"
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
 "sections beginning with '%s', and ending with '%s'.  You will need to edit "
 "those sections by hand before you click Save."
 msgstr ""
+"Alcuni dei cambiamenti non hanno potuto essere uniti automaticamente. Cerchi "
+"prego le sezioni che cominciano con '%s 'e concludentesi con '%s '. Dovrete "
+"pubblicare a mano quelle sezioni prima che vi scattiate risparmi."
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
-msgstr ""
+msgstr "Controllilo prego attraverso prima del risparmio."
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
-msgstr ""
+msgstr "Il Conflitto Pubblica!"
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr ""
+"Nel tempo da quando avete cominciato pubblicare questa pagina, un altro "
+"utente ha conservato una nuova versione di esso."
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
 "have been combined. The result is shown below."
 msgstr ""
+"I vostri cambiamenti non possono essere conservati mentre sono, dal fare in "
+"modo da scriverebbero sopra i cambiamenti dell'altro autore. Cos, i vostri "
+"cambiamenti e quelli dell'altro autore sono stati uniti. Il risultato  "
+"indicato sotto."
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 msgid "Convert"
 msgstr "Convertito"
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
-msgstr ""
+msgstr "L'autore sar annotato come %s."
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
-msgstr ""
+msgstr "Fondasi e pubblichi: %s"
 
 #: ../lib/loadsave.php:70
 msgid "ZIP files of database"
@@ -1447,7 +1480,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 msgid "Skipped."
 msgstr ""
 
@@ -1498,7 +1531,7 @@
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
 msgstr ""
 
@@ -1516,337 +1549,365 @@
 msgid "- saved to database as version %d"
 msgstr "- salvata a base di dati a versione %d"
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME archivio %s"
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, php-format
 msgid "plain file %s"
 msgstr "archivio del testo %s"
 
 #: ../lib/loadsave.php:843
 msgid "Merge Edit"
-msgstr ""
+msgstr "La Fusione Pubblica"
 
 #: ../lib/loadsave.php:849
 msgid "Restore Anyway"
-msgstr ""
+msgstr "Restore Comunque"
 
 #: ../lib/loadsave.php:857
 msgid "Overwrite All"
-msgstr ""
+msgstr "Scriva sopra Tutti"
 
 #: ../lib/loadsave.php:864
 msgid " Sorry, cannot merge."
-msgstr ""
+msgstr " Spiacente, non pu fondersi."
 
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
 msgid "Revert"
-msgstr ""
+msgstr "Ritorni"
 
 #: ../lib/loadsave.php:885
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 msgid "no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 msgid "same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:904
+#: ../lib/loadsave.php:907
+#, fuzzy
+msgid "Cancelled"
+msgstr "Annulla"
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
+msgstr ""
+
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr "Si"
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../lib/loadsave.php:938
 #, php-format
 msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:907
+#: ../lib/loadsave.php:943
+#, fuzzy, php-format
+msgid "Revert: %s"
+msgstr "Ritorni"
+
+#: ../lib/loadsave.php:944
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- versione %d salvata a base di dati a versione %d"
 
-#: ../lib/loadsave.php:921
-#, php-format
-msgid "%s: not defined"
-msgstr "%s: non definito"
-
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
 msgstr ""
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
 msgstr ""
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
 msgstr ""
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
 msgstr ""
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
 msgstr ""
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
 msgstr ""
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr ""
 
-#: ../lib/main.php:454
-#, fuzzy
+#: ../lib/main.php:456
 msgid "authenticated"
-msgstr "salvata a %s"
+msgstr "autenticato"
 
-#: ../lib/main.php:454
-#, fuzzy
+#: ../lib/main.php:456
 msgid "not authenticated"
-msgstr "non salvata a %s"
+msgstr "non autenticato"
 
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 msgid "Missing PagePermission:"
 msgstr ""
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
 msgstr ""
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
 msgstr ""
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr ""
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 msgid "view this page"
 msgstr ""
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 msgid "diff this page"
 msgstr ""
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 msgid "dump html pages"
 msgstr ""
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 msgid "dump serial pages"
 msgstr ""
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 msgid "edit this page"
 msgstr ""
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 msgid "revert to a previous version of this page"
 msgstr ""
 
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 msgid "create this page"
 msgstr ""
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
 msgstr ""
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 msgid "lock this page"
 msgstr ""
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 msgid "remove this page"
 msgstr ""
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 msgid "unlock this page"
 msgstr ""
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
 msgstr ""
 
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
 msgstr ""
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
 msgstr ""
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
 msgstr ""
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 msgid "access this wiki via SOAP"
 msgstr ""
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
+#: ../lib/main.php:510
+msgid "download a html zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
 msgstr ""
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr ""
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr ""
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr ""
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr ""
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr ""
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr ""
 
-#: ../lib/main.php:540
-#, fuzzy
+#: ../lib/main.php:542
 msgid "Locking pages"
 msgstr "Blocca la Pagina"
 
-#: ../lib/main.php:541
-#, fuzzy
+#: ../lib/main.php:543
 msgid "Removing pages"
 msgstr "Rimuovi la pagina"
 
-#: ../lib/main.php:542
-#, fuzzy
+#: ../lib/main.php:544
 msgid "Unlocking pages"
 msgstr "Sblocca la Pagina"
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1854,28 +1915,28 @@
 msgid "ModeratedPage"
 msgstr "PaginaModerata"
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
 
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
 msgstr "Errore Fatale Di PhpWiki"
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 msgid "Chown"
 msgstr ""
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
 msgstr ""
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 msgid "Rename"
 msgstr ""
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1887,26 +1948,26 @@
 msgid "PageDump"
 msgstr ""
 
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr "RicercaDelTesto"
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
 msgstr ""
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr ""
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr ""
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
 msgstr ""
 
@@ -1931,8 +1992,8 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 msgid "Click to display"
 msgstr ""
 
@@ -2061,7 +2122,7 @@
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr "giorni"
 
@@ -2143,7 +2204,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 msgid "AuthorHistory"
@@ -2172,8 +2233,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2211,8 +2272,8 @@
 msgid "List all pages which link to %s."
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
@@ -2246,7 +2307,7 @@
 msgid "%s pages link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2255,17 +2316,17 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
 msgstr ""
 
@@ -2277,11 +2338,11 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
 msgstr ""
 
@@ -2292,7 +2353,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2308,12 +2369,12 @@
 msgid "Next Month"
 msgstr ""
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 msgid "CalendarList"
 msgstr "ListaCalendario"
 
@@ -2335,6 +2396,21 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr ""
 
+#: ../lib/plugin/CreateBib.php:36
+#, fuzzy
+msgid "CreateBib"
+msgstr "Salvata: %s"
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr ""
+
 #: ../lib/plugin/CreatePage.php:39
 msgid "CreatePage"
 msgstr ""
@@ -2360,20 +2436,15 @@
 msgid "Automatically link headers at the top"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr ""
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 msgid "Table Of Contents"
 msgstr ""
 
@@ -2409,7 +2480,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr ""
 
@@ -2425,6 +2496,21 @@
 msgid "Redirects to an external web site based on form input"
 msgstr ""
 
+#: ../lib/plugin/FileInfo.php:39
+msgid "FileInfo"
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr ""
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr ""
@@ -2471,6 +2557,7 @@
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr ""
@@ -2500,7 +2587,12 @@
 msgid "only %d pages displayed"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr "Risultati della ricerca su tutto il testo per '%s'"
@@ -2548,6 +2640,30 @@
 msgid "Go"
 msgstr "Vai"
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, php-format
+msgid "invalid argument %s"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr ""
+
 #: ../lib/plugin/GooglePlugin.php:43
 msgid "GooglePlugin"
 msgstr ""
@@ -2568,12 +2684,16 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-msgid "empty source"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
+
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, php-format
+msgid "Couldn't start commandline '%s'"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2612,6 +2732,7 @@
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr ""
@@ -2651,7 +2772,6 @@
 msgstr "Wiki Nome"
 
 #: ../lib/plugin/JabberPresence.php:23
-#, fuzzy
 msgid "JabberPresence"
 msgstr "JabberPresenca"
 
@@ -2732,7 +2852,7 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 msgid "You must be logged in to view ratings."
 msgstr ""
 
@@ -2949,7 +3069,7 @@
 "markup before rewrapping with emacs and checking into CVS."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 msgid "Warning:"
 msgstr "Avvertimento:"
 
@@ -2967,17 +3087,11 @@
 msgid "Contents"
 msgstr "Indice"
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr ""
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr "Seguente"
@@ -3080,26 +3194,124 @@
 msgid "PageTrail Plugin"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+msgid "PasswordReset"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:86
+#, php-format
+msgid "Error sending email with password for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:94
+msgid "Reset password of user: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+msgid "Already logged in"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr "Preferenze"
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:174
+#, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, php-format
 msgid "Invalid argument: %s=%s"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, php-format
+msgid "Unable to find src='%s'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, php-format
 msgid "Unable to read src='%s'"
 msgstr ""
@@ -3163,6 +3375,10 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+msgid "empty source"
+msgstr ""
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr ""
@@ -3312,6 +3528,14 @@
 msgid "Raw HTML"
 msgstr ""
 
+#: ../lib/plugin/RdfDefinition.php:42
+msgid "RdfDefinition"
+msgstr ""
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 #: ../lib/plugin/RecentChanges.php:105
 msgid "Deleted"
 msgstr "Rimossa"
@@ -3320,114 +3544,114 @@
 msgid "(diff)"
 msgstr "(diff)"
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 msgid "Recent Comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 msgid "comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 msgid "No comments found"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr "La ricerca su tutto il testo"
 
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
 msgstr "Mostrare le modifiche secondarie per:"
 
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr "1 giorno"
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr "%s giorni"
@@ -3485,7 +3709,6 @@
 
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 msgid "RelatedChanges"
 msgstr ""
 
@@ -3525,7 +3748,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr ""
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr ""
@@ -3564,63 +3787,42 @@
 msgid "invalid %s ignored"
 msgstr ""
 
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3628,163 +3830,167 @@
 "more than %d unique author revisions."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, php-format
 msgid "total hits: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, php-format
 msgid "Pagedata size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
 msgstr ""
 
@@ -3812,6 +4018,14 @@
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+#: ../lib/plugin/Template.php:61
+msgid "Template"
+msgstr ""
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr ""
@@ -3833,11 +4047,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr ""
-
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
 msgstr ""
@@ -3917,19 +4126,6 @@
 msgid "Translate"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr "Annulla"
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
 msgstr ""
@@ -3949,9 +4145,9 @@
 msgstr "Inserire dalla %s:"
 
 #: ../lib/plugin/UnfoldSubpages.php:160
-#, fuzzy, php-format
+#, php-format
 msgid "%s has no subpages defined."
-msgstr "%s: non definito"
+msgstr ""
 
 #: ../lib/plugin/UpLoad.php:46
 msgid "Upload files to the local InterWiki Upload:<filename>"
@@ -4007,33 +4203,12 @@
 msgid "Can't open the upload logfile."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr "Preferenze"
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
 "cannot be saved."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:105
 msgid "Your UserPreferences have been successfully deleted."
 msgstr ""
@@ -4042,14 +4217,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr "Si"
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr ""
@@ -4117,7 +4284,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr ""
 
@@ -4322,7 +4489,7 @@
 
 #: ../lib/plugin/WikiAdminMarkup.php:37
 msgid "WikiAdminMarkup"
-msgstr ""
+msgstr "WikiAmministrazioneDisposizione"
 
 #: ../lib/plugin/WikiAdminMarkup.php:41
 msgid "Change the markup type of selected pages."
@@ -4344,16 +4511,14 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminMarkup.php:103
-#, fuzzy
 msgid "PhpWikiAdministration/Markup"
-msgstr "AmministrazioneDiPhpWiki/Rimuovi"
+msgstr "AmministrazioneDiPhpWiki/Disposizione"
 
 #: ../lib/plugin/WikiAdminMarkup.php:152
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently change the markup type of the selected "
 "files?"
-msgstr "Rimuovi la pagina"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminMarkup.php:156
 msgid "Change markup type"
@@ -4671,7 +4836,7 @@
 msgid "WikiAdminUtils says:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr ""
 
@@ -4746,7 +4911,7 @@
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr ""
 
@@ -4785,11 +4950,11 @@
 msgid "WikiForm: %s: unknown action"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
+#: ../lib/plugin/WikiFormRich.php:181
 msgid "name"
 msgstr "Nome"
 
@@ -4980,8 +5145,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5189,8 +5354,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5270,114 +5435,114 @@
 msgid "Back to the previous page."
 msgstr ""
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
 msgstr ""
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
 msgstr ""
 
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, php-format
 msgid "%s b"
 msgstr ""
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr "%s byte"
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr ""
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr "%s Kb (%s byte)"
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -5424,7 +5589,7 @@
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr ""
 
@@ -5445,132 +5610,136 @@
 msgid "check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 #, fuzzy
 msgid "fixed"
 msgstr "Modifica"
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr ""
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, fuzzy, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "versione <em>%s</em>"
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, php-format
 msgid "version <em>%s</em>"
 msgstr "versione <em>%s</em>"
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 #, fuzzy
 msgid "not affected"
 msgstr "non salvata"
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr ""
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 msgid "DB admin password:"
 msgstr ""
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr ""
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr ""
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, php-format
 msgid "%s is not writable"
 msgstr ""
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr ""
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -5603,25 +5772,25 @@
 msgid "Members:"
 msgstr ""
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr ""
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
 msgstr ""
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
 msgstr ""
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr ""
 
@@ -5643,7 +5812,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5718,8 +5887,8 @@
 msgstr "Mostra il versione corrente"
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr ""
@@ -5737,36 +5906,36 @@
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr "A"
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr "L"
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr ""
@@ -5775,84 +5944,76 @@
 msgid "Page Content: "
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr "Vedere %s consigli per le modifiche."
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr "BuonStile"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr "Sinossi"
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr "RegoleDiFormattazioneDelTesto"
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr ""
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -5889,11 +6050,6 @@
 msgid "Enter your UserId to sign in"
 msgstr ""
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-msgid "Sign in:"
-msgstr ""
-
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
 #: ../themes/default/templates/comment.tmpl:18
@@ -5914,7 +6070,7 @@
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr "Stampante"
@@ -5923,13 +6079,13 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr "Moderno"
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
 msgstr ""
 
@@ -6067,14 +6223,14 @@
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 msgid "Diff previous Revision"
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 msgid "Diff previous Author"
@@ -6149,14 +6305,14 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr ""
@@ -6659,6 +6815,13 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Warning"
+#~ msgstr "Avvertimento:"
+
+#~ msgid "Category"
+#~ msgstr "Categoria"
+
+#, fuzzy
 #~ msgid "BlockQuote"
 #~ msgstr "bloccata"
 
@@ -6684,10 +6847,6 @@
 #~ msgstr "Nuova pagina"
 
 #, fuzzy
-#~ msgid "CreateBib"
-#~ msgstr "Salvata: %s"
-
-#, fuzzy
 #~ msgid "Welcome to %s"
 #~ msgstr "Copia di %s"
 
@@ -6791,10 +6950,6 @@
 #~ msgstr "Le %d pagine pi popolari di questo wiki sono:"
 
 #, fuzzy
-#~ msgid "dump html pages from this wiki"
-#~ msgstr "Le %d pagine pi popolari di questo wiki sono:"
-
-#, fuzzy
 #~ msgid "dump serial pages from this wiki"
 #~ msgstr "Le %d pagine pi popolari di questo wiki sono:"
 
diff -ruN 11p1/locale/po/ja.po 12p3/locale/po/ja.po
--- 11p1/locale/po/ja.po	2005-09-18 07:12:27.000000000 -0500
+++ 12p3/locale/po/ja.po	2006-06-18 06:19:38.000000000 -0500
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <webmaster@elf.no-ip.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,14 @@
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr ""
+
 #: ../lib/DbSession.php:50
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
@@ -43,13 +51,13 @@
 msgid "Undo disabled"
 msgstr "ץ饰 %s ̵ˤʤäƤޤ"
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
 msgstr ""
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -67,23 +75,23 @@
 msgstr ""
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr ""
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
 msgstr ""
 
 #: ../lib/EditToolbar.php:82
@@ -95,127 +103,118 @@
 msgid "Operation undone"
 msgstr ""
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
 msgstr ""
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 #, fuzzy
 msgid "Link to page"
 msgstr "ڡΥåǤ"
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
 msgstr ""
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
 msgstr ""
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr ""
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
 msgstr ""
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
 msgstr ""
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
 msgstr ""
 
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 msgid "Your signature"
 msgstr ""
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr ""
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr "¸"
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr "ץӥ塼"
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:267
-#, fuzzy
-msgid "Category"
-msgstr "ۡڡ:"
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr ""
-
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 #, fuzzy
 msgid "AddCategory"
 msgstr "ۡڡ:"
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 #, fuzzy
 msgid "AddPlugin"
 msgstr "ץ饰"
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 #, fuzzy
 msgid "AddPageLink"
 msgstr "ڡԽƤޤ"
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:363
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
 msgstr ""
 
@@ -224,21 +223,21 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: ե뤬Ĥޤ"
 
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 #, fuzzy
 msgid "CategoryGroup"
 msgstr "ۡڡ:"
 
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -248,7 +247,7 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -282,7 +281,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, fuzzy, php-format
 msgid "%s not found"
 msgstr "%s: ե뤬Ĥޤ"
@@ -317,7 +316,7 @@
 msgstr "ҥå"
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 #, fuzzy
 msgid "Size"
@@ -348,7 +347,7 @@
 msgid "Creator"
 msgstr ""
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -452,7 +451,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
+msgid "Check to add this ACL"
 msgstr ""
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
@@ -471,7 +470,7 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -483,7 +482,7 @@
 msgid "Discussion"
 msgstr "С"
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
@@ -496,17 +495,17 @@
 msgid "InterWiki Address"
 msgstr "InterWikiɥ쥹"
 
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -515,37 +514,37 @@
 msgid "RecentChanges"
 msgstr "ѹ"
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
 msgstr ""
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
 msgstr ""
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
 msgstr ""
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, fuzzy, php-format
 msgid "the file '%s'"
 msgstr "MIMEե %s"
@@ -555,80 +554,84 @@
 msgid "%4d  %s\n"
 msgstr ""
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, fuzzy, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "ݡȸ"
 
-#: ../lib/Theme.php:392
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
+msgstr ""
+
+#: ../lib/Theme.php:388
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
 msgstr ""
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, fuzzy, php-format
 msgid "Version %s, saved %s"
 msgstr "С %s"
 
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, fuzzy, php-format
 msgid "Last edited %s"
 msgstr "ǽԽ"
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, fuzzy, php-format
 msgid "Version %s, saved on %s"
 msgstr "С %d"
 
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, fuzzy, php-format
 msgid "Last edited on %s"
 msgstr "ǽԽ: %s"
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr ""
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr ""
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, fuzzy, php-format
 msgid "Owner: %s"
 msgstr "桼ID:"
 
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr ""
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr ": %s"
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "'%s': ڡ̾ޤ"
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -638,12 +641,12 @@
 msgid "Edit"
 msgstr "Խ"
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr "ʬ"
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -660,26 +663,28 @@
 msgid "Sign Out"
 msgstr "󥵥"
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "󥤥"
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr "ڡå"
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr "ڡå"
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr "ڡ"
 
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -702,88 +707,88 @@
 msgid "TitleSearch"
 msgstr "ȥ븡"
 
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, fuzzy, php-format
 msgid "Plugin %s: undefined"
 msgstr "ץ饰 %s Ԥޤ"
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
 msgstr ""
 
-#: ../lib/WikiDB.php:230
+#: ../lib/WikiDB.php:233
 #, fuzzy, php-format
 msgid "Removed by: %s"
 msgstr "Խ: %s"
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, fuzzy, php-format
 msgid "Page removed %s"
 msgstr "ڡåޤ"
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, fuzzy, php-format
 msgid "renamed from %s"
 msgstr "%s ɹޤޤ"
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 #, fuzzy
 msgid "Optimizing database"
 msgstr "%s ŬǤ"
 
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 #, fuzzy
 msgid "Page change"
 msgstr "ѹޤǤ"
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 #, fuzzy
 msgid "New page"
 msgstr "ڡ"
 
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, fuzzy, php-format
 msgid "Edited by: %s"
 msgstr "Խ: %s"
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, fuzzy, php-format
 msgid "Page rename %s to %s"
 msgstr "%s ɹޤޤ"
 
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "%s򵭽Ҥޤ"
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr ""
@@ -868,24 +873,26 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
-msgstr ""
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, php-format
+msgid "%s: not defined"
+msgstr "%s: ̤Ǥ"
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
 msgstr ""
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
-msgstr ""
+#: ../lib/WikiGroup.php:951
+#, fuzzy, php-format
+msgid "%s not defined"
+msgstr "%s: ̤Ǥ"
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
 msgstr ""
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
@@ -896,7 +903,7 @@
 
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -905,8 +912,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -918,7 +925,7 @@
 
 #: ../lib/WikiPlugin.php:125
 #, php-format
-msgid "argument '%s' not declared by plugin."
+msgid "Argument '%s' not declared by plugin."
 msgstr ""
 
 #: ../lib/WikiPlugin.php:235
@@ -936,17 +943,17 @@
 msgid "Plugin %s disabled."
 msgstr "ץ饰 %s ̵ˤʤäƤޤ"
 
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, fuzzy, php-format
 msgid "Include of '%s' failed."
 msgstr "%s Υ󥯥롼ɤ˼Ԥޤ"
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
 msgstr ""
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
@@ -958,17 +965,17 @@
 "referring page."
 msgstr ""
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 #, fuzzy
 msgid "Invalid username."
 msgstr "桼IDѥɤ̵Ǥ"
@@ -1021,15 +1028,15 @@
 "password in your UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, php-format
 msgid "%s is missing"
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
 msgstr ""
@@ -1038,7 +1045,12 @@
 msgid "Unable to connect to IMAP server "
 msgstr ""
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr ""
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
@@ -1086,37 +1098,37 @@
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 #, fuzzy
 msgid "Email Verification"
 msgstr "᡼륢ɥ쥹ǧޤ"
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1125,17 +1137,17 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
@@ -1232,7 +1244,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1240,7 +1252,7 @@
 msgid "%s: %s"
 msgstr ""
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1251,105 +1263,119 @@
 msgid "BackLinks"
 msgstr ""
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
 msgstr ""
 
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, php-format
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
 msgstr ""
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr ""
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
 msgstr ""
 
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr "Խ: %s"
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
 msgstr "򸫤: %s"
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr "ڡϥåǤ"
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr "ڡϥåǤ"
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, fuzzy, php-format
 msgid "Saved: %s"
 msgstr "¸ޤ: 5s"
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 msgid "Too many external links."
 msgstr ""
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
 msgstr ""
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr ""
+
+#: ../lib/editpage.php:397
+#, php-format
+msgid "%s is listed at %s"
+msgstr ""
+
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
 msgstr ""
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
 
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr ""
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr "ڡåޤ"
 
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
 msgstr ""
 
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
 msgstr ""
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -1357,43 +1383,39 @@
 "those sections by hand before you click Save."
 msgstr ""
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
 msgstr ""
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
 msgstr ""
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr ""
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
 "have been combined. The result is shown below."
 msgstr ""
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 #, fuzzy
 msgid "Convert"
 msgstr "ƥ"
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
 msgstr ""
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr ""
@@ -1471,7 +1493,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 msgid "Skipped."
 msgstr ""
 
@@ -1524,7 +1546,7 @@
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
 msgstr ""
 
@@ -1542,17 +1564,17 @@
 msgid "- saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
 msgstr "MIMEե %s"
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
 msgstr "ꥢ饤ե %s"
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, php-format
 msgid "plain file %s"
 msgstr "ץ쥤ե %s"
@@ -1573,8 +1595,8 @@
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
@@ -1586,303 +1608,335 @@
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 #, fuzzy
 msgid "no page content"
 msgstr "ƥ"
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 #, fuzzy
 msgid "same version page"
 msgstr "桼ڡ"
 
-#: ../lib/loadsave.php:904
+#: ../lib/loadsave.php:907
+msgid "Cancelled"
+msgstr ""
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
+msgstr ""
+
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr ""
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr ""
+
+#: ../lib/loadsave.php:938
 #, fuzzy, php-format
 msgid "revert to version %d"
 msgstr "С %d"
 
-#: ../lib/loadsave.php:907
+#: ../lib/loadsave.php:943
+#, fuzzy, php-format
+msgid "Revert: %s"
+msgstr "ž"
+
+#: ../lib/loadsave.php:944
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:921
-#, php-format
-msgid "%s: not defined"
-msgstr "%s: ̤Ǥ"
-
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
 msgstr "'%s' ɹǤ"
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
 msgstr "%s 򥢥åץǤ"
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
 msgstr ""
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
 msgstr ""
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
 msgstr ""
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
 msgstr ""
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
 msgstr ""
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
 msgstr ""
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr ""
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 #, fuzzy
 msgid "authenticated"
 msgstr "%s ¸ޤ"
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 #, fuzzy
 msgid "not authenticated"
 msgstr "%s ¸ޤ"
 
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 #, fuzzy
 msgid "Missing PagePermission:"
 msgstr "ڡС:"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
 msgstr ""
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
 msgstr ""
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr ""
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 #, fuzzy
 msgid "view this page"
 msgstr "ڡ"
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 #, fuzzy
 msgid "diff this page"
 msgstr "ڡԽƤޤ"
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 #, fuzzy
 msgid "dump html pages"
 msgstr "HTMLڡϤƤޤ"
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 #, fuzzy
 msgid "dump serial pages"
 msgstr "ꥢ饤ڡϤƤޤ"
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 #, fuzzy
 msgid "edit this page"
 msgstr "ڡԽƤޤ"
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 msgid "revert to a previous version of this page"
 msgstr ""
 
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 #, fuzzy
 msgid "create this page"
 msgstr "ڡƤޤ"
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
 msgstr ""
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 #, fuzzy
 msgid "lock this page"
 msgstr "ڡΥåǤ"
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 #, fuzzy
 msgid "remove this page"
 msgstr "ڡ"
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 #, fuzzy
 msgid "unlock this page"
 msgstr "ڡΥåǤ"
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
 msgstr ""
 
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
 msgstr ""
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
 msgstr ""
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
 msgstr ""
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 msgid "access this wiki via SOAP"
 msgstr ""
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
+#: ../lib/main.php:510
+msgid "download a html zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
 msgstr "ڡǤ"
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr "ڡκʬϤƤޤ"
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr "HTMLڡϤƤޤ"
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr "ꥢ饤ڡϤƤޤ"
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr "ڡԽƤޤ"
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr "ڡƤޤ"
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr "եɹǤ"
 
-#: ../lib/main.php:540
+#: ../lib/main.php:542
 msgid "Locking pages"
 msgstr "ڡåǤ"
 
-#: ../lib/main.php:541
+#: ../lib/main.php:543
 msgid "Removing pages"
 msgstr "ڡǤ"
 
-#: ../lib/main.php:542
+#: ../lib/main.php:544
 msgid "Unlocking pages"
 msgstr "ڡΥåǤ"
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1891,30 +1945,30 @@
 msgid "ModeratedPage"
 msgstr "ڡƤޤ"
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: ʤǤ"
 
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
 msgstr "̿ŪPhpWikiΥ顼Ǥ"
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 #, fuzzy
 msgid "Chown"
 msgstr ""
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
 msgstr ""
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 #, fuzzy
 msgid "Rename"
 msgstr "̾"
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1927,26 +1981,26 @@
 msgid "PageDump"
 msgstr "ڡ롼"
 
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr "ʸ"
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
 msgstr ""
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, fuzzy, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "ǥ쥯ȥ '%s' ѤƤޤ"
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr ""
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
 msgstr ""
 
@@ -1974,8 +2028,8 @@
 msgid "Click to display all comments"
 msgstr "ڡΥåǤ"
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 #, fuzzy
 msgid "Click to display"
 msgstr "ڡΥåǤ"
@@ -2108,7 +2162,7 @@
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr ""
 
@@ -2194,7 +2248,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 #, fuzzy
@@ -2225,8 +2279,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2265,8 +2319,8 @@
 msgid "List all pages which link to %s."
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
@@ -2300,7 +2354,7 @@
 msgid "%s pages link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2309,17 +2363,17 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
 msgstr ""
 
@@ -2331,11 +2385,11 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
 msgstr ""
 
@@ -2346,7 +2400,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2362,12 +2416,12 @@
 msgid "Next Month"
 msgstr "η"
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr "%s Խ"
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 #, fuzzy
 msgid "CalendarList"
 msgstr ""
@@ -2392,6 +2446,21 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr ""
 
+#: ../lib/plugin/CreateBib.php:36
+#, fuzzy
+msgid "CreateBib"
+msgstr ": %s"
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr ""
+
 #: ../lib/plugin/CreatePage.php:39
 #, fuzzy
 msgid "CreatePage"
@@ -2421,20 +2490,15 @@
 msgid "Automatically link headers at the top"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr ""
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 #, fuzzy
 msgid "Table Of Contents"
 msgstr "ƥ"
@@ -2472,7 +2536,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr ""
 
@@ -2488,6 +2552,22 @@
 msgid "Redirects to an external web site based on form input"
 msgstr ""
 
+#: ../lib/plugin/FileInfo.php:39
+#, fuzzy
+msgid "FileInfo"
+msgstr "Խ:"
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr ""
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr ""
@@ -2535,6 +2615,7 @@
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr ""
@@ -2564,7 +2645,12 @@
 msgid "only %d pages displayed"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr ""
@@ -2612,6 +2698,30 @@
 msgid "Go"
 msgstr ""
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, fuzzy, php-format
+msgid "invalid argument %s"
+msgstr "饤"
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr ""
+
 #: ../lib/plugin/GooglePlugin.php:43
 #, fuzzy
 msgid "GooglePlugin"
@@ -2634,13 +2744,16 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-#, fuzzy
-msgid "empty source"
-msgstr "򸫤"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
+
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, php-format
+msgid "Couldn't start commandline '%s'"
+msgstr ""
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2679,6 +2792,7 @@
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr ""
@@ -2804,7 +2918,7 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 msgid "You must be logged in to view ratings."
 msgstr ""
 
@@ -3024,7 +3138,7 @@
 "markup before rewrapping with emacs and checking into CVS."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 #, fuzzy
 msgid "Warning:"
 msgstr "ٹ!"
@@ -3043,17 +3157,11 @@
 msgid "Contents"
 msgstr "ƥ"
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr ""
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr ""
@@ -3156,26 +3264,126 @@
 msgid "PageTrail Plugin"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+#, fuzzy
+msgid "PasswordReset"
+msgstr "ѥ:"
+
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:86
+#, fuzzy, php-format
+msgid "Error sending email with password for user %s."
+msgstr "桼IDѥɤ̵Ǥ"
+
+#: ../lib/plugin/PasswordReset.php:94
+#, fuzzy
+msgid "Reset password of user: "
+msgstr "桼IDѥɤ̵Ǥ"
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+msgid "Already logged in"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr "桼"
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:174
+#, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr "եȥХ"
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, fuzzy, php-format
 msgid "Invalid argument: %s=%s"
 msgstr "饤"
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, php-format
+msgid "Unable to find src='%s'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, php-format
 msgid "Unable to read src='%s'"
 msgstr ""
@@ -3239,6 +3447,11 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+#, fuzzy
+msgid "empty source"
+msgstr "򸫤"
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr "ץ饰"
@@ -3389,6 +3602,14 @@
 msgid "Raw HTML"
 msgstr "HTML"
 
+#: ../lib/plugin/RdfDefinition.php:42
+msgid "RdfDefinition"
+msgstr ""
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 # ޤ
 #: ../lib/plugin/RecentChanges.php:105
 #, fuzzy
@@ -3399,117 +3620,117 @@
 msgid "(diff)"
 msgstr "(ʬ)"
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr "()"
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 #, fuzzy
 msgid "Recent Comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 #, fuzzy
 msgid "comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 #, fuzzy
 msgid "No comments found"
 msgstr "ѹĤޤǤ"
 
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
 msgstr "ѹĤޤǤ"
 
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr "ȥ븡"
 
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr ""
@@ -3571,7 +3792,6 @@
 
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 #, fuzzy
 msgid "RelatedChanges"
 msgstr "ѹ"
@@ -3613,7 +3833,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr ""
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr ""
@@ -3653,63 +3873,42 @@
 msgid "invalid %s ignored"
 msgstr ""
 
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr "ƥ"
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr "ǡ١"
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr "ǡ١Хå"
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr "dbaϥɥ顼"
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr "ॢ"
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr "åȤޤ"
 
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr "ڡǡ򥭥å:"
 
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr "Сǡ򥭥å:"
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3717,163 +3916,167 @@
 "more than %d unique author revisions."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, fuzzy, php-format
 msgid "total hits: %d"
 msgstr "ҥåȿ: %s"
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr ": %d"
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr "ץꥱ󥵥: %d Х"
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, fuzzy, php-format
 msgid "Pagedata size: %d Kb"
 msgstr "ڡǡ: %s Х"
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
 msgstr " %d ץ饰"
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr "ߤθ: %s"
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr "ơ޿: %d"
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr "ߤΥơ: %s"
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr "ǥեȥơ: %s"
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr "ץꥱ̾"
 
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr "å"
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr "ڡ"
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr "桼"
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr "ҥå"
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr "Ĥץȥ"
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr "饤"
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr "ͭʥץ饰"
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr "ݡȸ"
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
 msgstr "ݡȥơް"
 
@@ -3901,6 +4104,15 @@
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+#: ../lib/plugin/Template.php:61
+#, fuzzy
+msgid "Template"
+msgstr "ơ"
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr ""
@@ -3922,11 +4134,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr ""
-
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
 msgstr ""
@@ -4006,19 +4213,6 @@
 msgid "Translate"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr ""
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
 msgstr ""
@@ -4097,33 +4291,12 @@
 msgid "Can't open the upload logfile."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr "桼"
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
 "cannot be saved."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:105
 msgid "Your UserPreferences have been successfully deleted."
 msgstr ""
@@ -4132,14 +4305,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr ""
@@ -4211,7 +4376,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr ""
 
@@ -4785,7 +4950,7 @@
 msgid "WikiAdminUtils says:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr "ä"
 
@@ -4860,7 +5025,7 @@
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr ""
 
@@ -4899,11 +5064,11 @@
 msgid "WikiForm: %s: unknown action"
 msgstr "WikiForm: '%s' ̤ΤǤ"
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
+#: ../lib/plugin/WikiFormRich.php:181
 #, fuzzy
 msgid "name"
 msgstr "̾"
@@ -5110,8 +5275,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5341,8 +5506,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5423,115 +5588,115 @@
 msgid "Back to the previous page."
 msgstr "ڡƤޤ"
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 #, fuzzy
 msgid "Invalid image size"
 msgstr "饤"
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
 msgstr "Ĺޤ"
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, fuzzy, php-format
 msgid "Illegal chars %s removed"
 msgstr "ڡ̾ޤ"
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
 msgstr "ӥ󤬸Ĥޤ"
 
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr "Сޤ"
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, fuzzy, php-format
 msgid "%s b"
 msgstr "%s Х"
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr "%s Х"
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr ""
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr "%s Х(%s Х)"
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s Ǥ"
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -5578,7 +5743,7 @@
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr ""
 
@@ -5600,133 +5765,137 @@
 msgid "check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 #, fuzzy
 msgid "fixed"
 msgstr "ǽ"
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr ""
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, fuzzy, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "С %s"
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, fuzzy, php-format
 msgid "version <em>%s</em>"
 msgstr "С %s"
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 #, fuzzy
 msgid "not affected"
 msgstr "%s ¸ޤ"
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr ""
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 #, fuzzy
 msgid "DB admin password:"
 msgstr "桼IDѥɤ̵Ǥ"
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr ""
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr ""
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, php-format
 msgid "%s is not writable"
 msgstr ""
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr ""
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -5760,25 +5929,25 @@
 msgid "Members:"
 msgstr ""
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr ""
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
 msgstr ""
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
 msgstr ""
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr "Ȱ"
 
@@ -5800,7 +5969,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5877,8 +6046,8 @@
 msgstr "ߤΥСɽ"
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr "ץӥ塼ƤǤ! ޤ¸ϤƤޤ"
@@ -5896,36 +6065,36 @@
 msgstr "Խꥢ"
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr "ٹ: ʤϸŤӥԽƤޤ"
 
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr "⤵"
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr "Ĵ"
@@ -5935,84 +6104,76 @@
 msgid "Page Content: "
 msgstr "ƥ"
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr "Ťޡåפ"
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr ""
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr ""
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -6050,12 +6211,6 @@
 msgid "Enter your UserId to sign in"
 msgstr "桼IDϤƥ󥤥󤷤Ƥ"
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-#, fuzzy
-msgid "Sign in:"
-msgstr "󥤥"
-
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
 #: ../themes/default/templates/comment.tmpl:18
@@ -6076,7 +6231,7 @@
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr "ץ󥿡"
@@ -6085,13 +6240,13 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr ""
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
 msgstr "ȲΥġС"
 
@@ -6231,7 +6386,7 @@
 msgstr "ڡμ<:"
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 #, fuzzy
@@ -6239,7 +6394,7 @@
 msgstr "Υӥ"
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 #, fuzzy
@@ -6318,14 +6473,14 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr "ԽꥢΥ"
@@ -6840,6 +6995,30 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Warning"
+#~ msgstr "ٹ!"
+
+#, fuzzy
+#~ msgid "Sign in:"
+#~ msgstr "󥤥"
+
+#, fuzzy
+#~ msgid "Category"
+#~ msgstr "ۡڡ:"
+
+#~ msgid "db type:"
+#~ msgstr "ǡ١"
+
+#~ msgid "db backend:"
+#~ msgstr "ǡ١Хå"
+
+#~ msgid "dba handler:"
+#~ msgstr "dbaϥɥ顼"
+
+#~ msgid "timeout:"
+#~ msgstr "ॢ"
+
+#, fuzzy
 #~ msgid "Replaced link in %s."
 #~ msgstr "ץ쥤ե %s"
 
@@ -6891,10 +7070,6 @@
 #~ msgstr "᡼"
 
 #, fuzzy
-#~ msgid "CreateBib"
-#~ msgstr ": %s"
-
-#, fuzzy
 #~ msgid "Continue"
 #~ msgstr "ƥ"
 
diff -ruN 11p1/locale/po/nl.po 12p3/locale/po/nl.po
--- 11p1/locale/po/nl.po	2005-09-18 07:12:27.000000000 -0500
+++ 12p3/locale/po/nl.po	2006-06-18 06:19:38.000000000 -0500
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -18,6 +18,14 @@
 "Date: 1998-05-26 11:26:28+0200\n"
 "From:  <janneke@gnu.org>\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr ""
+
 #: ../lib/DbSession.php:50
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
@@ -46,13 +54,13 @@
 msgid "Undo disabled"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
 msgstr "Zoek & Vervangt"
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -70,23 +78,23 @@
 msgstr ""
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr ""
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
 msgstr ""
 
 #: ../lib/EditToolbar.php:82
@@ -98,122 +106,114 @@
 msgid "Operation undone"
 msgstr ""
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
 msgstr ""
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 msgid "Link to page"
 msgstr ""
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
 msgstr ""
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
 msgstr ""
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr ""
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
 msgstr ""
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
 msgstr ""
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
 msgstr ""
 
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 msgid "Your signature"
 msgstr ""
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr ""
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr "Bewaar"
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr "Voorvertonig"
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:267
-msgid "Category"
-msgstr ""
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr ""
-
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 msgid "AddCategory"
 msgstr ""
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 msgid "AddPlugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 msgid "AddPageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:363
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
 msgstr ""
 
@@ -222,20 +222,20 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr ""
 
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr "Naamloos PhpWiki"
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -245,7 +245,7 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -279,7 +279,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, php-format
 msgid "%s not found"
 msgstr ""
@@ -312,7 +312,7 @@
 msgstr "Teller"
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 msgid "Size"
 msgstr ""
@@ -342,7 +342,7 @@
 msgid "Creator"
 msgstr ""
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -442,7 +442,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
+msgid "Check to add this ACL"
 msgstr ""
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
@@ -461,7 +461,7 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -472,7 +472,7 @@
 msgid "Discussion"
 msgstr ""
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
@@ -485,17 +485,17 @@
 msgid "InterWiki Address"
 msgstr ""
 
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -504,37 +504,37 @@
 msgid "RecentChanges"
 msgstr "RecenteVeranderingen"
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
 msgstr ""
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
 msgstr ""
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
 msgstr ""
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, php-format
 msgid "the file '%s'"
 msgstr ""
@@ -544,80 +544,84 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
-#: ../lib/Theme.php:392
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
+msgstr ""
+
+#: ../lib/Theme.php:388
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
 msgstr ""
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, php-format
 msgid "Version %s, saved %s"
 msgstr "Versie %s, bewarrd %s"
 
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, php-format
 msgid "Last edited %s"
 msgstr "Meest recente verandering %s"
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "Versie %s, bewarrd op %s"
 
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, php-format
 msgid "Last edited on %s"
 msgstr "Meest recente verandering op %s"
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr ""
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr ""
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, php-format
 msgid "Owner: %s"
 msgstr ""
 
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "door %s"
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, fuzzy, php-format
 msgid "Create: %s"
 msgstr "Bewaard: %s"
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
 msgstr ""
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -627,12 +631,12 @@
 msgid "Edit"
 msgstr "Verander"
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -649,26 +653,28 @@
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr ""
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr "Open Pagina"
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr "Sluit Pagina Af"
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr "Verwijder Pagina"
 
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -691,85 +697,85 @@
 msgid "TitleSearch"
 msgstr "TitelZoek"
 
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr ""
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
 msgstr ""
 
-#: ../lib/WikiDB.php:230
+#: ../lib/WikiDB.php:233
 #, php-format
 msgid "Removed by: %s"
 msgstr "Verwijder von: %s"
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, php-format
 msgid "Page removed %s"
 msgstr "Verwijder %s"
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, php-format
 msgid "renamed from %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 msgid "Optimizing database"
 msgstr ""
 
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 msgid "Page change"
 msgstr ""
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 msgid "New page"
 msgstr "Nieuw pagina"
 
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, php-format
 msgid "Edited by: %s"
 msgstr "Verander von: %s"
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Beschrijf %s hier."
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr ""
@@ -853,24 +859,26 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, php-format
+msgid "%s: not defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
 msgstr ""
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
+#: ../lib/WikiGroup.php:951
+#, php-format
+msgid "%s not defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
 msgstr ""
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
@@ -881,7 +889,7 @@
 
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -890,8 +898,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -903,7 +911,7 @@
 
 #: ../lib/WikiPlugin.php:125
 #, php-format
-msgid "argument '%s' not declared by plugin."
+msgid "Argument '%s' not declared by plugin."
 msgstr ""
 
 #: ../lib/WikiPlugin.php:235
@@ -921,17 +929,17 @@
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, php-format
 msgid "Include of '%s' failed."
 msgstr "Insert van '%s' gefaald."
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
 msgstr ""
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
@@ -943,17 +951,17 @@
 "referring page."
 msgstr ""
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 msgid "Invalid username."
 msgstr ""
 
@@ -1008,15 +1016,15 @@
 "password in your UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, php-format
 msgid "%s is missing"
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
 msgstr ""
@@ -1025,7 +1033,12 @@
 msgid "Unable to connect to IMAP server "
 msgstr ""
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr ""
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
@@ -1072,36 +1085,36 @@
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 msgid "Email Verification"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1110,17 +1123,17 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
@@ -1215,7 +1228,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1223,7 +1236,7 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1234,93 +1247,107 @@
 msgid "BackLinks"
 msgstr "TerugLinks"
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
 msgstr ""
 
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, php-format
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
 msgstr ""
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr ""
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
 msgstr ""
 
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr "Verander: %s"
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
 msgstr "Bron tekst: %s"
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr ""
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr ""
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, php-format
 msgid "Saved: %s"
 msgstr "Bewaard: %s"
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 msgid "Too many external links."
 msgstr ""
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
 msgstr ""
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr ""
+
+#: ../lib/editpage.php:397
+#, php-format
+msgid "%s is listed at %s"
+msgstr ""
+
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
 msgstr ""
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
 
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr "Excuses voor het ongemak."
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr "Sidan r Lst"
 
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
@@ -1328,7 +1355,7 @@
 "Deze pagina is afgesloten door de beheerder en je veranderingen kan niet "
 "bewaar worden."
 
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
@@ -1336,7 +1363,7 @@
 "Kopier je veranderingen naar het klipbord of een andere tijdelijke plaats "
 "(bijv. een tekst editor)."
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -1344,42 +1371,38 @@
 "those sections by hand before you click Save."
 msgstr ""
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
 msgstr ""
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
 msgstr ""
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr ""
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
 "have been combined. The result is shown below."
 msgstr ""
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 msgid "Convert"
 msgstr ""
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
 msgstr ""
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr ""
@@ -1452,7 +1475,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 msgid "Skipped."
 msgstr ""
 
@@ -1503,7 +1526,7 @@
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
 msgstr "Het PhpWiki programmeerteam"
 
@@ -1521,17 +1544,17 @@
 msgid "- saved to database as version %d"
 msgstr "- bewaard in de data base als versie %d"
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME bestand %s"
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
 msgstr "Geserialiseerd bestand %s"
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, php-format
 msgid "plain file %s"
 msgstr "plat bestand %s"
@@ -1552,8 +1575,8 @@
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
@@ -1564,289 +1587,323 @@
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 msgid "no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 msgid "same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:904
-#, php-format
-msgid "revert to version %d"
+#: ../lib/loadsave.php:907
+#, fuzzy
+msgid "Cancelled"
+msgstr "Annuleer"
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
 msgstr ""
 
-#: ../lib/loadsave.php:907
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr ""
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr "Annuleer"
+
+#: ../lib/loadsave.php:938
 #, php-format
-msgid "- version %d saved to database as version %d"
+msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:921
+#: ../lib/loadsave.php:943
+#, fuzzy, php-format
+msgid "Revert: %s"
+msgstr "Verwijder von: %s"
+
+#: ../lib/loadsave.php:944
 #, php-format
-msgid "%s: not defined"
+msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
 msgstr "Overgeslagen"
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
 msgstr "Laden van maagdelijke wiki"
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
 msgstr ""
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
 msgstr ""
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
 msgstr ""
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
 msgstr ""
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
 msgstr ""
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
 msgstr ""
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr ""
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "authenticated"
 msgstr ""
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "not authenticated"
 msgstr ""
 
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 msgid "Missing PagePermission:"
 msgstr ""
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
 msgstr ""
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
 msgstr ""
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr ""
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 msgid "view this page"
 msgstr ""
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 msgid "diff this page"
 msgstr ""
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 msgid "dump html pages"
 msgstr ""
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 msgid "dump serial pages"
 msgstr ""
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 msgid "edit this page"
 msgstr ""
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 msgid "revert to a previous version of this page"
 msgstr ""
 
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 msgid "create this page"
 msgstr ""
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
 msgstr ""
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 msgid "lock this page"
 msgstr ""
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 msgid "remove this page"
 msgstr ""
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 msgid "unlock this page"
 msgstr ""
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
 msgstr ""
 
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
 msgstr ""
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
 msgstr ""
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
 msgstr ""
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 msgid "access this wiki via SOAP"
 msgstr ""
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
-msgstr ""
+#: ../lib/main.php:510
+#, fuzzy
+msgid "download a html zip dump from this wiki"
+msgstr "De %d meestbezochte pagina's van deze Wiki:"
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
 msgstr ""
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr ""
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr ""
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr ""
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr ""
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr ""
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr ""
 
-#: ../lib/main.php:540
+#: ../lib/main.php:542
 msgid "Locking pages"
 msgstr ""
 
-#: ../lib/main.php:541
+#: ../lib/main.php:543
 msgid "Removing pages"
 msgstr ""
 
-#: ../lib/main.php:542
+#: ../lib/main.php:544
 msgid "Unlocking pages"
 msgstr ""
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1854,28 +1911,28 @@
 msgid "ModeratedPage"
 msgstr ""
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
 
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
 msgstr "PhpWiki Fatale Fout"
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 msgid "Chown"
 msgstr ""
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
 msgstr ""
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 msgid "Rename"
 msgstr ""
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1887,26 +1944,26 @@
 msgid "PageDump"
 msgstr ""
 
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr "VolledigeTekstZoek"
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
 msgstr ""
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr ""
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr ""
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
 msgstr ""
 
@@ -1931,8 +1988,8 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 msgid "Click to display"
 msgstr ""
 
@@ -2061,7 +2118,7 @@
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr ""
 
@@ -2143,7 +2200,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 msgid "AuthorHistory"
@@ -2172,8 +2229,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2211,8 +2268,8 @@
 msgid "List all pages which link to %s."
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
@@ -2246,7 +2303,7 @@
 msgid "%s pages link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2255,17 +2312,17 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
 msgstr ""
 
@@ -2277,11 +2334,11 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
 msgstr ""
 
@@ -2292,7 +2349,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2308,12 +2365,12 @@
 msgid "Next Month"
 msgstr ""
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr "Verander %s"
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 msgid "CalendarList"
 msgstr ""
 
@@ -2335,6 +2392,21 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr ""
 
+#: ../lib/plugin/CreateBib.php:36
+#, fuzzy
+msgid "CreateBib"
+msgstr "Bewaard: %s"
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr ""
+
 #: ../lib/plugin/CreatePage.php:39
 msgid "CreatePage"
 msgstr ""
@@ -2360,20 +2432,15 @@
 msgid "Automatically link headers at the top"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr ""
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 msgid "Table Of Contents"
 msgstr ""
 
@@ -2409,7 +2476,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr ""
 
@@ -2425,6 +2492,21 @@
 msgid "Redirects to an external web site based on form input"
 msgstr ""
 
+#: ../lib/plugin/FileInfo.php:39
+msgid "FileInfo"
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr ""
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr ""
@@ -2471,6 +2553,7 @@
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr ""
@@ -2500,7 +2583,12 @@
 msgid "only %d pages displayed"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr "Volledige tekst zoek resultaten naar '%s'"
@@ -2548,6 +2636,30 @@
 msgid "Go"
 msgstr ""
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, php-format
+msgid "invalid argument %s"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr ""
+
 #: ../lib/plugin/GooglePlugin.php:43
 msgid "GooglePlugin"
 msgstr ""
@@ -2568,12 +2680,16 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-msgid "empty source"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
+
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, php-format
+msgid "Couldn't start commandline '%s'"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2612,6 +2728,7 @@
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr ""
@@ -2731,7 +2848,7 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 msgid "You must be logged in to view ratings."
 msgstr ""
 
@@ -2948,7 +3065,7 @@
 "markup before rewrapping with emacs and checking into CVS."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 msgid "Warning:"
 msgstr ""
 
@@ -2966,17 +3083,11 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr ""
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr "Volgende"
@@ -3079,26 +3190,124 @@
 msgid "PageTrail Plugin"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+msgid "PasswordReset"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:86
+#, php-format
+msgid "Error sending email with password for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:94
+msgid "Reset password of user: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+msgid "Already logged in"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr "GebruikersVoorkeuren"
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:174
+#, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, php-format
 msgid "Invalid argument: %s=%s"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, php-format
+msgid "Unable to find src='%s'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, php-format
 msgid "Unable to read src='%s'"
 msgstr ""
@@ -3162,6 +3371,10 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+msgid "empty source"
+msgstr ""
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr ""
@@ -3311,6 +3524,14 @@
 msgid "Raw HTML"
 msgstr ""
 
+#: ../lib/plugin/RdfDefinition.php:42
+msgid "RdfDefinition"
+msgstr ""
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 #: ../lib/plugin/RecentChanges.php:105
 #, fuzzy
 msgid "Deleted"
@@ -3320,114 +3541,114 @@
 msgid "(diff)"
 msgstr "(diff)"
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 msgid "Recent Comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 msgid "comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr "De %d meest recent %s staan hieronder."
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 msgid "No comments found"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr "Titel Zoek"
 
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr ""
@@ -3485,7 +3706,6 @@
 
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 msgid "RelatedChanges"
 msgstr ""
 
@@ -3525,7 +3745,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr ""
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr ""
@@ -3564,63 +3784,42 @@
 msgid "invalid %s ignored"
 msgstr ""
 
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3628,163 +3827,167 @@
 "more than %d unique author revisions."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, php-format
 msgid "total hits: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, php-format
 msgid "Pagedata size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
 msgstr ""
 
@@ -3812,6 +4015,14 @@
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+#: ../lib/plugin/Template.php:61
+msgid "Template"
+msgstr ""
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr ""
@@ -3833,11 +4044,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr ""
-
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
 msgstr ""
@@ -3917,19 +4123,6 @@
 msgid "Translate"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr "Annuleer"
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
 msgstr ""
@@ -4007,33 +4200,12 @@
 msgid "Can't open the upload logfile."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr "GebruikersVoorkeuren"
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
 "cannot be saved."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:105
 msgid "Your UserPreferences have been successfully deleted."
 msgstr ""
@@ -4042,14 +4214,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr ""
@@ -4117,7 +4281,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr ""
 
@@ -4672,7 +4836,7 @@
 msgid "WikiAdminUtils says:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr ""
 
@@ -4747,7 +4911,7 @@
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr ""
 
@@ -4786,11 +4950,11 @@
 msgid "WikiForm: %s: unknown action"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
+#: ../lib/plugin/WikiFormRich.php:181
 msgid "name"
 msgstr ""
 
@@ -4981,8 +5145,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5190,8 +5354,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5271,114 +5435,114 @@
 msgid "Back to the previous page."
 msgstr ""
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
 msgstr ""
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
 msgstr ""
 
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, php-format
 msgid "%s b"
 msgstr ""
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr ""
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr ""
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr ""
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -5425,7 +5589,7 @@
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr ""
 
@@ -5446,130 +5610,134 @@
 msgid "check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 msgid "fixed"
 msgstr ""
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr ""
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, fuzzy, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "versie <em>%s</em>"
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, php-format
 msgid "version <em>%s</em>"
 msgstr "versie <em>%s</em>"
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 msgid "not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr ""
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 msgid "DB admin password:"
 msgstr ""
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr ""
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr ""
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, php-format
 msgid "%s is not writable"
 msgstr ""
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr ""
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -5602,25 +5770,25 @@
 msgid "Members:"
 msgstr ""
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr ""
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
 msgstr ""
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
 msgstr "[%d] Zie [%s]"
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr "Referenties"
 
@@ -5642,7 +5810,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5717,8 +5885,8 @@
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr ""
@@ -5736,36 +5904,36 @@
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr "H"
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr "B"
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr ""
@@ -5774,84 +5942,76 @@
 msgid "Page Content: "
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s tips for veranderen."
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr "GoedeStijl"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr "OudTekstFormatteringsRegels"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr "TekstFormatteringsRegels"
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr ""
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -5888,11 +6048,6 @@
 msgid "Enter your UserId to sign in"
 msgstr ""
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-msgid "Sign in:"
-msgstr ""
-
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
 #: ../themes/default/templates/comment.tmpl:18
@@ -5913,7 +6068,7 @@
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr "Drukker"
@@ -5922,13 +6077,13 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr ""
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
 msgstr ""
 
@@ -6066,14 +6221,14 @@
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 msgid "Diff previous Revision"
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 msgid "Diff previous Author"
@@ -6148,14 +6303,14 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr ""
@@ -6689,10 +6844,6 @@
 #~ msgstr "Nieuw pagina."
 
 #, fuzzy
-#~ msgid "CreateBib"
-#~ msgstr "Bewaard: %s"
-
-#, fuzzy
 #~ msgid "Are you sure you want to save these access restrictions?"
 #~ msgstr "Verwijder pagina"
 
@@ -6808,10 +6959,6 @@
 #~ msgstr "De %d meestbezochte pagina's van deze Wiki:"
 
 #, fuzzy
-#~ msgid "dump html pages from this wiki"
-#~ msgstr "De %d meestbezochte pagina's van deze Wiki:"
-
-#, fuzzy
 #~ msgid "dump serial pages from this wiki"
 #~ msgstr "De %d meestbezochte pagina's van deze Wiki:"
 
diff -ruN 11p1/locale/po/phpwiki.pot 12p3/locale/po/phpwiki.pot
--- 11p1/locale/po/phpwiki.pot	2005-09-18 07:12:25.000000000 -0500
+++ 12p3/locale/po/phpwiki.pot	2006-06-18 06:19:38.000000000 -0500
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <rurban@users.sf.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,14 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr ""
+
 #: ../lib/DbSession.php:50
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
@@ -42,13 +50,13 @@
 msgid "Undo disabled"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
 msgstr ""
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -66,23 +74,23 @@
 msgstr ""
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr ""
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
 msgstr ""
 
 #: ../lib/EditToolbar.php:82
@@ -94,122 +102,114 @@
 msgid "Operation undone"
 msgstr ""
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
 msgstr ""
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 msgid "Link to page"
 msgstr ""
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
 msgstr ""
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
 msgstr ""
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr ""
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
 msgstr ""
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
 msgstr ""
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
 msgstr ""
 
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 msgid "Your signature"
 msgstr ""
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr ""
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr ""
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr ""
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:267
-msgid "Category"
-msgstr ""
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr ""
-
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 msgid "AddCategory"
 msgstr ""
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 msgid "AddPlugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 msgid "AddPageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:363
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
 msgstr ""
 
@@ -218,20 +218,20 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr ""
 
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -241,7 +241,7 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -275,7 +275,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, php-format
 msgid "%s not found"
 msgstr ""
@@ -308,7 +308,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 msgid "Size"
 msgstr ""
@@ -338,7 +338,7 @@
 msgid "Creator"
 msgstr ""
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -438,7 +438,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
+msgid "Check to add this ACL"
 msgstr ""
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
@@ -457,7 +457,7 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -468,7 +468,7 @@
 msgid "Discussion"
 msgstr ""
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
@@ -481,17 +481,17 @@
 msgid "InterWiki Address"
 msgstr ""
 
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -500,37 +500,37 @@
 msgid "RecentChanges"
 msgstr ""
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
 msgstr ""
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
 msgstr ""
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
 msgstr ""
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, php-format
 msgid "the file '%s'"
 msgstr ""
@@ -540,80 +540,84 @@
 msgid "%4d  %s\n"
 msgstr ""
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
-#: ../lib/Theme.php:392
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
+msgstr ""
+
+#: ../lib/Theme.php:388
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
 msgstr ""
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, php-format
 msgid "Version %s, saved %s"
 msgstr ""
 
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, php-format
 msgid "Last edited %s"
 msgstr ""
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr ""
 
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, php-format
 msgid "Last edited on %s"
 msgstr ""
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr ""
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr ""
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, php-format
 msgid "Owner: %s"
 msgstr ""
 
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr ""
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr ""
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
 msgstr ""
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -623,12 +627,12 @@
 msgid "Edit"
 msgstr ""
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr ""
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -645,26 +649,28 @@
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr ""
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr ""
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr ""
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr ""
 
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -687,85 +693,85 @@
 msgid "TitleSearch"
 msgstr ""
 
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr ""
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
 msgstr ""
 
-#: ../lib/WikiDB.php:230
+#: ../lib/WikiDB.php:233
 #, php-format
 msgid "Removed by: %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, php-format
 msgid "Page removed %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, php-format
 msgid "renamed from %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 msgid "Optimizing database"
 msgstr ""
 
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 msgid "Page change"
 msgstr ""
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 msgid "New page"
 msgstr ""
 
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, php-format
 msgid "Edited by: %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr ""
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr ""
@@ -849,24 +855,26 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, php-format
+msgid "%s: not defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
 msgstr ""
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
+#: ../lib/WikiGroup.php:951
+#, php-format
+msgid "%s not defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
 msgstr ""
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
@@ -877,7 +885,7 @@
 
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -886,8 +894,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -899,7 +907,7 @@
 
 #: ../lib/WikiPlugin.php:125
 #, php-format
-msgid "argument '%s' not declared by plugin."
+msgid "Argument '%s' not declared by plugin."
 msgstr ""
 
 #: ../lib/WikiPlugin.php:235
@@ -917,17 +925,17 @@
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, php-format
 msgid "Include of '%s' failed."
 msgstr ""
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
 msgstr ""
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
@@ -939,17 +947,17 @@
 "referring page."
 msgstr ""
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 msgid "Invalid username."
 msgstr ""
 
@@ -999,15 +1007,15 @@
 "password in your UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, php-format
 msgid "%s is missing"
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
 msgstr ""
@@ -1016,7 +1024,12 @@
 msgid "Unable to connect to IMAP server "
 msgstr ""
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr ""
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
@@ -1063,36 +1076,36 @@
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 msgid "Email Verification"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1101,17 +1114,17 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
@@ -1208,7 +1221,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1216,7 +1229,7 @@
 msgid "%s: %s"
 msgstr ""
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1227,105 +1240,119 @@
 msgid "BackLinks"
 msgstr ""
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
 msgstr ""
 
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, php-format
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
 msgstr ""
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr ""
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
 msgstr ""
 
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr ""
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
 msgstr ""
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr ""
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr ""
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, php-format
 msgid "Saved: %s"
 msgstr ""
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 msgid "Too many external links."
 msgstr ""
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
 msgstr ""
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr ""
+
+#: ../lib/editpage.php:397
+#, php-format
+msgid "%s is listed at %s"
+msgstr ""
+
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
 msgstr ""
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
 
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr ""
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr ""
 
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
 msgstr ""
 
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
 msgstr ""
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -1333,42 +1360,38 @@
 "those sections by hand before you click Save."
 msgstr ""
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
 msgstr ""
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
 msgstr ""
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr ""
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
 "have been combined. The result is shown below."
 msgstr ""
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 msgid "Convert"
 msgstr ""
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
 msgstr ""
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr ""
@@ -1441,7 +1464,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 msgid "Skipped."
 msgstr ""
 
@@ -1492,7 +1515,7 @@
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
 msgstr ""
 
@@ -1510,17 +1533,17 @@
 msgid "- saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, php-format
 msgid "plain file %s"
 msgstr ""
@@ -1541,8 +1564,8 @@
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
@@ -1553,289 +1576,321 @@
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 msgid "no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 msgid "same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:904
+#: ../lib/loadsave.php:907
+msgid "Cancelled"
+msgstr ""
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
+msgstr ""
+
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr ""
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr ""
+
+#: ../lib/loadsave.php:938
 #, php-format
 msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:907
+#: ../lib/loadsave.php:943
 #, php-format
-msgid "- version %d saved to database as version %d"
+msgid "Revert: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:921
+#: ../lib/loadsave.php:944
 #, php-format
-msgid "%s: not defined"
+msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
 msgstr ""
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
 msgstr ""
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
 msgstr ""
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
 msgstr ""
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
 msgstr ""
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
 msgstr ""
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr ""
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "authenticated"
 msgstr ""
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "not authenticated"
 msgstr ""
 
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 msgid "Missing PagePermission:"
 msgstr ""
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
 msgstr ""
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
 msgstr ""
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr ""
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 msgid "view this page"
 msgstr ""
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 msgid "diff this page"
 msgstr ""
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 msgid "dump html pages"
 msgstr ""
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 msgid "dump serial pages"
 msgstr ""
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 msgid "edit this page"
 msgstr ""
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 msgid "revert to a previous version of this page"
 msgstr ""
 
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 msgid "create this page"
 msgstr ""
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
 msgstr ""
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 msgid "lock this page"
 msgstr ""
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 msgid "remove this page"
 msgstr ""
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 msgid "unlock this page"
 msgstr ""
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
 msgstr ""
 
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
 msgstr ""
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
 msgstr ""
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
 msgstr ""
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 msgid "access this wiki via SOAP"
 msgstr ""
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
+#: ../lib/main.php:510
+msgid "download a html zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
 msgstr ""
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr ""
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr ""
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr ""
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr ""
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr ""
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr ""
 
-#: ../lib/main.php:540
+#: ../lib/main.php:542
 msgid "Locking pages"
 msgstr ""
 
-#: ../lib/main.php:541
+#: ../lib/main.php:543
 msgid "Removing pages"
 msgstr ""
 
-#: ../lib/main.php:542
+#: ../lib/main.php:544
 msgid "Unlocking pages"
 msgstr ""
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1843,28 +1898,28 @@
 msgid "ModeratedPage"
 msgstr ""
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
 
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
 msgstr ""
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 msgid "Chown"
 msgstr ""
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
 msgstr ""
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 msgid "Rename"
 msgstr ""
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1876,26 +1931,26 @@
 msgid "PageDump"
 msgstr ""
 
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr ""
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
 msgstr ""
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr ""
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr ""
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
 msgstr ""
 
@@ -1920,8 +1975,8 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 msgid "Click to display"
 msgstr ""
 
@@ -2050,7 +2105,7 @@
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr ""
 
@@ -2132,7 +2187,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 msgid "AuthorHistory"
@@ -2161,8 +2216,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2200,8 +2255,8 @@
 msgid "List all pages which link to %s."
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
@@ -2235,7 +2290,7 @@
 msgid "%s pages link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2244,17 +2299,17 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
 msgstr ""
 
@@ -2266,11 +2321,11 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
 msgstr ""
 
@@ -2281,7 +2336,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2297,12 +2352,12 @@
 msgid "Next Month"
 msgstr ""
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr ""
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 msgid "CalendarList"
 msgstr ""
 
@@ -2324,6 +2379,20 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr ""
 
+#: ../lib/plugin/CreateBib.php:36
+msgid "CreateBib"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr ""
+
 #: ../lib/plugin/CreatePage.php:39
 msgid "CreatePage"
 msgstr ""
@@ -2349,20 +2418,15 @@
 msgid "Automatically link headers at the top"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr ""
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 msgid "Table Of Contents"
 msgstr ""
 
@@ -2398,7 +2462,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr ""
 
@@ -2414,6 +2478,21 @@
 msgid "Redirects to an external web site based on form input"
 msgstr ""
 
+#: ../lib/plugin/FileInfo.php:39
+msgid "FileInfo"
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr ""
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr ""
@@ -2460,6 +2539,7 @@
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr ""
@@ -2489,7 +2569,12 @@
 msgid "only %d pages displayed"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr ""
@@ -2537,6 +2622,30 @@
 msgid "Go"
 msgstr ""
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, php-format
+msgid "invalid argument %s"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr ""
+
 #: ../lib/plugin/GooglePlugin.php:43
 msgid "GooglePlugin"
 msgstr ""
@@ -2557,12 +2666,16 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-msgid "empty source"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
+
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, php-format
+msgid "Couldn't start commandline '%s'"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2601,6 +2714,7 @@
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr ""
@@ -2720,7 +2834,7 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 msgid "You must be logged in to view ratings."
 msgstr ""
 
@@ -2937,7 +3051,7 @@
 "markup before rewrapping with emacs and checking into CVS."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 msgid "Warning:"
 msgstr ""
 
@@ -2955,17 +3069,11 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr ""
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr ""
@@ -3068,26 +3176,124 @@
 msgid "PageTrail Plugin"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+msgid "PasswordReset"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:86
+#, php-format
+msgid "Error sending email with password for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:94
+msgid "Reset password of user: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+msgid "Already logged in"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:174
+#, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, php-format
 msgid "Invalid argument: %s=%s"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, php-format
+msgid "Unable to find src='%s'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, php-format
 msgid "Unable to read src='%s'"
 msgstr ""
@@ -3151,6 +3357,10 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+msgid "empty source"
+msgstr ""
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr ""
@@ -3300,6 +3510,14 @@
 msgid "Raw HTML"
 msgstr ""
 
+#: ../lib/plugin/RdfDefinition.php:42
+msgid "RdfDefinition"
+msgstr ""
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 #: ../lib/plugin/RecentChanges.php:105
 msgid "Deleted"
 msgstr ""
@@ -3308,114 +3526,114 @@
 msgid "(diff)"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 msgid "Recent Comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 msgid "comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 msgid "No comments found"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr ""
@@ -3473,7 +3691,6 @@
 
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 msgid "RelatedChanges"
 msgstr ""
 
@@ -3513,7 +3730,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr ""
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr ""
@@ -3552,63 +3769,42 @@
 msgid "invalid %s ignored"
 msgstr ""
 
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3616,163 +3812,167 @@
 "more than %d unique author revisions."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, php-format
 msgid "total hits: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, php-format
 msgid "Pagedata size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
 msgstr ""
 
@@ -3800,6 +4000,14 @@
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+#: ../lib/plugin/Template.php:61
+msgid "Template"
+msgstr ""
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr ""
@@ -3821,11 +4029,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr ""
-
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
 msgstr ""
@@ -3905,19 +4108,6 @@
 msgid "Translate"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr ""
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
 msgstr ""
@@ -3995,33 +4185,12 @@
 msgid "Can't open the upload logfile."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
 "cannot be saved."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:105
 msgid "Your UserPreferences have been successfully deleted."
 msgstr ""
@@ -4030,14 +4199,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr ""
@@ -4105,7 +4266,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr ""
 
@@ -4657,7 +4818,7 @@
 msgid "WikiAdminUtils says:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr ""
 
@@ -4732,7 +4893,7 @@
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr ""
 
@@ -4771,11 +4932,11 @@
 msgid "WikiForm: %s: unknown action"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
+#: ../lib/plugin/WikiFormRich.php:181
 msgid "name"
 msgstr ""
 
@@ -4966,8 +5127,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5175,8 +5336,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5256,114 +5417,114 @@
 msgid "Back to the previous page."
 msgstr ""
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
 msgstr ""
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
 msgstr ""
 
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, php-format
 msgid "%s b"
 msgstr ""
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr ""
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr ""
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr ""
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -5410,7 +5571,7 @@
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr ""
 
@@ -5431,130 +5592,134 @@
 msgid "check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 msgid "fixed"
 msgstr ""
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr ""
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, php-format
 msgid "version <em>%s</em> not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, php-format
 msgid "version <em>%s</em>"
 msgstr ""
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 msgid "not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr ""
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 msgid "DB admin password:"
 msgstr ""
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr ""
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr ""
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, php-format
 msgid "%s is not writable"
 msgstr ""
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr ""
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -5587,25 +5752,25 @@
 msgid "Members:"
 msgstr ""
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr ""
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
 msgstr ""
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
 msgstr ""
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr ""
 
@@ -5627,7 +5792,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5702,8 +5867,8 @@
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr ""
@@ -5721,36 +5886,36 @@
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr ""
@@ -5759,84 +5924,76 @@
 msgid "Page Content: "
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr ""
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr ""
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -5873,11 +6030,6 @@
 msgid "Enter your UserId to sign in"
 msgstr ""
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-msgid "Sign in:"
-msgstr ""
-
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
 #: ../themes/default/templates/comment.tmpl:18
@@ -5898,7 +6050,7 @@
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr ""
@@ -5907,13 +6059,13 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr ""
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
 msgstr ""
 
@@ -6051,14 +6203,14 @@
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 msgid "Diff previous Revision"
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 msgid "Diff previous Author"
@@ -6133,14 +6285,14 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr ""
diff -ruN 11p1/locale/po/sv.po 12p3/locale/po/sv.po
--- 11p1/locale/po/sv.po	2005-09-18 07:12:27.000000000 -0500
+++ 12p3/locale/po/sv.po	2006-06-18 06:19:38.000000000 -0500
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.4pre\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon slund <jooon@hem.passagen.se>\n"
 "Language-Team: \n"
@@ -15,6 +15,14 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr ""
+
 #: ../lib/DbSession.php:50
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
@@ -43,13 +51,13 @@
 msgid "Undo disabled"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
 msgstr ""
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -67,23 +75,23 @@
 msgstr ""
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr ""
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
 msgstr ""
 
 #: ../lib/EditToolbar.php:82
@@ -95,124 +103,115 @@
 msgid "Operation undone"
 msgstr ""
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
 msgstr ""
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 msgid "Link to page"
 msgstr ""
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
 msgstr ""
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
 msgstr ""
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr ""
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
 msgstr ""
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
 msgstr ""
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
 msgstr ""
 
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 msgid "Your signature"
 msgstr ""
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr ""
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr "Spara"
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr "versikt"
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:267
-#, fuzzy
-msgid "Category"
-msgstr "Nuvarande sida:"
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr ""
-
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 #, fuzzy
 msgid "AddCategory"
 msgstr "Nuvarande sida:"
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 msgid "AddPlugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 msgid "AddPageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:363
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
 msgstr ""
 
@@ -221,20 +220,20 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: fila ingen funna"
 
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -244,7 +243,7 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -278,7 +277,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, fuzzy, php-format
 msgid "%s not found"
 msgstr "%s: fila ingen funna"
@@ -312,7 +311,7 @@
 msgstr "Trffar"
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 msgid "Size"
 msgstr ""
@@ -342,7 +341,7 @@
 msgid "Creator"
 msgstr ""
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -442,7 +441,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
+msgid "Check to add this ACL"
 msgstr ""
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
@@ -461,7 +460,7 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -472,7 +471,7 @@
 msgid "Discussion"
 msgstr ""
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
@@ -485,17 +484,17 @@
 msgid "InterWiki Address"
 msgstr ""
 
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -504,37 +503,37 @@
 msgid "RecentChanges"
 msgstr "Senastendringar"
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
 msgstr ""
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
 msgstr ""
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
 msgstr ""
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, php-format
 msgid "the file '%s'"
 msgstr ""
@@ -544,80 +543,84 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
-#: ../lib/Theme.php:392
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
+msgstr ""
+
+#: ../lib/Theme.php:388
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
 msgstr "%s i %s"
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, php-format
 msgid "Version %s, saved %s"
 msgstr "Version %s, sparade %s"
 
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, php-format
 msgid "Last edited %s"
 msgstr "Senast ndrad %s"
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, php-format
 msgid "Version %s, saved on %s"
 msgstr "Version %s, sparade %s"
 
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, php-format
 msgid "Last edited on %s"
 msgstr "Senast ndrad %s"
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr "i dag"
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr "i gr"
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, php-format
 msgid "Owner: %s"
 msgstr ""
 
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "av %s"
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr ""
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
 msgstr ""
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -627,12 +630,12 @@
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr "Diff"
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -649,26 +652,28 @@
 msgid "Sign Out"
 msgstr "Logga ut"
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Anslut"
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr "Ls Sida"
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr "Ls upp Sida"
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr "Ta bort sida"
 
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -691,86 +696,86 @@
 msgid "TitleSearch"
 msgstr "Titelskningen"
 
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, fuzzy, php-format
 msgid "Plugin %s: undefined"
 msgstr "%s: fila ingen funna"
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
 msgstr ""
 
-#: ../lib/WikiDB.php:230
+#: ../lib/WikiDB.php:233
 #, fuzzy, php-format
 msgid "Removed by: %s"
 msgstr "Redigera: %s"
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, fuzzy, php-format
 msgid "Page removed %s"
 msgstr "Sidan r Lst"
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, php-format
 msgid "renamed from %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 msgid "Optimizing database"
 msgstr ""
 
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 msgid "Page change"
 msgstr ""
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 #, fuzzy
 msgid "New page"
 msgstr "Ta bort sida"
 
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, fuzzy, php-format
 msgid "Edited by: %s"
 msgstr "Redigera: %s"
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "Beskriv %s hr."
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr ""
@@ -854,24 +859,26 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr ""
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
-msgstr ""
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, fuzzy, php-format
+msgid "%s: not defined"
+msgstr "%s: fila ingen funna"
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
 msgstr ""
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
-msgstr ""
+#: ../lib/WikiGroup.php:951
+#, fuzzy, php-format
+msgid "%s not defined"
+msgstr "%s: fila ingen funna"
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
 msgstr ""
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
@@ -882,7 +889,7 @@
 
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -891,8 +898,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -904,7 +911,7 @@
 
 #: ../lib/WikiPlugin.php:125
 #, php-format
-msgid "argument '%s' not declared by plugin."
+msgid "Argument '%s' not declared by plugin."
 msgstr ""
 
 #: ../lib/WikiPlugin.php:235
@@ -922,17 +929,17 @@
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, fuzzy, php-format
 msgid "Include of '%s' failed."
 msgstr "Insttning fr '%s' misslyckades."
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
 msgstr ""
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
@@ -944,17 +951,17 @@
 "referring page."
 msgstr ""
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 msgid "Invalid username."
 msgstr ""
 
@@ -1005,15 +1012,15 @@
 "password in your UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, php-format
 msgid "%s is missing"
 msgstr ""
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
 msgstr ""
@@ -1022,7 +1029,12 @@
 msgid "Unable to connect to IMAP server "
 msgstr ""
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr ""
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
@@ -1069,36 +1081,36 @@
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
 " You have to ask the System Administrator to reset your password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 msgid "Email Verification"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1107,17 +1119,17 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
@@ -1212,7 +1224,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1220,7 +1232,7 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1231,100 +1243,114 @@
 msgid "BackLinks"
 msgstr ""
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
 msgstr ""
 
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, fuzzy, php-format
 msgid "(Redirected from %s)"
 msgstr "(Insttning frn %s)"
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
 msgstr ""
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr ""
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr ""
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr ""
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
 msgstr ""
 
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr "Redigera: %s"
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
 msgstr "Visa Kllkoden: %s"
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr ""
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr ""
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, php-format
 msgid "Saved: %s"
 msgstr "Sparade: %s"
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 msgid "Too many external links."
 msgstr ""
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
 msgstr ""
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr ""
+
+#: ../lib/editpage.php:397
+#, fuzzy, php-format
+msgid "%s is listed at %s"
+msgstr "%s i %s"
+
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
 msgstr ""
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
 
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr "Ledsen fr allt besvr."
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr "Sidan r Lst"
 
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 #, fuzzy
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
 msgstr "Den hr sidan r lst av administratren och kan ej redigeras."
 
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 #, fuzzy
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
@@ -1333,7 +1359,7 @@
 "Kopiera dina ndringar till urklippet eller till ett annat temporrt stlle "
 "(t.ex. en texteditor)."
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -1341,43 +1367,39 @@
 "those sections by hand before you click Save."
 msgstr ""
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
 msgstr ""
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
 msgstr ""
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr ""
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
 "have been combined. The result is shown below."
 msgstr ""
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 #, fuzzy
 msgid "Convert"
 msgstr "Innehll"
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
 msgstr ""
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr ""
@@ -1450,7 +1472,7 @@
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 msgid "Skipped."
 msgstr ""
 
@@ -1502,7 +1524,7 @@
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
 msgstr ""
 
@@ -1520,17 +1542,17 @@
 msgid "- saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, fuzzy, php-format
 msgid "plain file %s"
 msgstr "senast ndrad %s"
@@ -1551,8 +1573,8 @@
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
@@ -1563,289 +1585,323 @@
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 msgid "no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 msgid "same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:904
+#: ../lib/loadsave.php:907
+#, fuzzy
+msgid "Cancelled"
+msgstr "Avbyrt"
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
+msgstr ""
+
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr ""
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr "Avbyrt"
+
+#: ../lib/loadsave.php:938
 #, php-format
 msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:907
+#: ../lib/loadsave.php:943
+#, fuzzy, php-format
+msgid "Revert: %s"
+msgstr "Redigera: %s"
+
+#: ../lib/loadsave.php:944
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:921
-#, fuzzy, php-format
-msgid "%s: not defined"
-msgstr "%s: fila ingen funna"
-
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
 msgstr ""
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
 msgstr ""
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
 msgstr ""
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
 msgstr ""
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
 msgstr ""
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
 msgstr ""
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr ""
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "authenticated"
 msgstr ""
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 msgid "not authenticated"
 msgstr ""
 
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 msgid "Missing PagePermission:"
 msgstr ""
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
 msgstr ""
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
 msgstr ""
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr ""
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 msgid "view this page"
 msgstr ""
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 msgid "diff this page"
 msgstr ""
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 msgid "dump html pages"
 msgstr ""
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 msgid "dump serial pages"
 msgstr ""
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 msgid "edit this page"
 msgstr ""
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 msgid "revert to a previous version of this page"
 msgstr ""
 
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 msgid "create this page"
 msgstr ""
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
 msgstr ""
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 msgid "lock this page"
 msgstr ""
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 msgid "remove this page"
 msgstr ""
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 msgid "unlock this page"
 msgstr ""
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
 msgstr ""
 
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
 msgstr ""
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
 msgstr ""
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
 msgstr ""
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 msgid "access this wiki via SOAP"
 msgstr ""
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
-msgstr ""
+#: ../lib/main.php:510
+#, fuzzy
+msgid "download a html zip dump from this wiki"
+msgstr "De %d mest populra sidorna fr den hr wikin:"
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
 msgstr ""
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr ""
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr ""
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr ""
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr ""
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr ""
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr ""
 
-#: ../lib/main.php:540
+#: ../lib/main.php:542
 msgid "Locking pages"
 msgstr ""
 
-#: ../lib/main.php:541
+#: ../lib/main.php:543
 msgid "Removing pages"
 msgstr ""
 
-#: ../lib/main.php:542
+#: ../lib/main.php:544
 msgid "Unlocking pages"
 msgstr ""
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1854,28 +1910,28 @@
 msgid "ModeratedPage"
 msgstr "SkEfterSida"
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
 
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
 msgstr "PhpWiki Fatal Error"
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 msgid "Chown"
 msgstr ""
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
 msgstr ""
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 msgid "Rename"
 msgstr ""
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1887,26 +1943,26 @@
 msgid "PageDump"
 msgstr ""
 
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr "Fulltextskning"
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
 msgstr ""
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr ""
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr ""
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
 msgstr ""
 
@@ -1931,8 +1987,8 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 msgid "Click to display"
 msgstr ""
 
@@ -2061,7 +2117,7 @@
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr ""
 
@@ -2143,7 +2199,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 msgid "AuthorHistory"
@@ -2172,8 +2228,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2211,8 +2267,8 @@
 msgid "List all pages which link to %s."
 msgstr ""
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
@@ -2246,7 +2302,7 @@
 msgid "%s pages link to %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2255,17 +2311,17 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
 msgstr ""
 
@@ -2277,11 +2333,11 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
 msgstr ""
 
@@ -2292,7 +2348,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2308,12 +2364,12 @@
 msgid "Next Month"
 msgstr "Fljande Mnad"
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 msgid "CalendarList"
 msgstr ""
 
@@ -2335,6 +2391,20 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr ""
 
+#: ../lib/plugin/CreateBib.php:36
+msgid "CreateBib"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr ""
+
 #: ../lib/plugin/CreatePage.php:39
 msgid "CreatePage"
 msgstr ""
@@ -2360,20 +2430,15 @@
 msgid "Automatically link headers at the top"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr ""
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 msgid "Table Of Contents"
 msgstr ""
 
@@ -2409,7 +2474,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr ""
 
@@ -2425,6 +2490,21 @@
 msgid "Redirects to an external web site based on form input"
 msgstr ""
 
+#: ../lib/plugin/FileInfo.php:39
+msgid "FileInfo"
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr ""
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr ""
@@ -2471,6 +2551,7 @@
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr ""
@@ -2500,7 +2581,12 @@
 msgid "only %d pages displayed"
 msgstr ""
 
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr "Skresultat fr fulltextskning fr '%s'"
@@ -2549,6 +2635,30 @@
 msgid "Go"
 msgstr "\"G till sidan\""
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, php-format
+msgid "invalid argument %s"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr ""
+
 #: ../lib/plugin/GooglePlugin.php:43
 msgid "GooglePlugin"
 msgstr ""
@@ -2569,12 +2679,16 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-msgid "empty source"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
+
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, php-format
+msgid "Couldn't start commandline '%s'"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2613,6 +2727,7 @@
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr ""
@@ -2735,7 +2850,7 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 msgid "You must be logged in to view ratings."
 msgstr ""
 
@@ -2952,7 +3067,7 @@
 "markup before rewrapping with emacs and checking into CVS."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 msgid "Warning:"
 msgstr ""
 
@@ -2970,17 +3085,11 @@
 msgid "Contents"
 msgstr "Innehll"
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr ""
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr "Nsta"
@@ -3083,26 +3192,124 @@
 msgid "PageTrail Plugin"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+msgid "PasswordReset"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:86
+#, php-format
+msgid "Error sending email with password for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:94
+msgid "Reset password of user: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+msgid "Already logged in"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:174
+#, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, php-format
 msgid "Invalid argument: %s=%s"
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, php-format
+msgid "Unable to find src='%s'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, php-format
 msgid "Unable to read src='%s'"
 msgstr ""
@@ -3166,6 +3373,10 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+msgid "empty source"
+msgstr ""
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr ""
@@ -3315,6 +3526,14 @@
 msgid "Raw HTML"
 msgstr ""
 
+#: ../lib/plugin/RdfDefinition.php:42
+msgid "RdfDefinition"
+msgstr ""
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 #: ../lib/plugin/RecentChanges.php:105
 #, fuzzy
 msgid "Deleted"
@@ -3324,114 +3543,114 @@
 msgid "(diff)"
 msgstr "(diff)"
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 msgid "Recent Comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 msgid "comments"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr "De %d senaste %s sidorna listas nedan."
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 msgid "No comments found"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr "Titelskningen"
 
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr "1 dag"
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr "%s dar"
@@ -3489,7 +3708,6 @@
 
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 msgid "RelatedChanges"
 msgstr ""
 
@@ -3529,7 +3747,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr ""
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr ""
@@ -3568,63 +3786,42 @@
 msgid "invalid %s ignored"
 msgstr ""
 
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr ""
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3632,163 +3829,167 @@
 "more than %d unique author revisions."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, php-format
 msgid "total hits: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, php-format
 msgid "Pagedata size: %d Kb"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr ""
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
 msgstr ""
 
@@ -3816,6 +4017,14 @@
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr ""
 
+#: ../lib/plugin/Template.php:61
+msgid "Template"
+msgstr ""
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr ""
@@ -3837,11 +4046,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr ""
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr ""
-
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
 msgstr ""
@@ -3921,19 +4125,6 @@
 msgid "Translate"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr "Avbyrt"
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
 msgstr ""
@@ -4011,33 +4202,12 @@
 msgid "Can't open the upload logfile."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
 "cannot be saved."
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:105
 msgid "Your UserPreferences have been successfully deleted."
 msgstr ""
@@ -4046,14 +4216,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr ""
@@ -4121,7 +4283,7 @@
 "from graphviz."
 msgstr ""
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr ""
 
@@ -4675,7 +4837,7 @@
 msgid "WikiAdminUtils says:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr ""
 
@@ -4750,7 +4912,7 @@
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr ""
 
@@ -4789,11 +4951,11 @@
 msgid "WikiForm: %s: unknown action"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
+#: ../lib/plugin/WikiFormRich.php:181
 msgid "name"
 msgstr ""
 
@@ -4984,8 +5146,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5193,8 +5355,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5274,114 +5436,114 @@
 msgid "Back to the previous page."
 msgstr ""
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
 msgstr ""
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
 msgstr ""
 
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, php-format
 msgid "%s b"
 msgstr ""
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr ""
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr ""
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr ""
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -5428,7 +5590,7 @@
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr ""
 
@@ -5449,130 +5611,134 @@
 msgid "check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 msgid "fixed"
 msgstr ""
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr ""
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, fuzzy, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "version %s"
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, fuzzy, php-format
 msgid "version <em>%s</em>"
 msgstr "version %s"
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 msgid "not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr ""
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 msgid "DB admin password:"
 msgstr ""
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr ""
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr ""
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, php-format
 msgid "%s is not writable"
 msgstr ""
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr ""
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -5605,25 +5771,25 @@
 msgid "Members:"
 msgstr ""
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr ""
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr ""
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
 msgstr ""
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
 msgstr ""
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr ""
 
@@ -5645,7 +5811,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5720,8 +5886,8 @@
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr ""
@@ -5739,36 +5905,36 @@
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr "H"
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr "B"
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr "Justera"
@@ -5777,84 +5943,76 @@
 msgid "Page Content: "
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr "%s: Redigeringstips."
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr "BraStil"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr ""
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr "versikt"
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr "Textformateringsregler"
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr ""
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -5892,11 +6050,6 @@
 msgid "Enter your UserId to sign in"
 msgstr ""
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-msgid "Sign in:"
-msgstr ""
-
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
 #: ../themes/default/templates/comment.tmpl:18
@@ -5917,7 +6070,7 @@
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr "Skrivare"
@@ -5926,13 +6079,13 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr "Ny|modig"
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
 msgstr ""
 
@@ -6070,14 +6223,14 @@
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 msgid "Diff previous Revision"
 msgstr ""
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 msgid "Diff previous Author"
@@ -6152,14 +6305,14 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr ""
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr ""
@@ -6668,6 +6821,14 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Warning"
+#~ msgstr "Varning!"
+
+#, fuzzy
+#~ msgid "Category"
+#~ msgstr "Nuvarande sida:"
+
+#, fuzzy
 #~ msgid "BlockQuote"
 #~ msgstr "lst"
 
@@ -6788,10 +6949,6 @@
 #~ msgstr "De %d mest populra sidorna fr den hr wikin:"
 
 #, fuzzy
-#~ msgid "dump html pages from this wiki"
-#~ msgstr "De %d mest populra sidorna fr den hr wikin:"
-
-#, fuzzy
 #~ msgid "dump serial pages from this wiki"
 #~ msgstr "De %d mest populra sidorna fr den hr wikin:"
 
diff -ruN 11p1/locale/po/zh.po 12p3/locale/po/zh.po
--- 11p1/locale/po/zh.po	2005-09-18 07:12:28.000000000 -0500
+++ 12p3/locale/po/zh.po	2006-06-18 06:19:38.000000000 -0500
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.3.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 12:12+0000\n"
+"POT-Creation-Date: 2006-06-18 10:46+0000\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <druryl@user.sourceforge.net>\n"
 "Language-Team: DruryL <druryl@users.sourceforge.net>\n"
@@ -14,6 +14,14 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../lib/Captcha.php:32
+msgid "Typed in verification word mismatch ... are you a bot?"
+msgstr ""
+
+#: ../lib/Captcha.php:68
+msgid "Type word above:"
+msgstr ""
+
 #: ../lib/DbSession.php:50
 #, fuzzy, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
@@ -45,13 +53,13 @@
 msgid "Undo disabled"
 msgstr "<未能顯示>"
 
-#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:228
-#: ../lib/EditToolbar.php:229 ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/EditToolbar.php:57 ../lib/EditToolbar.php:253
+#: ../lib/EditToolbar.php:254 ../lib/plugin/WikiAdminSearchReplace.php:187
 msgid "Search & Replace"
 msgstr "搜尋與取代"
 
 #: ../lib/EditToolbar.php:59 ../lib/plugin/InterWikiSearch.php:91
-#: ../lib/plugin/RecentChanges.php:588 ../themes/Crao/templates/navbar.tmpl:42
+#: ../lib/plugin/RecentChanges.php:591 ../themes/Crao/templates/navbar.tmpl:42
 #: ../themes/Crao/templates/navbar.tmpl:44
 #: ../themes/Crao/templates/navbar.tmpl:48
 #: ../themes/blog/templates/search.tmpl:6
@@ -70,23 +78,23 @@
 msgstr "取代:"
 
 #: ../lib/EditToolbar.php:63 ../lib/upgrade.php:375 ../lib/upgrade.php:384
-#: ../lib/upgrade.php:393 ../lib/upgrade.php:412 ../lib/upgrade.php:440
-#: ../lib/upgrade.php:485 ../lib/upgrade.php:488 ../lib/upgrade.php:519
-#: ../lib/upgrade.php:521 ../lib/upgrade.php:548 ../lib/upgrade.php:601
-#: ../lib/upgrade.php:714 ../lib/upgrade.php:717 ../lib/upgrade.php:768
-#: ../lib/upgrade.php:826 ../lib/upgrade.php:836
+#: ../lib/upgrade.php:393 ../lib/upgrade.php:414 ../lib/upgrade.php:442
+#: ../lib/upgrade.php:492 ../lib/upgrade.php:495 ../lib/upgrade.php:526
+#: ../lib/upgrade.php:528 ../lib/upgrade.php:555 ../lib/upgrade.php:608
+#: ../lib/upgrade.php:727 ../lib/upgrade.php:730 ../lib/upgrade.php:782
+#: ../lib/upgrade.php:840 ../lib/upgrade.php:850
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:281
-#: ../lib/EditToolbar.php:314 ../lib/EditToolbar.php:338
-#: ../lib/EditToolbar.php:366
+#: ../lib/EditToolbar.php:65 ../lib/EditToolbar.php:308
+#: ../lib/EditToolbar.php:354 ../lib/EditToolbar.php:378
+#: ../lib/EditToolbar.php:411
 msgid "Close"
 msgstr ""
 
 #: ../lib/EditToolbar.php:80
 #, php-format
-msgid "Substring \"%s\" found %s times. Replace with with \"%s\"?"
+msgid "Substring \"%s\" found %s times. Replace with \"%s\"?"
 msgstr ""
 
 #: ../lib/EditToolbar.php:82
@@ -98,129 +106,120 @@
 msgid "Operation undone"
 msgstr ""
 
-#: ../lib/EditToolbar.php:144 ../lib/EditToolbar.php:145
+#: ../lib/EditToolbar.php:167 ../lib/EditToolbar.php:168
 msgid "Bold text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:149 ../lib/EditToolbar.php:150
+#: ../lib/EditToolbar.php:172 ../lib/EditToolbar.php:173
 msgid "Italic text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:154
+#: ../lib/EditToolbar.php:177
 msgid "optional label | PageName"
 msgstr ""
 
-#: ../lib/EditToolbar.php:155
+#: ../lib/EditToolbar.php:178
 #, fuzzy
 msgid "Link to page"
 msgstr "解除鎖定此頁面"
 
-#: ../lib/EditToolbar.php:159
+#: ../lib/EditToolbar.php:182
 msgid "optional label | http://www.example.com"
 msgstr ""
 
-#: ../lib/EditToolbar.php:160
+#: ../lib/EditToolbar.php:183
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:164
+#: ../lib/EditToolbar.php:187
 msgid "Headline text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:165
+#: ../lib/EditToolbar.php:188
 msgid "Level 1 headline"
 msgstr ""
 
-#: ../lib/EditToolbar.php:169
+#: ../lib/EditToolbar.php:192
 msgid "Example.jpg"
 msgstr ""
 
-#: ../lib/EditToolbar.php:170
+#: ../lib/EditToolbar.php:193
 msgid "Embedded image"
 msgstr ""
 
-#: ../lib/EditToolbar.php:174
+#: ../lib/EditToolbar.php:197
 msgid "Insert non-formatted text here"
 msgstr ""
 
-#: ../lib/EditToolbar.php:175
+#: ../lib/EditToolbar.php:198
 msgid "Ignore wiki formatting"
 msgstr ""
 
-#: ../lib/EditToolbar.php:180
+#: ../lib/EditToolbar.php:203
 #, fuzzy
 msgid "Your signature"
 msgstr "你的版本"
 
-#: ../lib/EditToolbar.php:185
+#: ../lib/EditToolbar.php:208
 msgid "Horizontal line"
 msgstr ""
 
-#: ../lib/EditToolbar.php:187 ../lib/EditToolbar.php:189
-#: ../lib/editpage.php:562
+#: ../lib/EditToolbar.php:210 ../lib/EditToolbar.php:212
+#: ../lib/editpage.php:567
 msgid "Save"
 msgstr "儲存"
 
-#: ../lib/EditToolbar.php:191 ../lib/EditToolbar.php:193
-#: ../lib/editpage.php:558
+#: ../lib/EditToolbar.php:214 ../lib/EditToolbar.php:216
+#: ../lib/editpage.php:563
 msgid "Preview"
 msgstr "預覽"
 
-#: ../lib/EditToolbar.php:209
+#: ../lib/EditToolbar.php:232
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:220 ../lib/EditToolbar.php:221
+#: ../lib/EditToolbar.php:245 ../lib/EditToolbar.php:246
 #, fuzzy
 msgid "Undo Search & Replace"
 msgstr "搜尋與取代"
 
-#: ../lib/EditToolbar.php:267
-#, fuzzy
-msgid "Category"
-msgstr "CategoryPage"
-
-#: ../lib/EditToolbar.php:268
-msgid "Topic"
-msgstr ""
-
-#: ../lib/EditToolbar.php:276
+#: ../lib/EditToolbar.php:302 ../lib/EditToolbar.php:303
 #, fuzzy
 msgid "AddCategory"
 msgstr "CategoryPage"
 
-#: ../lib/EditToolbar.php:278
+#: ../lib/EditToolbar.php:305
 msgid "Insert Categories (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:280 ../lib/EditToolbar.php:313
-#: ../lib/EditToolbar.php:337 ../lib/EditToolbar.php:365
+#: ../lib/EditToolbar.php:307 ../lib/EditToolbar.php:353
+#: ../lib/EditToolbar.php:377 ../lib/EditToolbar.php:410
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:309
+#: ../lib/EditToolbar.php:348 ../lib/EditToolbar.php:349
 #, fuzzy
 msgid "AddPlugin"
 msgstr "Plugin"
 
-#: ../lib/EditToolbar.php:311
+#: ../lib/EditToolbar.php:351
 msgid "Insert Plugin (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:333
+#: ../lib/EditToolbar.php:372 ../lib/EditToolbar.php:373
 #, fuzzy
 msgid "AddPageLink"
 msgstr "AddingPages"
 
-#: ../lib/EditToolbar.php:335
+#: ../lib/EditToolbar.php:375
 msgid "Insert PageLink (double-click)"
 msgstr ""
 
-#: ../lib/EditToolbar.php:361
+#: ../lib/EditToolbar.php:405 ../lib/EditToolbar.php:406
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:363
+#: ../lib/EditToolbar.php:408
 msgid "Insert Template (double-click)"
 msgstr ""
 
@@ -229,20 +228,20 @@
 msgid "%s: error while handling error:"
 msgstr "%s: 處理錯誤時發生錯誤"
 
-#: ../lib/FileFinder.php:191 ../lib/loadsave.php:926
+#: ../lib/FileFinder.php:191 ../lib/loadsave.php:967
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: 找不到檔案."
 
-#: ../lib/IniConfig.php:721
+#: ../lib/IniConfig.php:732
 msgid "CategoryGroup"
 msgstr "CategoryGroup"
 
-#: ../lib/IniConfig.php:723
+#: ../lib/IniConfig.php:734
 msgid "An unnamed PhpWiki"
 msgstr "未被命名的 PhpWiki"
 
-#: ../lib/IniConfig.php:725 ../lib/upgrade.php:149
+#: ../lib/IniConfig.php:736 ../lib/upgrade.php:149
 #: ../themes/Wordpress/templates/actionbar.tmpl:18
 #: ../themes/default/templates/userprefs.tmpl:123
 msgid "HomePage"
@@ -252,7 +251,7 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:641
+#: ../lib/InlineParser.php:652
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -286,7 +285,7 @@
 msgstr "... 包圍 %s"
 
 #: ../lib/PageList.php:402 ../lib/plugin/AppendText.php:57
-#: ../lib/upgrade.php:796
+#: ../lib/upgrade.php:810
 #, php-format
 msgid "%s not found"
 msgstr "%s 找不到."
@@ -319,7 +318,7 @@
 msgstr "點擊"
 
 #: ../lib/PageList.php:958 ../themes/Crao/templates/editpage.tmpl:37
-#: ../themes/Wordpress/templates/editpage.tmpl:59
+#: ../themes/Wordpress/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:39
 msgid "Size"
 msgstr "大小"
@@ -349,7 +348,7 @@
 msgid "Creator"
 msgstr "建立者"
 
-#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:67
+#: ../lib/PageList.php:976 ../themes/Crao/templates/editpage.tmpl:61
 #: ../themes/MonoBook/templates/info.tmpl:132
 #: ../themes/default/templates/editpage.tmpl:73
 #: ../themes/default/templates/info.tmpl:127
@@ -450,7 +449,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:650
-msgid "Check to add this Acl"
+msgid "Check to add this ACL"
 msgstr ""
 
 #: ../lib/PageType.php:134 ../lib/loadsave.php:733
@@ -469,7 +468,7 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:658
+#: ../lib/PageType.php:231 ../lib/PageType.php:234 ../lib/stdlib.php:670
 #: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -481,7 +480,7 @@
 msgid "Discussion"
 msgstr "權限"
 
-#: ../lib/PageType.php:274 ../lib/loadsave.php:938
+#: ../lib/PageType.php:274 ../lib/loadsave.php:979
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "從外部檔案 %s 載入 InterWikiMap"
@@ -494,17 +493,17 @@
 msgid "InterWiki Address"
 msgstr "InterWiki 位址"
 
-#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1312
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
-#: ../lib/plugin/RecentChanges.php:600 ../lib/plugin/RecentChanges.php:734
+#: ../lib/RSSWriter091.php:113 ../lib/loadsave.php:1353
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
+#: ../lib/plugin/RecentChanges.php:603 ../lib/plugin/RecentChanges.php:737
 #: ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/navbar.tmpl:13
 #: ../themes/MonoBook/templates/navbar.tmpl:13
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 #: ../themes/blog/templates/actionbar.tmpl:20
-#: ../themes/default/templates/head.tmpl:68
+#: ../themes/default/templates/head.tmpl:69
 #: ../themes/default/templates/navbar.tmpl:19
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/smaller/templates/navbar.tmpl:7
@@ -513,37 +512,37 @@
 msgid "RecentChanges"
 msgstr "RecentChanges"
 
-#: ../lib/Request.php:682 ../lib/Request.php:685
+#: ../lib/Request.php:696 ../lib/Request.php:699
 msgid "Upload error: file too big"
 msgstr ""
 
-#: ../lib/Request.php:688
+#: ../lib/Request.php:702
 msgid "Upload error: file only partially recieved"
 msgstr ""
 
-#: ../lib/Request.php:691
+#: ../lib/Request.php:705
 msgid "Upload error: no file selected"
 msgstr ""
 
-#: ../lib/Request.php:694
+#: ../lib/Request.php:708
 msgid "Upload error: unknown error #"
 msgstr ""
 
-#: ../lib/Request.php:801 ../lib/main.php:1157 ../lib/main.php:1170
+#: ../lib/Request.php:815 ../lib/main.php:1160 ../lib/main.php:1173
 #, php-format
 msgid "%s is not writable."
 msgstr "%s 無法寫入."
 
-#: ../lib/Request.php:801
+#: ../lib/Request.php:815
 msgid "The PhpWiki access log file"
 msgstr "PhpWiki 存取日誌檔案"
 
-#: ../lib/Request.php:803 ../lib/main.php:1160
+#: ../lib/Request.php:817 ../lib/main.php:1163
 #, fuzzy, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr "請確定 %s 可以寫入,或重新定義 index.php 裡的 %s."
 
-#: ../lib/Request.php:804
+#: ../lib/Request.php:818
 #, php-format
 msgid "the file '%s'"
 msgstr "檔案 '%s'"
@@ -553,81 +552,85 @@
 msgid "%4d  %s\n"
 msgstr "%4d  %s\n"
 
-#: ../lib/TextSearchQuery.php:79
+#: ../lib/TextSearchQuery.php:79 ../lib/plugin/FileInfo.php:100
 #, fuzzy, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "已支援的語言"
 
-#: ../lib/Theme.php:392
+#: ../lib/TextSearchQuery.php:89
+msgid "(A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)"
+msgstr ""
+
+#: ../lib/Theme.php:388
 #, fuzzy
 msgid "Never edited"
 msgstr "未曾編輯過"
 
-#: ../lib/Theme.php:399
+#: ../lib/Theme.php:395
 #, php-format
 msgid "%s at %s"
 msgstr "%s 在 %s"
 
-#: ../lib/Theme.php:403
+#: ../lib/Theme.php:399
 #, fuzzy, php-format
 msgid "Version %s, saved %s"
 msgstr "版本 %s, 存於 %s."
 
-#: ../lib/Theme.php:405
+#: ../lib/Theme.php:401
 #, fuzzy, php-format
 msgid "Last edited %s"
 msgstr "最後編輯 %s."
 
-#: ../lib/Theme.php:414
+#: ../lib/Theme.php:410
 #, fuzzy, php-format
 msgid "Version %s, saved on %s"
 msgstr "版本 %s, 存於 %s."
 
-#: ../lib/Theme.php:416
+#: ../lib/Theme.php:412
 #, fuzzy, php-format
 msgid "Last edited on %s"
 msgstr "最後編輯的時間在 %s."
 
-#: ../lib/Theme.php:432
+#: ../lib/Theme.php:428
 msgid "today"
 msgstr "今天"
 
-#: ../lib/Theme.php:439
+#: ../lib/Theme.php:435
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../lib/Theme.php:460 ../lib/Theme.php:462
+#: ../lib/Theme.php:456 ../lib/Theme.php:458
 #, fuzzy, php-format
 msgid "Owner: %s"
 msgstr "擁有者"
 
-#: ../lib/Theme.php:474 ../lib/Theme.php:476 ../lib/diff.php:262
+#: ../lib/Theme.php:470 ../lib/Theme.php:472 ../lib/diff.php:262
 #: ../lib/plugin/Diff.php:75
 #, php-format
 msgid "by %s"
 msgstr "被 %s"
 
-#: ../lib/Theme.php:568
+#: ../lib/Theme.php:564
 #, php-format
 msgid "Empty link to: %s"
 msgstr "沒有連結到: %s"
 
-#: ../lib/Theme.php:583 ../themes/MacOSX/themeinfo.php:71
+#: ../lib/Theme.php:579 ../themes/MacOSX/themeinfo.php:71
 #, php-format
 msgid "Create: %s"
 msgstr "建立: %s"
 
-#: ../lib/Theme.php:602
+#: ../lib/Theme.php:598
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/Theme.php:627
+#: ../lib/Theme.php:623
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "'%s': 錯誤的頁面名稱"
 
-#: ../lib/Theme.php:937 ../themes/Crao/templates/actionbar.tmpl:5
+#: ../lib/Theme.php:933 ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/MonoBook/templates/actionbar.tmpl:11
 #: ../themes/blog/themeinfo.php:53
 #: ../themes/default/templates/actionbar.tmpl:15
@@ -637,12 +640,12 @@
 msgid "Edit"
 msgstr "編輯"
 
-#: ../lib/Theme.php:938 ../lib/plugin/Diff.php:36
+#: ../lib/Theme.php:934 ../lib/plugin/Diff.php:36
 #: ../themes/blog/themeinfo.php:54
 msgid "Diff"
 msgstr "差異"
 
-#: ../lib/Theme.php:939 ../themes/Crao/templates/signin.tmpl:15
+#: ../lib/Theme.php:935 ../themes/Crao/templates/signin.tmpl:15
 #: ../themes/Crao/templates/signin.tmpl:31
 #: ../themes/MonoBook/templates/signin.tmpl:16
 #: ../themes/MonoBook/templates/signin.tmpl:30
@@ -659,26 +662,28 @@
 msgid "Sign Out"
 msgstr "簽出"
 
-#: ../lib/Theme.php:940 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../lib/Theme.php:936 ../lib/WikiUser.php:221 ../lib/WikiUserNew.php:473
+#: ../themes/Crao/templates/signin.tmpl:54
 #: ../themes/Crao/templates/signin.tmpl:59
 #: ../themes/default/templates/login.tmpl:76
+#: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "簽入"
 
-#: ../lib/Theme.php:941 ../themes/MacOSX/themeinfo.php:135
+#: ../lib/Theme.php:937 ../themes/MacOSX/themeinfo.php:135
 msgid "Lock Page"
 msgstr "鎖定頁面"
 
-#: ../lib/Theme.php:942 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/Theme.php:938 ../themes/MacOSX/themeinfo.php:136
 msgid "Unlock Page"
 msgstr "解除鎖定頁面"
 
-#: ../lib/Theme.php:943 ../lib/removepage.php:23 ../lib/removepage.php:63
+#: ../lib/Theme.php:939 ../lib/removepage.php:23 ../lib/removepage.php:63
 msgid "Remove Page"
 msgstr "移除頁面"
 
-#: ../lib/Theme.php:1192 ../lib/main.php:1012
-#: ../lib/plugin/RecentChanges.php:591 ../lib/plugin/TitleSearch.php:43
+#: ../lib/Theme.php:1188 ../lib/main.php:1014
+#: ../lib/plugin/RecentChanges.php:594 ../lib/plugin/TitleSearch.php:43
 #: ../themes/Crao/templates/navbar.tmpl:4
 #: ../themes/Crao/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:51
@@ -701,88 +706,88 @@
 msgid "TitleSearch"
 msgstr "標題搜索"
 
-#: ../lib/Theme.php:1369
+#: ../lib/Theme.php:1347
 #, fuzzy, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s 失敗."
 
-#: ../lib/Theme.php:1392
+#: ../lib/Theme.php:1370
 msgid "Related Links"
 msgstr "相關連結"
 
-#: ../lib/Theme.php:1412
+#: ../lib/Theme.php:1390
 msgid "External Links"
 msgstr "外部連結"
 
-#: ../lib/WikiDB.php:230
+#: ../lib/WikiDB.php:233
 #, fuzzy, php-format
 msgid "Removed by: %s"
 msgstr "由 %s 編輯"
 
-#: ../lib/WikiDB.php:232
+#: ../lib/WikiDB.php:235
 #, fuzzy, php-format
 msgid "Page removed %s"
 msgstr "頁面已被鎖定"
 
-#: ../lib/WikiDB.php:237 ../lib/WikiDB.php:1042 ../lib/WikiDB.php:1067
+#: ../lib/WikiDB.php:241 ../lib/WikiDB.php:1054 ../lib/WikiDB.php:1079
 #: ../lib/loadsave.php:99
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
 msgstr "%s 的 PageChange 通知已送給 %s"
 
-#: ../lib/WikiDB.php:240 ../lib/WikiDB.php:1045 ../lib/WikiDB.php:1070
+#: ../lib/WikiDB.php:244 ../lib/WikiDB.php:1057 ../lib/WikiDB.php:1082
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr "PageChange 通知錯誤: 無法送 %s 給 %s"
 
-#: ../lib/WikiDB.php:468
+#: ../lib/WikiDB.php:474
 #, php-format
 msgid "renamed from %s"
 msgstr "從 %s 更名"
 
-#: ../lib/WikiDB.php:476
+#: ../lib/WikiDB.php:482
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "後台的 WikiDB::renamePage() 還沒實作出來."
 
-#: ../lib/WikiDB.php:840
+#: ../lib/WikiDB.php:847
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: 新版本的日期是 %s"
 
-#: ../lib/WikiDB.php:901 ../lib/main.php:96
+#: ../lib/WikiDB.php:911 ../lib/main.php:98
 #, fuzzy
 msgid "Optimizing database"
 msgstr "最佳化 %s"
 
-#: ../lib/WikiDB.php:1005
+#: ../lib/WikiDB.php:1017
 #, fuzzy
 msgid "Page change"
 msgstr "沒有頁面被變更."
 
-#: ../lib/WikiDB.php:1033 ../lib/loadsave.php:787
+#: ../lib/WikiDB.php:1045 ../lib/loadsave.php:787
 #: ../lib/plugin/RecentChanges.php:107
 #, fuzzy
 msgid "New page"
 msgstr "新頁面."
 
-#: ../lib/WikiDB.php:1035 ../lib/WikiDB.php:1058 ../lib/loadsave.php:93
+#: ../lib/WikiDB.php:1048 ../lib/WikiDB.php:1071 ../lib/loadsave.php:93
 #, php-format
 msgid "Edited by: %s"
 msgstr "由 %s 編輯"
 
-#: ../lib/WikiDB.php:1060
+#: ../lib/WikiDB.php:1073
 #, fuzzy, php-format
 msgid "Page rename %s to %s"
 msgstr "頁面名稱以 '%s' 開頭的"
 
-#: ../lib/WikiDB.php:1618 ../lib/WikiDB.php:1622
+#: ../lib/WikiDB.php:1633 ../lib/WikiDB.php:1637
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
 msgid "Describe %s here."
 msgstr "在這兒描述 %s."
 
-#: ../lib/WikiDB.php:1657
+#: ../lib/WikiDB.php:1672
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "Acck! 修訂 %s - %s 看來已經被刪除了!"
@@ -868,24 +873,26 @@
 msgid "No or not enough GROUP_DB SQL statements defined"
 msgstr "沒有或缺少足夠的 GROUP_DB SQL 敘述定義"
 
-#: ../lib/WikiGroup.php:838
-msgid "AUTH_GROUP_FILE not defined"
-msgstr "AUTH_GROUP_FILE 未定義"
+#: ../lib/WikiGroup.php:838 ../lib/loadsave.php:962
+#, php-format
+msgid "%s: not defined"
+msgstr "%s: 未被定義"
 
-#: ../lib/WikiGroup.php:842
+#: ../lib/WikiGroup.php:843
 #, php-format
 msgid "Cannot open AUTH_GROUP_FILE %s"
 msgstr "無法開啟 AUTH_GROUP_FILE %s"
 
-#: ../lib/WikiGroup.php:950
-msgid "LDAP_AUTH_HOST not defined"
-msgstr "LDAP_AUTH_HOST 未定義"
+#: ../lib/WikiGroup.php:951
+#, fuzzy, php-format
+msgid "%s not defined"
+msgstr "%s: 未被定義"
 
-#: ../lib/WikiGroup.php:959
+#: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
 msgstr "此版本的 PHP 無 LDAP"
 
-#: ../lib/WikiGroup.php:1048
+#: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
 msgstr "無法連結到 LDAP 伺服器 %s"
@@ -896,7 +903,7 @@
 
 #: ../lib/WikiPlugin.php:121 ../lib/loadsave.php:82 ../lib/loadsave.php:408
 #: ../lib/loadsave.php:844 ../lib/loadsave.php:850 ../lib/loadsave.php:858
-#: ../lib/main.php:965 ../lib/main.php:1069
+#: ../lib/main.php:967 ../lib/main.php:1071
 #: ../lib/plugin/WikiAdminSelect.php:192 ../themes/Crao/templates/head.tmpl:79
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:37
@@ -905,8 +912,8 @@
 #: ../themes/Sidebar/templates/navbar.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:25
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/head.tmpl:86
+#: ../themes/default/templates/head.tmpl:87
 #: ../themes/default/templates/navbar.tmpl:55
 #: ../themes/shamino_com/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/navbar.tmpl:19
@@ -918,7 +925,7 @@
 
 #: ../lib/WikiPlugin.php:125
 #, fuzzy, php-format
-msgid "argument '%s' not declared by plugin."
+msgid "Argument '%s' not declared by plugin."
 msgstr "引數 '%s' 沒有被 plugin 宣告"
 
 #: ../lib/WikiPlugin.php:235
@@ -936,17 +943,17 @@
 msgid "Plugin %s disabled."
 msgstr "Plugin %s 關閉."
 
-#: ../lib/WikiPlugin.php:501
+#: ../lib/WikiPlugin.php:520
 #, fuzzy, php-format
 msgid "Include of '%s' failed."
 msgstr "含括 '%s' 失敗"
 
-#: ../lib/WikiPlugin.php:503
+#: ../lib/WikiPlugin.php:522
 #, php-format
 msgid "%s: no such class"
 msgstr "%s: 無此類別"
 
-#: ../lib/WikiPlugin.php:509
+#: ../lib/WikiPlugin.php:528
 #, fuzzy, php-format
 msgid "%s: not a subclass of WikiPlugin."
 msgstr "%s: 不是 WikiPlugin 的子類別"
@@ -958,17 +965,17 @@
 "referring page."
 msgstr "沒有id '%s' 可用的圖片創作資料. 請重新載入參照頁面."
 
-#: ../lib/WikiPluginCached.php:841
+#: ../lib/WikiPluginCached.php:845
 msgid "Image map expired. Reload wiki page to recreate its html part."
 msgstr ""
 
 #: ../lib/WikiUser.php:188 ../lib/WikiUser.php:268
-#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:167
+#: ../lib/WikiUser/AdoDb.php:29 ../lib/WikiUser/AdoDb.php:186
 #: ../lib/WikiUser/Db.php:43 ../lib/WikiUser/File.php:58
-#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:57
+#: ../lib/WikiUser/IMAP.php:17 ../lib/WikiUser/LDAP.php:58
 #: ../lib/WikiUser/POP3.php:17 ../lib/WikiUser/PdoDb.php:28
-#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:27
-#: ../lib/WikiUser/PearDb.php:101 ../lib/WikiUserNew.php:559
+#: ../lib/WikiUser/PdoDb.php:103 ../lib/WikiUser/PearDb.php:26
+#: ../lib/WikiUser/PearDb.php:116 ../lib/WikiUserNew.php:559
 #, fuzzy
 msgid "Invalid username."
 msgstr "錯誤的 acl"
@@ -1023,15 +1030,15 @@
 "Old UserPage %s without stored password updated with empty password. Set a "
 "password in your UserPreferences."
 
-#: ../lib/WikiUser/AdoDb.php:126 ../lib/WikiUser/PdoDb.php:134
-#: ../lib/WikiUser/PearDb.php:121
+#: ../lib/WikiUser/AdoDb.php:145 ../lib/WikiUser/PdoDb.php:134
+#: ../lib/WikiUser/PearDb.php:136
 #, fuzzy, php-format
 msgid "%s is missing"
 msgstr "%s 參數遺漏"
 
-#: ../lib/WikiUser/AdoDb.php:182 ../lib/WikiUser/AdoDb.php:236
+#: ../lib/WikiUser/AdoDb.php:201 ../lib/WikiUser/AdoDb.php:255
 #: ../lib/WikiUser/PdoDb.php:190 ../lib/WikiUser/PdoDb.php:255
-#: ../lib/WikiUser/PearDb.php:164 ../lib/WikiUser/PearDb.php:208
+#: ../lib/WikiUser/PearDb.php:179 ../lib/WikiUser/PearDb.php:223
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != '%s'"
 msgstr ""
@@ -1040,7 +1047,12 @@
 msgid "Unable to connect to IMAP server "
 msgstr "無法連結到 IMAP 伺服器"
 
-#: ../lib/WikiUser/LDAP.php:64 ../lib/WikiUser/LDAP.php:107
+#: ../lib/WikiUser/LDAP.php:35
+#, fuzzy, php-format
+msgid "Unable to bind LDAP server %s using %s %s"
+msgstr "無法連結到 LDAP 伺服器 %s"
+
+#: ../lib/WikiUser/LDAP.php:65 ../lib/WikiUser/LDAP.php:108
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
@@ -1090,11 +1102,11 @@
 msgid "Default preferences will be used."
 msgstr "預設偏好設定將被使用."
 
-#: ../lib/WikiUserNew.php:1168
+#: ../lib/WikiUserNew.php:1190
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1194
+#: ../lib/WikiUserNew.php:1216
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -1103,11 +1115,11 @@
 "密碼長度小於系統原則所允許的長度. 抱歉,你無法登入. \n"
 " 你必須詢問系統管理者以重設密碼."
 
-#: ../lib/WikiUserNew.php:1209
+#: ../lib/WikiUserNew.php:1231
 msgid "The crypt function is not available in this version of PHP."
 msgstr "此版本的 PHP 沒有 crypt 函數."
 
-#: ../lib/WikiUserNew.php:1210
+#: ../lib/WikiUserNew.php:1232
 #, fuzzy
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
@@ -1115,16 +1127,16 @@
 msgstr ""
 "請在 index.php 中設定 ENCRYPTED_PASSWD 為 false 或許也要變更 ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1223
+#: ../lib/WikiUserNew.php:1245
 #, fuzzy
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "請在 index.php 中設定 ENCRYPTED_PASSWD 為 true."
 
-#: ../lib/WikiUserNew.php:1635
+#: ../lib/WikiUserNew.php:1657
 msgid "Email Verification"
 msgstr "Email 驗證."
 
-#: ../lib/WikiUserNew.php:1636
+#: ../lib/WikiUserNew.php:1658
 #, fuzzy, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -1136,17 +1148,17 @@
 " 你的 email 帳號已經確認並且將會被用來寄送頁面變更通知. \n"
 " 參閱 %s"
 
-#: ../lib/WikiUserNew.php:1689
+#: ../lib/WikiUserNew.php:1711
 #, php-format
 msgid "E-Mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1693
+#: ../lib/WikiUserNew.php:1715
 #, php-format
 msgid "E-Mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1332
+#: ../lib/XmlElement.php:456 ../lib/stdlib.php:1344
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "無法混合 '%s' 和 '%s' 型態的格式字串."
@@ -1243,7 +1255,7 @@
 #: ../themes/Sidebar/templates/frame-header.tmpl:16
 #: ../themes/Sidebar/templates/top.tmpl:10
 #: ../themes/Wordpress/templates/body.tmpl:13
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:8
 #: ../themes/wikilens/templates/head.tmpl:45
@@ -1251,7 +1263,7 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:114 ../lib/display.php:121
+#: ../lib/display.php:119 ../lib/display.php:126
 #: ../lib/plugin/BackLinks.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:35
@@ -1262,108 +1274,122 @@
 msgid "BackLinks"
 msgstr "BackLinks"
 
-#: ../lib/display.php:117 ../lib/display.php:124
+#: ../lib/display.php:122 ../lib/display.php:129
 #, php-format
 msgid "BackLinks for %s"
 msgstr "向後連結: %s"
 
-#: ../lib/display.php:132
+#: ../lib/display.php:137
 #, php-format
 msgid "(Redirected from %s)"
 msgstr "(已從 %s 重導向)"
 
-#: ../lib/display.php:172
+#: ../lib/display.php:177
 msgid "You searched for: "
 msgstr ""
 
-#: ../lib/editpage.php:95 ../lib/editpage.php:107
-msgid "Typed in verification word mismatch ... are you a bot?"
-msgstr ""
+#: ../lib/display.php:218 ../themes/Crao/templates/head.tmpl:70
+#: ../themes/Crao/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:76
+#: ../themes/default/templates/head.tmpl:77
+#: ../themes/wikilens/templates/head.tmpl:68
+#: ../themes/wikilens/templates/head.tmpl:69
+msgid "SandBox"
+msgstr "SandBox"
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:451
+#: ../lib/editpage.php:134 ../lib/editpage.php:469
 msgid "Your version"
 msgstr "你的版本"
 
-#: ../lib/editpage.php:128 ../lib/editpage.php:452
+#: ../lib/editpage.php:134 ../lib/editpage.php:470
 msgid "Other version"
 msgstr "其他版本"
 
-#: ../lib/editpage.php:138
+#: ../lib/editpage.php:145
 msgid "Some internal editing error"
 msgstr ""
 
-#: ../lib/editpage.php:139
+#: ../lib/editpage.php:146
 #, fuzzy
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
 msgstr "你正在查看此頁面的較舊修訂."
 
-#: ../lib/editpage.php:140
+#: ../lib/editpage.php:147
 msgid "&version=-1 might help."
 msgstr ""
 
-#: ../lib/editpage.php:157
+#: ../lib/editpage.php:164
 #, php-format
 msgid "Edit: %s"
 msgstr "編輯: %s"
 
-#: ../lib/editpage.php:191
+#: ../lib/editpage.php:198
 #, php-format
 msgid "View Source: %s"
 msgstr "查看源碼: %s"
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now locked."
 msgstr "頁面已被鎖定."
 
-#: ../lib/editpage.php:205
+#: ../lib/editpage.php:212
 msgid "Page now unlocked."
 msgstr "頁面已被解鎖定."
 
-#: ../lib/editpage.php:306
+#: ../lib/editpage.php:314
 #, php-format
 msgid "Saved: %s"
 msgstr "已存於: %s"
 
-#: ../lib/editpage.php:368
+#: ../lib/editpage.php:366
 #, fuzzy
 msgid "Too many external links."
 msgstr "外部連結"
 
-#: ../lib/editpage.php:382
+#: ../lib/editpage.php:379
 msgid "SpamAssassin reports: "
 msgstr ""
 
-#: ../lib/editpage.php:400
+#: ../lib/editpage.php:396
+msgid "External links contain blocked domains:"
+msgstr ""
+
+#: ../lib/editpage.php:397
+#, fuzzy, php-format
+msgid "%s is listed at %s"
+msgstr "%s 個頁面連結到 %s:"
+
+#: ../lib/editpage.php:418
 msgid "Spam Prevention"
 msgstr ""
 
-#: ../lib/editpage.php:401
+#: ../lib/editpage.php:419
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
 
-#: ../lib/editpage.php:403 ../lib/editpage.php:437
+#: ../lib/editpage.php:421 ../lib/editpage.php:455
 msgid "Sorry for the inconvenience."
 msgstr "抱歉造成你的不便."
 
-#: ../lib/editpage.php:434 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/editpage.php:452 ../themes/MacOSX/themeinfo.php:137
 msgid "Page Locked"
 msgstr "頁面已被鎖定"
 
-#: ../lib/editpage.php:435
+#: ../lib/editpage.php:453
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
 msgstr "此頁面已被管理者鎖定,所以你的更動無法儲存."
 
-#: ../lib/editpage.php:436
+#: ../lib/editpage.php:454
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
 msgstr ""
 "(複製你的更動到剪貼簿中. 你可以試著編輯另一個不同的頁面或存到文字編輯器中.)"
 
-#: ../lib/editpage.php:450 ../lib/editpage.php:751
+#: ../lib/editpage.php:468 ../lib/editpage.php:757
 #, php-format
 msgid ""
 "Some of the changes could not automatically be combined.  Please look for "
@@ -1373,21 +1399,21 @@
 "部份更動無法自動合併. 請搜尋以 '%s' 開頭並以 '%s' 結尾的部份.在儲存之前,你需"
 "要手動編輯這些部份."
 
-#: ../lib/editpage.php:454 ../lib/editpage.php:754
+#: ../lib/editpage.php:472 ../lib/editpage.php:760
 msgid "Please check it through before saving."
 msgstr "在儲存之前請再檢查一次."
 
-#: ../lib/editpage.php:465
+#: ../lib/editpage.php:483
 msgid "Conflicting Edits!"
 msgstr "發生衝突!"
 
-#: ../lib/editpage.php:466
+#: ../lib/editpage.php:484
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr "從你上次修改這個頁面到現在的這段時間,已經有使用者儲存了較新的版本."
 
-#: ../lib/editpage.php:467
+#: ../lib/editpage.php:485
 msgid ""
 "Your changes can not be saved as they are, since doing so would overwrite "
 "the other author's changes. So, your changes and those of the other author "
@@ -1396,22 +1422,18 @@
 "無法儲存你所變更的部份,在你編輯的這段時間,已經有其他作者變更了.所以你所變更的"
 "部份已經和其他作者變更的部份合併.結果顯示在下面."
 
-#: ../lib/editpage.php:527
-msgid "Type word above:"
-msgstr ""
-
-#: ../lib/editpage.php:550
+#: ../lib/editpage.php:555
 #, fuzzy
 msgid "Convert"
 msgstr "內容"
 
-#: ../lib/editpage.php:583 ../themes/Portland/templates/editpage.tmpl:62
-#: ../themes/Wordpress/templates/editpage.tmpl:71
+#: ../lib/editpage.php:588 ../themes/Portland/templates/editpage.tmpl:45
+#: ../themes/Wordpress/templates/editpage.tmpl:54
 #, php-format
 msgid "Author will be logged as %s."
 msgstr "作者將登入為 %s."
 
-#: ../lib/editpage.php:726
+#: ../lib/editpage.php:731
 #, php-format
 msgid "Merge and Edit: %s"
 msgstr "合併並離開: %s"
@@ -1489,7 +1511,7 @@
 msgid "Dumping Pages"
 msgstr "傾印頁面中"
 
-#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:833
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:451 ../lib/stdlib.php:845
 #, fuzzy
 msgid "Skipped."
 msgstr "跳過"
@@ -1542,7 +1564,7 @@
 msgid "has edit conflicts - overwriting anyway"
 msgstr "編輯衝突 - 無論如何都覆寫"
 
-#: ../lib/loadsave.php:798 ../lib/loadsave.php:1251 ../lib/loadsave.php:1254
+#: ../lib/loadsave.php:798 ../lib/loadsave.php:1292 ../lib/loadsave.php:1295
 msgid "The PhpWiki programming team"
 msgstr "PhpWiki 開發團隊"
 
@@ -1560,17 +1582,17 @@
 msgid "- saved to database as version %d"
 msgstr "- 已經以版本 %d 存入資料庫中"
 
-#: ../lib/loadsave.php:834 ../lib/loadsave.php:1047
+#: ../lib/loadsave.php:834 ../lib/loadsave.php:1088
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME 檔案 %s"
 
-#: ../lib/loadsave.php:835 ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:835 ../lib/loadsave.php:1093
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialized 到檔案 %s"
 
-#: ../lib/loadsave.php:836 ../lib/loadsave.php:1066
+#: ../lib/loadsave.php:836 ../lib/loadsave.php:1107
 #, php-format
 msgid "plain file %s"
 msgstr "一般檔案 %s"
@@ -1591,8 +1613,8 @@
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:884 ../lib/loadsave.php:893 ../lib/loadsave.php:909
-#: ../themes/MonoBook/templates/actionbar.tmpl:37
+#: ../lib/loadsave.php:884 ../lib/loadsave.php:894 ../lib/loadsave.php:901
+#: ../lib/loadsave.php:908 ../themes/MonoBook/templates/actionbar.tmpl:37
 #: ../themes/Wordpress/templates/actionbar.tmpl:57
 #: ../themes/default/templates/actionbar.tmpl:26
 #: ../themes/smaller/templates/actionbar.tmpl:29
@@ -1604,297 +1626,331 @@
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:893
 #, fuzzy
 msgid "no page content"
 msgstr "下載頁面內容"
 
-#: ../lib/loadsave.php:898
+#: ../lib/loadsave.php:900
 #, fuzzy
 msgid "same version page"
 msgstr "使用者頁面"
 
-#: ../lib/loadsave.php:904
+#: ../lib/loadsave.php:907
+#, fuzzy
+msgid "Cancelled"
+msgstr "取消"
+
+#: ../lib/loadsave.php:915
+msgid "Are you sure?"
+msgstr ""
+
+#: ../lib/loadsave.php:921 ../lib/plugin/PasswordReset.php:104
+#: ../lib/plugin/PasswordReset.php:142 ../lib/plugin/UserPreferences.php:114
+#: ../lib/plugin/WikiAdminChmod.php:146 ../lib/plugin/WikiAdminChown.php:153
+#: ../lib/plugin/WikiAdminMarkup.php:149 ../lib/plugin/WikiAdminRemove.php:188
+#: ../lib/plugin/WikiAdminRename.php:165
+#: ../lib/plugin/WikiAdminSearchReplace.php:180
+#: ../lib/plugin/WikiAdminSetAcl.php:176
+msgid "Yes"
+msgstr "是"
+
+#: ../lib/loadsave.php:923 ../lib/plugin/PasswordReset.php:107
+#: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/TranslateText.php:118
+#: ../lib/plugin/UserPreferences.php:116 ../lib/plugin/WikiAdminChmod.php:159
+#: ../lib/plugin/WikiAdminChown.php:166 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminRemove.php:214 ../lib/plugin/WikiAdminRename.php:182
+#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
+#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:266
+#: ../lib/plugin/WikiFormRich.php:317 ../lib/removepage.php:24
+#: ../lib/upgrade.php:682 ../themes/default/templates/login.tmpl:78
+#: ../themes/default/templates/userprefs.tmpl:243
+msgid "Cancel"
+msgstr "取消"
+
+#: ../lib/loadsave.php:938
 #, fuzzy, php-format
 msgid "revert to version %d"
 msgstr "版本 %d"
 
-#: ../lib/loadsave.php:907
+#: ../lib/loadsave.php:943
+#, fuzzy, php-format
+msgid "Revert: %s"
+msgstr "重設"
+
+#: ../lib/loadsave.php:944
 #, fuzzy, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- 已經以版本 %d 存入資料庫中"
 
-#: ../lib/loadsave.php:921
-#, php-format
-msgid "%s: not defined"
-msgstr "%s: 未被定義"
-
-#: ../lib/loadsave.php:931
+#: ../lib/loadsave.php:972
 msgid "Default InterWiki map file not loaded."
 msgstr "預設 InterWiki map 檔案未能載入."
 
-#: ../lib/loadsave.php:1081 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1122 ../lib/loadsave.php:1135
 msgid "Skipping"
 msgstr "跳過"
 
-#: ../lib/loadsave.php:1195
+#: ../lib/loadsave.php:1236
 #, php-format
 msgid "Unable to load: %s"
 msgstr "無法載入: %s"
 
-#: ../lib/loadsave.php:1202
+#: ../lib/loadsave.php:1243
 #, php-format
 msgid "Bad file type: %s"
 msgstr "錯誤的檔案型態: %s"
 
-#: ../lib/loadsave.php:1219
+#: ../lib/loadsave.php:1260
 #, php-format
 msgid "Loading '%s'"
 msgstr "載入 '%s'"
 
-#: ../lib/loadsave.php:1257
+#: ../lib/loadsave.php:1298
 msgid "Loading up virgin wiki"
 msgstr "載入原始 wiki"
 
-#: ../lib/loadsave.php:1303
+#: ../lib/loadsave.php:1344
 msgid "No uploaded file to upload?"
 msgstr "沒有要上傳的檔案?"
 
-#: ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1348
 #, php-format
 msgid "Uploading %s"
 msgstr "上傳中 %s"
 
-#: ../lib/main.php:413
+#: ../lib/main.php:415
 msgid "FORBIDDEN"
 msgstr ""
 
-#: ../lib/main.php:414 ../lib/main.php:424
+#: ../lib/main.php:416 ../lib/main.php:426
 msgid "ANON"
 msgstr ""
 
-#: ../lib/main.php:415
+#: ../lib/main.php:417
 msgid "BOGO"
 msgstr ""
 
-#: ../lib/main.php:416
+#: ../lib/main.php:418
 msgid "USER"
 msgstr ""
 
-#: ../lib/main.php:417
+#: ../lib/main.php:419
 msgid "ADMIN"
 msgstr ""
 
-#: ../lib/main.php:418
+#: ../lib/main.php:420
 msgid "UNOBTAINABLE"
 msgstr ""
 
-#: ../lib/main.php:446 ../lib/main.php:465
+#: ../lib/main.php:448 ../lib/main.php:467
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr "在此 wiki 上, %s 是被禁止的."
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 #, fuzzy
 msgid "authenticated"
 msgstr "已認證的使用者"
 
-#: ../lib/main.php:454
+#: ../lib/main.php:456
 #, fuzzy
 msgid "not authenticated"
 msgstr "認證為 %s"
 
-#: ../lib/main.php:455
+#: ../lib/main.php:457
 #, fuzzy, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr "在此 wiki 上, %s 是被禁止的."
 
-#: ../lib/main.php:456
+#: ../lib/main.php:458
 #, fuzzy
 msgid "Missing PagePermission:"
 msgstr "個別頁面權限"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:475
 #, php-format
 msgid "You must sign in to %s."
 msgstr "你必須簽入才能 %s."
 
-#: ../lib/main.php:475
+#: ../lib/main.php:477
 #, php-format
 msgid "You must log in to %s."
 msgstr "你必須登入才能 %s."
 
-#: ../lib/main.php:477
+#: ../lib/main.php:479
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:479 ../lib/plugin/PluginManager.php:65
+#: ../lib/main.php:481 ../lib/plugin/PluginManager.php:65
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr "你必須是一個管理者才能 %s."
 
-#: ../lib/main.php:491
+#: ../lib/main.php:493
 msgid "view this page"
 msgstr "查看此頁面"
 
-#: ../lib/main.php:492
+#: ../lib/main.php:494
 msgid "diff this page"
 msgstr "比對此頁面"
 
-#: ../lib/main.php:493
+#: ../lib/main.php:495
 msgid "dump html pages"
 msgstr "傾印 html 頁面"
 
-#: ../lib/main.php:494
+#: ../lib/main.php:496
 msgid "dump serial pages"
 msgstr "傾印連續頁面"
 
-#: ../lib/main.php:495
+#: ../lib/main.php:497
 msgid "edit this page"
 msgstr "編輯此頁面"
 
-#: ../lib/main.php:496
+#: ../lib/main.php:498
 #, fuzzy
 msgid "revert to a previous version of this page"
 msgstr "你正在查看此頁面的較舊修訂."
 
-#: ../lib/main.php:497
+#: ../lib/main.php:499
 msgid "create this page"
 msgstr "建立此頁面"
 
-#: ../lib/main.php:498
+#: ../lib/main.php:500
 msgid "load files into this wiki"
 msgstr "載入檔案到此 wiki"
 
-#: ../lib/main.php:499
+#: ../lib/main.php:501
 msgid "lock this page"
 msgstr "鎖定此頁面"
 
-#: ../lib/main.php:500
+#: ../lib/main.php:502
 msgid "remove this page"
 msgstr "移除此頁面"
 
-#: ../lib/main.php:501
+#: ../lib/main.php:503
 msgid "unlock this page"
 msgstr "解除鎖定此頁面"
 
-#: ../lib/main.php:502
+#: ../lib/main.php:504
 msgid "upload a zip dump"
 msgstr "上傳 zip 傾印"
 
-#: ../lib/main.php:503
+#: ../lib/main.php:505
 msgid "verify the current action"
 msgstr "確認目前動作"
 
-#: ../lib/main.php:504
+#: ../lib/main.php:506
 msgid "view the source of this page"
 msgstr "查看此頁面源碼"
 
-#: ../lib/main.php:505
+#: ../lib/main.php:507
 msgid "access this wiki via XML-RPC"
 msgstr "透過 XML-RPC 存取此 wiki"
 
-#: ../lib/main.php:506
+#: ../lib/main.php:508
 #, fuzzy
 msgid "access this wiki via SOAP"
 msgstr "透過 XML-RPC 存取此 wiki"
 
-#: ../lib/main.php:507
+#: ../lib/main.php:509
 msgid "download a zip dump from this wiki"
 msgstr "從此 wiki 下載 zip dump"
 
-#: ../lib/main.php:508
-msgid "download an html zip dump from this wiki"
+#: ../lib/main.php:510
+#, fuzzy
+msgid "download a html zip dump from this wiki"
 msgstr "從此 wiki 下載 html zip dump"
 
-#: ../lib/main.php:532
+#: ../lib/main.php:534
 msgid "Browsing pages"
 msgstr "瀏覽頁面"
 
-#: ../lib/main.php:533
+#: ../lib/main.php:535
 msgid "Diffing pages"
 msgstr "比對頁面差異"
 
-#: ../lib/main.php:534
+#: ../lib/main.php:536
 msgid "Dumping html pages"
 msgstr "傾印 html 頁面"
 
-#: ../lib/main.php:535
+#: ../lib/main.php:537
 msgid "Dumping serial pages"
 msgstr "傾印連續頁面"
 
-#: ../lib/main.php:536
+#: ../lib/main.php:538
 msgid "Editing pages"
 msgstr "編輯頁面"
 
-#: ../lib/main.php:537
+#: ../lib/main.php:539
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:538
+#: ../lib/main.php:540
 msgid "Creating pages"
 msgstr "建立頁面"
 
-#: ../lib/main.php:539
+#: ../lib/main.php:541
 msgid "Loading files"
 msgstr "載入檔案"
 
-#: ../lib/main.php:540
+#: ../lib/main.php:542
 msgid "Locking pages"
 msgstr "鎖定頁面"
 
-#: ../lib/main.php:541
+#: ../lib/main.php:543
 msgid "Removing pages"
 msgstr "移除頁面"
 
-#: ../lib/main.php:542
+#: ../lib/main.php:544
 msgid "Unlocking pages"
 msgstr "解除鎖定頁面"
 
-#: ../lib/main.php:543
+#: ../lib/main.php:545
 msgid "Uploading zip dumps"
 msgstr "上傳 zip dumps"
 
-#: ../lib/main.php:544
+#: ../lib/main.php:546
 msgid "Verify the current action"
 msgstr "確認目前動作"
 
-#: ../lib/main.php:545
+#: ../lib/main.php:547
 msgid "Viewing the source of pages"
 msgstr "查看頁面源碼"
 
-#: ../lib/main.php:546
+#: ../lib/main.php:548
 msgid "XML-RPC access"
 msgstr "XML-RPC 存取"
 
-#: ../lib/main.php:547
+#: ../lib/main.php:549
 #, fuzzy
 msgid "SOAP access"
 msgstr "XML-RPC 存取"
 
-#: ../lib/main.php:548
+#: ../lib/main.php:550
 msgid "Downloading zip dumps"
 msgstr "下載 zip dumps"
 
-#: ../lib/main.php:549
+#: ../lib/main.php:551
 msgid "Downloading html zip dumps"
 msgstr "下載 html zip dumps"
 
-#: ../lib/main.php:683
+#: ../lib/main.php:685
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:686
+#: ../lib/main.php:688
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:691
+#: ../lib/main.php:693
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:696 ../lib/main.php:1049 ../lib/plugin/ModeratedPage.php:41
+#: ../lib/main.php:698 ../lib/main.php:1051 ../lib/plugin/ModeratedPage.php:41
 #: ../lib/plugin/ModeratedPage.php:137 ../lib/plugin/ModeratedPage.php:205
 #: ../lib/plugin/ModeratedPage.php:238 ../lib/plugin/ModeratedPage.php:241
 #: ../lib/plugin/ModeratedPage.php:243 ../lib/plugin/ModeratedPage.php:245
@@ -1903,29 +1959,29 @@
 msgid "ModeratedPage"
 msgstr "CreatePage"
 
-#: ../lib/main.php:712
+#: ../lib/main.php:714
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: 錯誤的動作"
 
-#: ../lib/main.php:729
+#: ../lib/main.php:731
 msgid "Fatal PhpWiki Error"
 msgstr "致命的 PhpWiki 錯誤"
 
-#: ../lib/main.php:978 ../lib/plugin/WikiAdminChown.php:183
+#: ../lib/main.php:980 ../lib/plugin/WikiAdminChown.php:183
 #, fuzzy
 msgid "Chown"
 msgstr "Chmod"
 
-#: ../lib/main.php:982 ../lib/plugin/WikiAdminSetAcl.php:183
+#: ../lib/main.php:984 ../lib/plugin/WikiAdminSetAcl.php:183
 msgid "SetAcl"
 msgstr "SetAcl"
 
-#: ../lib/main.php:986 ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/main.php:988 ../lib/plugin/WikiAdminRename.php:208
 msgid "Rename"
 msgstr "更名"
 
-#: ../lib/main.php:990 ../lib/main.php:995 ../lib/plugin/PageDump.php:36
+#: ../lib/main.php:992 ../lib/main.php:997 ../lib/plugin/PageDump.php:36
 #: ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:48
 #: ../themes/Wordpress/templates/actionbar.tmpl:75
@@ -1937,26 +1993,26 @@
 msgid "PageDump"
 msgstr "PageDump"
 
-#: ../lib/main.php:1009 ../lib/plugin/FullTextSearch.php:39
+#: ../lib/main.php:1011 ../lib/plugin/FullTextSearch.php:39
 #: ../lib/plugin/WantedPagesOld.php:134
 msgid "FullTextSearch"
 msgstr "FullTextSearch"
 
-#: ../lib/main.php:1158
+#: ../lib/main.php:1161
 msgid "The session.save_path directory"
 msgstr "session.save_path 目錄"
 
-#: ../lib/main.php:1161
+#: ../lib/main.php:1164
 #, fuzzy, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "session.save_path 目錄"
 
-#: ../lib/main.php:1165
+#: ../lib/main.php:1168
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "試圖改用目錄 '%s'."
 
-#: ../lib/main.php:1172
+#: ../lib/main.php:1175
 msgid "Users will not be able to sign in."
 msgstr "使用者將無法簽入."
 
@@ -1982,8 +2038,8 @@
 msgid "Click to display all comments"
 msgstr "點擊以顯示"
 
-#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:260
-#: ../lib/plugin/CreateToc.php:265
+#: ../lib/plugin/AddComment.php:111 ../lib/plugin/CreateToc.php:372
+#: ../lib/plugin/CreateToc.php:377
 msgid "Click to display"
 msgstr "點擊以顯示"
 
@@ -2115,7 +2171,7 @@
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:493
+#: ../lib/plugin/AnalyseAccessLogSql.php:204 ../lib/plugin/VisualWiki.php:499
 msgid "days"
 msgstr "天"
 
@@ -2203,7 +2259,7 @@
 
 #: ../lib/plugin/AuthorHistory.php:70
 #: ../themes/MonoBook/templates/info.tmpl:168
-#: ../themes/blog/templates/_info.tmpl:3 ../themes/blog/templates/info.tmpl:3
+#: ../themes/blog/templates/info.tmpl:3
 #: ../themes/shamino_com/templates/info.tmpl:167
 #: ../themes/smaller/templates/info.tmpl:7
 msgid "AuthorHistory"
@@ -2234,8 +2290,8 @@
 #: ../themes/Crao/templates/blogform.tmpl:12
 #: ../themes/Crao/templates/editpage.tmpl:48
 #: ../themes/MonoBook/templates/info.tmpl:78
-#: ../themes/Portland/templates/editpage.tmpl:60
-#: ../themes/Wordpress/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:39
+#: ../themes/Wordpress/templates/editpage.tmpl:48
 #: ../themes/blog/templates/blogform.tmpl:15
 #: ../themes/default/templates/blogform.tmpl:15
 #: ../themes/default/templates/editpage.tmpl:47
@@ -2273,8 +2329,8 @@
 msgid "List all pages which link to %s."
 msgstr "列出所有連結到 %s 的頁面."
 
-#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:116
-#: ../lib/plugin/ListPages.php:119 ../lib/plugin/ListSubpages.php:89
+#: ../lib/plugin/BackLinks.php:70 ../lib/plugin/ListPages.php:122
+#: ../lib/plugin/ListPages.php:125 ../lib/plugin/ListSubpages.php:89
 msgid "#"
 msgstr ""
 
@@ -2308,7 +2364,7 @@
 msgid "%s pages link to %s:"
 msgstr "%s 個頁面連結到 %s:"
 
-#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:159
+#: ../lib/plugin/BlogArchives.php:24 ../lib/plugin/BlogArchives.php:134
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "Archives"
 msgstr ""
@@ -2317,17 +2373,17 @@
 msgid "List blog months links for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:113 ../lib/plugin/BlogJournal.php:110
+#: ../lib/plugin/BlogArchives.php:88 ../lib/plugin/BlogJournal.php:85
 #, php-format
 msgid "Blog Entries for %s:"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:121
+#: ../lib/plugin/BlogArchives.php:96
 #: ../themes/blog/templates/actionbar.tmpl:17
 msgid "BlogArchives"
 msgstr ""
 
-#: ../lib/plugin/BlogArchives.php:147
+#: ../lib/plugin/BlogArchives.php:122
 msgid "Blog Archives:"
 msgstr ""
 
@@ -2339,11 +2395,11 @@
 msgid "Include latest blog entries for the current or ADMIN user"
 msgstr ""
 
-#: ../lib/plugin/BlogJournal.php:106 ../lib/plugin/WikiBlog.php:75
+#: ../lib/plugin/BlogJournal.php:81 ../lib/plugin/WikiBlog.php:75
 msgid "WikiBlog"
 msgstr "WikiBlog"
 
-#: ../lib/plugin/BlogJournal.php:108
+#: ../lib/plugin/BlogJournal.php:83
 msgid "No Blog Entries"
 msgstr ""
 
@@ -2354,7 +2410,7 @@
 #: ../themes/Sidebar/templates/body.tmpl:26 ../themes/Sidebar/themeinfo.php:44
 #: ../themes/Wordpress/templates/actionbar.tmpl:31
 #: ../themes/blog/templates/sidebar.tmpl:18
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:96
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:45
 #: ../themes/wikilens/templates/head.tmpl:89
@@ -2370,12 +2426,12 @@
 msgid "Next Month"
 msgstr "下個月"
 
-#: ../lib/plugin/Calendar.php:168 ../lib/plugin/CalendarList.php:139
+#: ../lib/plugin/Calendar.php:169 ../lib/plugin/CalendarList.php:135
 #, php-format
 msgid "Edit %s"
 msgstr "編輯 %s"
 
-#: ../lib/plugin/CalendarList.php:55 ../lib/plugin/CalendarList.php:59
+#: ../lib/plugin/CalendarList.php:51 ../lib/plugin/CalendarList.php:55
 msgid "CalendarList"
 msgstr "月曆列表"
 
@@ -2397,6 +2453,21 @@
 msgid "Embed hidden comments in WikiPages."
 msgstr "在 Wiki頁面嵌入隱藏意見."
 
+#: ../lib/plugin/CreateBib.php:36
+#, fuzzy
+msgid "CreateBib"
+msgstr "CreateToc"
+
+#: ../lib/plugin/CreateBib.php:40
+msgid "Automatically create a Bibtex file from linked pages"
+msgstr ""
+
+#: ../lib/plugin/CreateBib.php:121 ../lib/plugin/CreateToc.php:302
+#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:208
+#: ../lib/plugin/Template.php:102
+msgid "no page specified"
+msgstr "沒有指定頁面"
+
 #: ../lib/plugin/CreatePage.php:39
 msgid "CreatePage"
 msgstr "CreatePage"
@@ -2422,20 +2493,15 @@
 msgid "Automatically link headers at the top"
 msgstr "在上面自動連結表頭"
 
-#: ../lib/plugin/CreateToc.php:193 ../lib/plugin/IncludePage.php:77
-#: ../lib/plugin/RateIt.php:208
-msgid "no page specified"
-msgstr "沒有指定頁面"
-
-#: ../lib/plugin/CreateToc.php:204
+#: ../lib/plugin/CreateToc.php:313
 msgid "CreateToc disabled for old markup"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:257
+#: ../lib/plugin/CreateToc.php:369
 msgid "Click to hide the TOC"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:267 ../lib/plugin/CreateToc.php:270
+#: ../lib/plugin/CreateToc.php:379 ../lib/plugin/CreateToc.php:382
 msgid "Table Of Contents"
 msgstr "目錄"
 
@@ -2475,7 +2541,7 @@
 "加入或變更頁面層級的中繼資料 'key=>value'. 注意,移除時直接將 value 設為空白即"
 "可."
 
-#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:672
+#: ../lib/plugin/EditMetaData.php:149 ../lib/upgrade.php:680
 msgid "Submit"
 msgstr "送出"
 
@@ -2491,6 +2557,22 @@
 msgid "Redirects to an external web site based on form input"
 msgstr "以表單輸入方式重導向到另外一個外部站台"
 
+#: ../lib/plugin/FileInfo.php:39
+#, fuzzy
+msgid "FileInfo"
+msgstr "Info"
+
+#: ../lib/plugin/FileInfo.php:43
+msgid "Display file information like version,size,date,... of uploaded files."
+msgstr ""
+
+#: ../lib/plugin/FileInfo.php:63 ../lib/plugin/FileInfo.php:65
+#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:163
+#: ../lib/plugin/WikiFormRich.php:179
+#, php-format
+msgid "A required argument '%s' is missing."
+msgstr "缺少引數 '%s'."
+
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
 msgstr ""
@@ -2538,6 +2620,7 @@
 msgstr "在內容的分離框架中顯示 url. 只能放一個框架."
 
 #: ../lib/plugin/FrameInclude.php:93 ../lib/plugin/IncludePage.php:84
+#: ../lib/plugin/Template.php:108
 #, php-format
 msgid "recursive inclusion of page %s"
 msgstr "遞迴含括頁面 %s"
@@ -2567,7 +2650,12 @@
 msgid "only %d pages displayed"
 msgstr "只有 %d 個頁面顯示出來"
 
-#: ../lib/plugin/FullTextSearch.php:111
+#: ../lib/plugin/FullTextSearch.php:110
+#, php-format
+msgid "Ignored stoplist words '%s'"
+msgstr ""
+
+#: ../lib/plugin/FullTextSearch.php:115
 #, php-format
 msgid "Full text search results for '%s'"
 msgstr "以 '%s' 全文搜尋的結果"
@@ -2615,6 +2703,30 @@
 msgid "Go"
 msgstr "Go"
 
+#: ../lib/plugin/GoogleMaps.php:63
+msgid "GoogleMaps"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:67
+msgid ""
+"Displays a marker with further infos (when clicking) on given coordinates"
+msgstr ""
+
+#: ../lib/plugin/GoogleMaps.php:96 ../lib/plugin/GoogleMaps.php:99
+#: ../lib/plugin/Transclude.php:76
+#, php-format
+msgid "%s parameter missing"
+msgstr "%s 參數遺漏"
+
+#: ../lib/plugin/GoogleMaps.php:108
+#, fuzzy, php-format
+msgid "invalid argument %s"
+msgstr "錯誤的顏色值: %s"
+
+#: ../lib/plugin/GoogleMaps.php:128
+msgid "new&nbsp;window"
+msgstr ""
+
 #: ../lib/plugin/GooglePlugin.php:43
 msgid "GooglePlugin"
 msgstr "GooglePlugin"
@@ -2636,13 +2748,16 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:243 ../lib/plugin/Ploticus.php:249
-#: ../lib/plugin/SyntaxHighlighter.php:180
-#, fuzzy
-msgid "empty source"
-msgstr "查看源碼"
+#: ../lib/plugin/GraphViz.php:265 ../lib/plugin/GraphViz.php:335
+msgid "No dot graph given"
+msgstr ""
+
+#: ../lib/plugin/GraphViz.php:276 ../lib/plugin/SyntaxHighlighter.php:173
+#, fuzzy, php-format
+msgid "Couldn't start commandline '%s'"
+msgstr "無法設定頁面 '%s' 的 acl."
 
-#: ../lib/plugin/GraphViz.php:269 ../lib/plugin/Ploticus.php:239
+#: ../lib/plugin/GraphViz.php:279 ../lib/plugin/Ploticus.php:239
 #, php-format
 msgid "%s error: outputfile '%s' not created"
 msgstr ""
@@ -2682,6 +2797,7 @@
 msgstr "從其他 wiki 頁面含括文字."
 
 #: ../lib/plugin/IncludePage.php:92 ../lib/plugin/PageGroup.php:131
+#: ../lib/plugin/Template.php:116
 #, php-format
 msgid "%s(%d): no such revision"
 msgstr "%s(%d): 沒有這個修訂."
@@ -2806,7 +2922,7 @@
 msgid "List pages that are explicitly given as the pages argument."
 msgstr ""
 
-#: ../lib/plugin/ListPages.php:93
+#: ../lib/plugin/ListPages.php:99
 #, fuzzy
 msgid "You must be logged in to view ratings."
 msgstr "你必須登入才能 %s."
@@ -3033,7 +3149,7 @@
 "在以 emacs 重包裝與簽入之前,PhpWiki 開發者應會因為巢狀標記而手動審閱已下載的"
 "檔案."
 
-#: ../lib/plugin/PageDump.php:201
+#: ../lib/plugin/PageDump.php:201 ../lib/plugin/PasswordReset.php:128
 msgid "Warning:"
 msgstr "警告:"
 
@@ -3051,17 +3167,11 @@
 msgid "Contents"
 msgstr "內容"
 
-#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1943
+#: ../lib/plugin/PageGroup.php:91 ../lib/stdlib.php:1985
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s: 沒有此部份>"
 
-#: ../lib/plugin/PageGroup.php:104 ../lib/plugin/WikiFormRich.php:162
-#: ../lib/plugin/WikiFormRich.php:178
-#, php-format
-msgid "A required argument '%s' is missing."
-msgstr "缺少引數 '%s'."
-
 #: ../lib/plugin/PageGroup.php:108 ../lib/plugin/PrevNext.php:66
 msgid "Next"
 msgstr "下一個"
@@ -3164,26 +3274,127 @@
 msgid "PageTrail Plugin"
 msgstr "PageTrail Plugin"
 
-#: ../lib/plugin/PhotoAlbum.php:69
+#: ../lib/plugin/PasswordReset.php:42
+#, fuzzy
+msgid "PasswordReset"
+msgstr "密碼:"
+
+#: ../lib/plugin/PasswordReset.php:61 ../lib/plugin/PasswordReset.php:82
+#: ../lib/plugin/UserPreferences.php:104
+#: ../themes/default/templates/wikiforum.tmpl:22
+msgid "Message"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:62
+#, php-format
+msgid "The password for user %s has been deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:64 ../lib/plugin/PasswordReset.php:85
+#: ../lib/plugin/PasswordReset.php:159
+msgid "Error"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:65
+#, php-format
+msgid "The password for user %s could not be deleted."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:83
+#, php-format
+msgid "Email sent to the stored email address for user %s"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:86
+#, fuzzy, php-format
+msgid "Error sending email with password for user %s."
+msgstr "錯誤的密碼或使用者帳號."
+
+#: ../lib/plugin/PasswordReset.php:94
+#, fuzzy
+msgid "Reset password of user: "
+msgstr "錯誤的密碼或使用者帳號."
+
+#: ../lib/plugin/PasswordReset.php:104 ../lib/plugin/PasswordReset.php:142
+msgid "Send email"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:129
+msgid "You need to specify the userid!"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:150
+msgid "Already logged in"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151
+msgid "Changing passwords is done at "
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:151 ../lib/plugin/UserPreferences.php:38
+#: ../themes/Crao/templates/head.tmpl:85 ../themes/Crao/templates/head.tmpl:86
+#: ../themes/Crao/templates/navbar.tmpl:23
+#: ../themes/MonoBook/templates/navbar.tmpl:49
+#: ../themes/blog/templates/navbar.tmpl:17
+#: ../themes/default/templates/head.tmpl:92
+#: ../themes/default/templates/head.tmpl:93
+#: ../themes/default/templates/homepage.tmpl:11
+#: ../themes/default/templates/navbar.tmpl:40
+#: ../themes/shamino_com/templates/top.tmpl:28
+#: ../themes/smaller/templates/navbar.tmpl:22
+#: ../themes/wikilens/templates/head.tmpl:85
+#: ../themes/wikilens/templates/head.tmpl:86
+msgid "UserPreferences"
+msgstr "UserPreferences"
+
+#: ../lib/plugin/PasswordReset.php:160
+#, php-format
+msgid "No email stored for user %s."
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:162
+#, fuzzy
+msgid "You need to ask an Administrator to reset this password. See below: "
+msgstr "你必須是管理者才能使用此 plugin."
+
+#: ../lib/plugin/PasswordReset.php:174
+#, php-format
+msgid "Do you really want to reset the password of user %s?"
+msgstr ""
+
+#: ../lib/plugin/PasswordReset.php:175
+msgid "An email will be sent."
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:94
 msgid "PhotoAlbum"
 msgstr "PhotoAlbum"
 
-#: ../lib/plugin/PhotoAlbum.php:73
+#: ../lib/plugin/PhotoAlbum.php:98
 msgid ""
 "Displays a set of photos listed in a text file with optional descriptions"
 msgstr "顯示帶有簡單描述的文字檔內的相片集合"
 
-#: ../lib/plugin/PhotoAlbum.php:328
+#: ../lib/plugin/PhotoAlbum.php:476
 #, fuzzy, php-format
 msgid "Invalid argument: %s=%s"
 msgstr "錯誤的顏色值: %s"
 
-#: ../lib/plugin/PhotoAlbum.php:380 ../lib/plugin/PhotoAlbum.php:397
+#: ../lib/plugin/PhotoAlbum.php:536 ../lib/plugin/PhotoAlbum.php:557
 #: ../lib/plugin/Transclude.php:85
 msgid "Bad url in src: remove all of <, >, \""
 msgstr "在 src 中錯誤的 url: 移除所有的 <, .>, \""
 
-#: ../lib/plugin/PhotoAlbum.php:430
+#: ../lib/plugin/PhotoAlbum.php:554
+msgid "File extension for csv file has to be '.csv'"
+msgstr ""
+
+#: ../lib/plugin/PhotoAlbum.php:605
+#, fuzzy, php-format
+msgid "Unable to find src='%s'"
+msgstr "無法讀取 %s"
+
+#: ../lib/plugin/PhotoAlbum.php:617
 #, fuzzy, php-format
 msgid "Unable to read src='%s'"
 msgstr "無法讀取 %s"
@@ -3247,6 +3458,11 @@
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
 
+#: ../lib/plugin/Ploticus.php:249 ../lib/plugin/SyntaxHighlighter.php:180
+#, fuzzy
+msgid "empty source"
+msgstr "查看源碼"
+
 #: ../lib/plugin/PluginManager.php:31
 msgid "PluginManager"
 msgstr "PluginManager"
@@ -3398,6 +3614,14 @@
 msgid "Raw HTML"
 msgstr "Raw HTML"
 
+#: ../lib/plugin/RdfDefinition.php:42
+msgid "RdfDefinition"
+msgstr ""
+
+#: ../lib/plugin/RdfDefinition.php:45
+msgid "Define the RDF vocabulary for a wiki subset."
+msgstr ""
+
 #: ../lib/plugin/RecentChanges.php:105
 #, fuzzy
 msgid "Deleted"
@@ -3407,117 +3631,117 @@
 msgid "(diff)"
 msgstr "(差異)"
 
-#: ../lib/plugin/RecentChanges.php:133
+#: ../lib/plugin/RecentChanges.php:135
 msgid "(hist)"
 msgstr "(歷程)"
 
-#: ../lib/plugin/RecentChanges.php:196
+#: ../lib/plugin/RecentChanges.php:198
 msgid "edits"
 msgstr "編輯"
 
-#: ../lib/plugin/RecentChanges.php:198
+#: ../lib/plugin/RecentChanges.php:200
 msgid "major edits"
 msgstr "主要編輯"
 
-#: ../lib/plugin/RecentChanges.php:200
+#: ../lib/plugin/RecentChanges.php:202
 msgid "minor edits"
 msgstr "次要編輯"
 
-#: ../lib/plugin/RecentChanges.php:201 ../lib/plugin/RecentChanges.php:277
+#: ../lib/plugin/RecentChanges.php:203 ../lib/plugin/RecentChanges.php:279
 #: ../lib/plugin/RecentComments.php:31
 #, fuzzy
 msgid "Recent Comments"
 msgstr "意見"
 
-#: ../lib/plugin/RecentChanges.php:202
+#: ../lib/plugin/RecentChanges.php:204
 #, fuzzy
 msgid "comments"
 msgstr "意見"
 
-#: ../lib/plugin/RecentChanges.php:227
+#: ../lib/plugin/RecentChanges.php:229
 #, php-format
 msgid "The %d most recent %s during the past day are listed below."
 msgstr "最近的 %d 筆列在下面 - 頁面 %s - 在過去一天以來."
 
-#: ../lib/plugin/RecentChanges.php:230
+#: ../lib/plugin/RecentChanges.php:232
 #, php-format
 msgid "The %d most recent %s during the past %s days are listed below."
 msgstr "最近的 %d 筆列在下面 - 頁面 %s - 在過去 %s 天以來."
 
-#: ../lib/plugin/RecentChanges.php:233
+#: ../lib/plugin/RecentChanges.php:235
 #, php-format
 msgid "The %d most recent %s are listed below."
 msgstr "最近的 %d 筆列在下面 - 頁面 %s."
 
-#: ../lib/plugin/RecentChanges.php:239
+#: ../lib/plugin/RecentChanges.php:241
 #, php-format
 msgid "The %d oldest %s during the past day are listed below."
 msgstr "最舊的 %d 筆列在下面 - 頁面 %s - 在過去一天以來."
 
-#: ../lib/plugin/RecentChanges.php:242
+#: ../lib/plugin/RecentChanges.php:244
 #, php-format
 msgid "The %d oldest %s during the past %s days are listed below."
 msgstr "最舊的 %d 筆列在下面 - 頁面 %s - 在過去 %s 天以來."
 
-#: ../lib/plugin/RecentChanges.php:245
+#: ../lib/plugin/RecentChanges.php:247
 #, php-format
 msgid "The %d oldest %s are listed below."
 msgstr "最舊的 %d 筆列在下面 - 頁面 %s."
 
-#: ../lib/plugin/RecentChanges.php:252
+#: ../lib/plugin/RecentChanges.php:254
 #, php-format
 msgid "The most recent %s during the past day are listed below."
 msgstr "最新的紀錄已經列在下面 - 頁面 %s - 在過去一天以來."
 
-#: ../lib/plugin/RecentChanges.php:255
+#: ../lib/plugin/RecentChanges.php:257
 #, php-format
 msgid "The most recent %s during the past %s days are listed below."
 msgstr "最新的紀錄已經列在下面 - 頁面 %s - 在過去 %s 天以來."
 
-#: ../lib/plugin/RecentChanges.php:258
+#: ../lib/plugin/RecentChanges.php:260
 #, php-format
 msgid "All %s are listed below."
 msgstr "所有 %s 已被列在下面."
 
-#: ../lib/plugin/RecentChanges.php:270 ../lib/plugin/RecentChanges.php:285
-#: ../lib/plugin/RecentChanges.php:388 ../lib/plugin/RecentChanges.php:464
+#: ../lib/plugin/RecentChanges.php:272 ../lib/plugin/RecentChanges.php:287
+#: ../lib/plugin/RecentChanges.php:390 ../lib/plugin/RecentChanges.php:467
 #: ../lib/plugin/RecentEdits.php:10 ../lib/plugin/RecentEdits.php:36
 #: ../lib/plugin/RelatedChanges.php:27
-#: ../themes/Portland/templates/editpage.tmpl:66
-#: ../themes/Wordpress/templates/editpage.tmpl:75
+#: ../themes/Portland/templates/editpage.tmpl:49
+#: ../themes/Wordpress/templates/editpage.tmpl:58
 msgid "RecentEdits"
 msgstr "RecentEdits"
 
-#: ../lib/plugin/RecentChanges.php:278 ../lib/plugin/RecentComments.php:65
+#: ../lib/plugin/RecentChanges.php:280 ../lib/plugin/RecentComments.php:65
 #, fuzzy
 msgid "No comments found"
 msgstr "沒發現任何變更"
 
-#: ../lib/plugin/RecentChanges.php:280
+#: ../lib/plugin/RecentChanges.php:282
 msgid "No changes found"
 msgstr "沒發現任何變更"
 
-#: ../lib/plugin/RecentChanges.php:589
+#: ../lib/plugin/RecentChanges.php:592
 msgid "Title Search"
 msgstr "標題搜尋"
 
-#: ../lib/plugin/RecentChanges.php:890
+#: ../lib/plugin/RecentChanges.php:893
 msgid "Show minor edits for:"
 msgstr "顯示次要編輯:"
 
-#: ../lib/plugin/RecentChanges.php:892
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Show all changes for:"
 msgstr "顯示所有變更:"
 
-#: ../lib/plugin/RecentChanges.php:894
+#: ../lib/plugin/RecentChanges.php:897
 msgid "Show changes for:"
 msgstr "顯示變更:"
 
-#: ../lib/plugin/RecentChanges.php:914
+#: ../lib/plugin/RecentChanges.php:917
 msgid "1 day"
 msgstr "1 天"
 
-#: ../lib/plugin/RecentChanges.php:918
+#: ../lib/plugin/RecentChanges.php:921
 #, php-format
 msgid "%s days"
 msgstr "%s 天"
@@ -3579,7 +3803,6 @@
 
 #: ../lib/plugin/RelatedChanges.php:73 ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/MonoBook/templates/navbar.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:37
 #, fuzzy
 msgid "RelatedChanges"
 msgstr "RecentChanges"
@@ -3621,7 +3844,7 @@
 msgid "Recursively get BackLinks or links"
 msgstr "遞迴地取得 BackLinks 或連結"
 
-#: ../lib/plugin/SiteMap.php:168
+#: ../lib/plugin/SiteMap.php:169
 #, php-format
 msgid "(max. recursion level: %d)"
 msgstr "(最大遞迴層級: %d)"
@@ -3662,63 +3885,42 @@
 msgid "invalid %s ignored"
 msgstr ""
 
-#: ../lib/plugin/SyntaxHighlighter.php:173
-#, fuzzy, php-format
-msgid "Couldn't start commandline '%s'"
-msgstr "無法設定頁面 '%s' 的 acl."
-
-#: ../lib/plugin/SystemInfo.php:52
+#: ../lib/plugin/SystemInfo.php:51
 msgid "SystemInfo"
 msgstr "SystemInfo"
 
-#: ../lib/plugin/SystemInfo.php:56
+#: ../lib/plugin/SystemInfo.php:55
 msgid "Provides access to PhpWiki's lower level system information."
 msgstr "提供存取 PhpWiki 下層系統資訊."
 
-#: ../lib/plugin/SystemInfo.php:83
-msgid "db type:"
-msgstr "db 型態:"
-
-#: ../lib/plugin/SystemInfo.php:88
-msgid "db backend:"
-msgstr "db 後台:"
-
-#: ../lib/plugin/SystemInfo.php:96
-msgid "dba handler:"
-msgstr "dba handler:"
-
-#: ../lib/plugin/SystemInfo.php:106
-msgid "timeout:"
-msgstr "逾時:"
-
-#: ../lib/plugin/SystemInfo.php:112
+#: ../lib/plugin/SystemInfo.php:123
 msgid "no cache used"
 msgstr "沒有快取被使用"
 
-#: ../lib/plugin/SystemInfo.php:115
+#: ../lib/plugin/SystemInfo.php:126
 msgid "cached pagedata:"
 msgstr "已置於快取的頁面資料:"
 
-#: ../lib/plugin/SystemInfo.php:116
+#: ../lib/plugin/SystemInfo.php:127
 msgid "cached versiondata:"
 msgstr "已快取的版本資料:"
 
-#: ../lib/plugin/SystemInfo.php:125
+#: ../lib/plugin/SystemInfo.php:136
 #, php-format
 msgid "Keep up to %d major edits, but keep them no longer than %d days."
 msgstr "保持 %d 份主要編輯,但不超過 %d 天."
 
-#: ../lib/plugin/SystemInfo.php:128
+#: ../lib/plugin/SystemInfo.php:139
 #, php-format
 msgid " Keep up to %d minor edits, but keep them no longer than %d days."
 msgstr "保持 %d 份次要編輯,但不超過 %d 天."
 
-#: ../lib/plugin/SystemInfo.php:131
+#: ../lib/plugin/SystemInfo.php:142
 #, php-format
 msgid " Keep the latest contributions of the last %d authors up to %d days."
 msgstr "保存最後 %d 位作者的最新貢獻直到 %d 天."
 
-#: ../lib/plugin/SystemInfo.php:133
+#: ../lib/plugin/SystemInfo.php:144
 #, php-format
 msgid ""
 " Additionally, try to keep the latest contributions of all authors in the "
@@ -3728,163 +3930,167 @@
 " 除此之外, 試著保存最近 %d 天之內所有作者的最新貢獻 (即使超過他們的 %d ,) 但"
 "是沒保存超過 %d 份單一作者修訂."
 
-#: ../lib/plugin/SystemInfo.php:142
+#: ../lib/plugin/SystemInfo.php:153
 #, php-format
 msgid "%d pages"
 msgstr "%d 個頁面"
 
-#: ../lib/plugin/SystemInfo.php:143
+#: ../lib/plugin/SystemInfo.php:154
 #, php-format
 msgid "%d not-empty pages"
 msgstr "%d 個非空白頁面"
 
-#: ../lib/plugin/SystemInfo.php:154 ../lib/plugin/SystemInfo.php:184
+#: ../lib/plugin/SystemInfo.php:165 ../lib/plugin/SystemInfo.php:195
 msgid "not yet"
 msgstr "尚未"
 
-#: ../lib/plugin/SystemInfo.php:171
+#: ../lib/plugin/SystemInfo.php:182
 #, php-format
 msgid "%d homepages"
 msgstr "%d 個主頁"
 
-#: ../lib/plugin/SystemInfo.php:219
+#: ../lib/plugin/SystemInfo.php:259
 #, php-format
 msgid "total hits: %d"
 msgstr "總擊閱數: %d"
 
-#: ../lib/plugin/SystemInfo.php:220
+#: ../lib/plugin/SystemInfo.php:260
 #, php-format
 msgid "max: %d"
 msgstr "最大: %d"
 
-#: ../lib/plugin/SystemInfo.php:221
+#: ../lib/plugin/SystemInfo.php:261
 #, php-format
 msgid "mean: %2.3f"
 msgstr "表示: %2.3f"
 
-#: ../lib/plugin/SystemInfo.php:222
+#: ../lib/plugin/SystemInfo.php:262
 #, php-format
 msgid "median: %d"
 msgstr "median: %d"
 
-#: ../lib/plugin/SystemInfo.php:223
+#: ../lib/plugin/SystemInfo.php:263
 #, php-format
 msgid "stddev: %2.3f"
 msgstr "stddev: %2.3f"
 
-#: ../lib/plugin/SystemInfo.php:235
+#: ../lib/plugin/SystemInfo.php:264
 #, php-format
 msgid "%d pages with less than %d hits (<%d%%)."
 msgstr "%d 個頁面少於 %d 個擊閱數(<%d%%)."
 
-#: ../lib/plugin/SystemInfo.php:237
+#: ../lib/plugin/SystemInfo.php:266
 #, php-format
 msgid "%d page(s) with more than %d hits (>%d%%)."
 msgstr "%d 個頁面超過 %d 個擊閱數(>%d%%)."
 
-#: ../lib/plugin/SystemInfo.php:279
+#: ../lib/plugin/SystemInfo.php:404
 #, php-format
 msgid "Application size: %d Kb"
 msgstr "應用程式大小: %d Kb"
 
-#: ../lib/plugin/SystemInfo.php:281
+#: ../lib/plugin/SystemInfo.php:406
 #, php-format
 msgid "Pagedata size: %d Kb"
 msgstr "頁面資料大小: %d Kb"
 
-#: ../lib/plugin/SystemInfo.php:299
+#: ../lib/plugin/SystemInfo.php:424
 #, php-format
 msgid "Total %d plugins: "
 msgstr "共有 %d 個 plugin:"
 
-#: ../lib/plugin/SystemInfo.php:308
+#: ../lib/plugin/SystemInfo.php:433
 #, php-format
 msgid "Total of %d languages: "
 msgstr "共有 %d 種語言:"
 
-#: ../lib/plugin/SystemInfo.php:311
+#: ../lib/plugin/SystemInfo.php:436
 #, php-format
 msgid "Current language: '%s'"
 msgstr "目前語言: '%s'"
 
-#: ../lib/plugin/SystemInfo.php:313
+#: ../lib/plugin/SystemInfo.php:438
 #, php-format
 msgid "Default language: '%s'"
 msgstr "預設語言: '%s'"
 
-#: ../lib/plugin/SystemInfo.php:321
+#: ../lib/plugin/SystemInfo.php:446
 #, php-format
 msgid "Total of %d themes: "
 msgstr "共有 %d 組佈景主題: "
 
-#: ../lib/plugin/SystemInfo.php:323
+#: ../lib/plugin/SystemInfo.php:448
 #, php-format
 msgid "Current theme: '%s'"
 msgstr "目前佈景主題: '%s'"
 
-#: ../lib/plugin/SystemInfo.php:325
+#: ../lib/plugin/SystemInfo.php:450
 #, php-format
 msgid "Default theme: '%s'"
 msgstr "預設佈景主題: '%s'"
 
-#: ../lib/plugin/SystemInfo.php:338
+#: ../lib/plugin/SystemInfo.php:463
 #, php-format
 msgid "unknown argument '%s' to SystemInfo"
 msgstr "SystemInfo 未知的引數 '%s'"
 
-#: ../lib/plugin/SystemInfo.php:361
+#: ../lib/plugin/SystemInfo.php:487
 msgid "Application name"
 msgstr "應用程式名稱"
 
-#: ../lib/plugin/SystemInfo.php:362
+#: ../lib/plugin/SystemInfo.php:488
 msgid "PhpWiki engine version"
 msgstr "PhpWiki 引擎版本"
 
-#: ../lib/plugin/SystemInfo.php:363
+#: ../lib/plugin/SystemInfo.php:489
 msgid "Database"
 msgstr "資料庫"
 
-#: ../lib/plugin/SystemInfo.php:364
+#: ../lib/plugin/SystemInfo.php:490
 msgid "Cache statistics"
 msgstr "快取統計"
 
-#: ../lib/plugin/SystemInfo.php:365
+#: ../lib/plugin/SystemInfo.php:491
 msgid "Page statistics"
 msgstr "頁面統計"
 
-#: ../lib/plugin/SystemInfo.php:368
+#: ../lib/plugin/SystemInfo.php:494
 msgid "User statistics"
 msgstr "使用者統計"
 
-#: ../lib/plugin/SystemInfo.php:370
+#: ../lib/plugin/SystemInfo.php:496
 msgid "Hit statistics"
 msgstr "擊閱數統計"
 
-#: ../lib/plugin/SystemInfo.php:372
+#: ../lib/plugin/SystemInfo.php:497
+msgid "Harddisc usage"
+msgstr ""
+
+#: ../lib/plugin/SystemInfo.php:498
 msgid "Expiry parameters"
 msgstr "過期參數"
 
-#: ../lib/plugin/SystemInfo.php:373
+#: ../lib/plugin/SystemInfo.php:499
 msgid "Wikiname regexp"
 msgstr "Wikiname regexp"
 
-#: ../lib/plugin/SystemInfo.php:374
+#: ../lib/plugin/SystemInfo.php:500
 msgid "Allowed protocols"
 msgstr "允許的協定"
 
-#: ../lib/plugin/SystemInfo.php:375
+#: ../lib/plugin/SystemInfo.php:501
 msgid "Inline images"
 msgstr "Inline 圖片"
 
-#: ../lib/plugin/SystemInfo.php:376
+#: ../lib/plugin/SystemInfo.php:502
 msgid "Available plugins"
 msgstr "可用的 plugin"
 
-#: ../lib/plugin/SystemInfo.php:377
+#: ../lib/plugin/SystemInfo.php:503
 msgid "Supported languages"
 msgstr "已支援的語言"
 
-#: ../lib/plugin/SystemInfo.php:378
+#: ../lib/plugin/SystemInfo.php:504
 msgid "Supported themes"
 msgstr "已支援的佈景主題"
 
@@ -3913,6 +4119,15 @@
 msgid "Sorry, this version of PHP cannot create PNG image files."
 msgstr "抱歉, 這個版本的 PHP 無法建立 PNG 圖片檔."
 
+#: ../lib/plugin/Template.php:61
+#, fuzzy
+msgid "Template"
+msgstr "佈景主題"
+
+#: ../lib/plugin/Template.php:65
+msgid "Parametrized page inclusion."
+msgstr ""
+
 #: ../lib/plugin/TexToPng.php:103
 msgid "Converts TeX to an image. May be used to embed formulas in PhpWiki."
 msgstr "轉換 TeX 為圖片. 可以用來在 PhpWiki 嵌入方程式."
@@ -3934,11 +4149,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr "含括外部網頁到 wiki 頁面的內容中."
 
-#: ../lib/plugin/Transclude.php:76
-#, php-format
-msgid "%s parameter missing"
-msgstr "%s 參數遺漏"
-
 #: ../lib/plugin/Transclude.php:88
 msgid "Transcluded page"
 msgstr "Transcluded 頁面"
@@ -4018,19 +4228,6 @@
 msgid "Translate"
 msgstr "轉換"
 
-#: ../lib/plugin/TranslateText.php:118 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WikiAdminChmod.php:159 ../lib/plugin/WikiAdminChown.php:166
-#: ../lib/plugin/WikiAdminMarkup.php:162 ../lib/plugin/WikiAdminRemove.php:214
-#: ../lib/plugin/WikiAdminRename.php:182
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#: ../lib/plugin/WikiAdminSelect.php:218 ../lib/plugin/WikiAdminSelect.php:239
-#: ../lib/plugin/WikiAdminSetAcl.php:189 ../lib/plugin/WikiAdminUtils.php:263
-#: ../lib/plugin/WikiFormRich.php:286 ../lib/removepage.php:24
-#: ../lib/upgrade.php:674 ../themes/default/templates/login.tmpl:78
-#: ../themes/default/templates/userprefs.tmpl:243
-msgid "Cancel"
-msgstr "取消"
-
 #: ../lib/plugin/UnfoldSubpages.php:36
 msgid "UnfoldSubpages"
 msgstr "UnfoldSubpages"
@@ -4112,22 +4309,6 @@
 msgid "Can't open the upload logfile."
 msgstr "錯誤: 無法開啟上傳日誌檔案"
 
-#: ../lib/plugin/UserPreferences.php:38 ../themes/Crao/templates/head.tmpl:85
-#: ../themes/Crao/templates/head.tmpl:86
-#: ../themes/Crao/templates/navbar.tmpl:23
-#: ../themes/MonoBook/templates/navbar.tmpl:49
-#: ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:91
-#: ../themes/default/templates/head.tmpl:92
-#: ../themes/default/templates/homepage.tmpl:11
-#: ../themes/default/templates/navbar.tmpl:40
-#: ../themes/shamino_com/templates/top.tmpl:28
-#: ../themes/smaller/templates/navbar.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
-msgid "UserPreferences"
-msgstr "UserPreferences"
-
 #: ../lib/plugin/UserPreferences.php:81
 msgid ""
 "Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences "
@@ -4135,11 +4316,6 @@
 msgstr ""
 "錯誤: 使用者的首頁必須是一個合法的 WikiWord. 抱歉, UserPreferences 無法儲存."
 
-#: ../lib/plugin/UserPreferences.php:104
-#: ../themes/default/templates/wikiforum.tmpl:22
-msgid "Message"
-msgstr ""
-
 #: ../lib/plugin/UserPreferences.php:105
 #, fuzzy
 msgid "Your UserPreferences have been successfully deleted."
@@ -4149,14 +4325,6 @@
 msgid "Do you really want to delete all your UserPreferences?"
 msgstr ""
 
-#: ../lib/plugin/UserPreferences.php:114 ../lib/plugin/WikiAdminChmod.php:146
-#: ../lib/plugin/WikiAdminChown.php:153 ../lib/plugin/WikiAdminMarkup.php:149
-#: ../lib/plugin/WikiAdminRemove.php:188 ../lib/plugin/WikiAdminRename.php:165
-#: ../lib/plugin/WikiAdminSearchReplace.php:180
-#: ../lib/plugin/WikiAdminSetAcl.php:176
-msgid "Yes"
-msgstr "是"
-
 #: ../lib/plugin/UserPreferences.php:121
 msgid "Wrong password. Try again."
 msgstr "錯誤的密碼.再試一次."
@@ -4227,7 +4395,7 @@
 "from graphviz."
 msgstr "從 graphviz 使用 'dot' 命令列工具以圖形視覺化 Wiki 結構."
 
-#: ../lib/plugin/VisualWiki.php:487
+#: ../lib/plugin/VisualWiki.php:493
 msgid "Legend"
 msgstr "圖例"
 
@@ -4802,7 +4970,7 @@
 msgid "WikiAdminUtils says:"
 msgstr "WikiAdminUtils 說:"
 
-#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1728
+#: ../lib/plugin/WikiAdminUtils.php:103 ../lib/stdlib.php:1759
 msgid "Okay"
 msgstr "Okay"
 
@@ -4880,7 +5048,7 @@
 msgid "Verification Status"
 msgstr "確認狀態"
 
-#: ../lib/plugin/WikiAdminUtils.php:260
+#: ../lib/plugin/WikiAdminUtils.php:263
 msgid "Change Verification Status"
 msgstr "改變確認狀態"
 
@@ -4919,11 +5087,11 @@
 msgid "WikiForm: %s: unknown action"
 msgstr "WikiForm: %s: 未知的動作"
 
-#: ../lib/plugin/WikiFormRich.php:91
+#: ../lib/plugin/WikiFormRich.php:92
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiFormRich.php:180
+#: ../lib/plugin/WikiFormRich.php:181
 #, fuzzy
 msgid "name"
 msgstr "更名"
@@ -5119,8 +5287,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:25
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/Sidebar/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:41
 #: ../themes/default/templates/head.tmpl:42
+#: ../themes/default/templates/head.tmpl:43
 #: ../themes/default/templates/navbar.tmpl:20
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/smaller/templates/navbar.tmpl:8
@@ -5343,8 +5511,8 @@
 
 #: ../lib/plugin/_WikiTranslation.php:123
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
+#: ../themes/default/templates/head.tmpl:80
 #: ../themes/wikilens/templates/head.tmpl:71
 #: ../themes/wikilens/templates/head.tmpl:72
 msgid "WikiWikiWeb"
@@ -5429,115 +5597,115 @@
 msgid "Back to the previous page."
 msgstr "上次主要變更的原始文件"
 
-#: ../lib/stdlib.php:352 ../lib/stdlib.php:381
+#: ../lib/stdlib.php:364 ../lib/stdlib.php:393
 msgid "BAD URL -- remove all of <, >, \""
 msgstr "錯誤 URL -- 移除所有的 <, >, \""
 
-#: ../lib/stdlib.php:421 ../lib/stdlib.php:438
+#: ../lib/stdlib.php:433 ../lib/stdlib.php:450
 #, fuzzy
 msgid "Invalid image size"
 msgstr "Inline 圖片"
 
-#: ../lib/stdlib.php:548
+#: ../lib/stdlib.php:560
 msgid "BAD phpwiki: URL"
 msgstr "錯誤 phpwiki: URL"
 
-#: ../lib/stdlib.php:586
+#: ../lib/stdlib.php:598
 msgid "Lock page to enable link"
 msgstr "鎖定頁面以打開此連結"
 
-#: ../lib/stdlib.php:713
+#: ../lib/stdlib.php:725
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr "'%s': 錯誤頁面名稱: %s"
 
-#: ../lib/stdlib.php:743 ../lib/stdlib.php:768
+#: ../lib/stdlib.php:755 ../lib/stdlib.php:780
 #, php-format
 msgid "Leading %s not allowed"
 msgstr "前面的 %s 是不被允許的"
 
-#: ../lib/stdlib.php:752
+#: ../lib/stdlib.php:764
 msgid "White space converted to single space"
 msgstr "空白空格轉換為單一空格"
 
-#: ../lib/stdlib.php:758
+#: ../lib/stdlib.php:770
 msgid "Control characters not allowed"
 msgstr "控制字元是不被允許的"
 
-#: ../lib/stdlib.php:779
+#: ../lib/stdlib.php:791
 msgid "too long"
 msgstr "太長"
 
-#: ../lib/stdlib.php:785
+#: ../lib/stdlib.php:797
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:831
+#: ../lib/stdlib.php:843
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:832
+#: ../lib/stdlib.php:844
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1093
+#: ../lib/stdlib.php:1105
 msgid "Revision Not Found"
 msgstr "修訂未找到"
 
-#: ../lib/stdlib.php:1094
+#: ../lib/stdlib.php:1106
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "抱歉, 版本是 %d 的 %s 不在資料庫中."
 
-#: ../lib/stdlib.php:1097
+#: ../lib/stdlib.php:1109
 msgid "Bad Version"
 msgstr "錯誤的版本"
 
-#: ../lib/stdlib.php:1233
+#: ../lib/stdlib.php:1245
 msgid "-???"
 msgstr "-???"
 
-#: ../lib/stdlib.php:1236
+#: ../lib/stdlib.php:1248
 #, php-format
 msgid "%s b"
 msgstr "%s b"
 
-#: ../lib/stdlib.php:1238 ../themes/MonoBook/templates/info.tmpl:29
+#: ../lib/stdlib.php:1250 ../themes/MonoBook/templates/info.tmpl:29
 #: ../themes/shamino_com/templates/info.tmpl:29
 #, php-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../lib/stdlib.php:1243
+#: ../lib/stdlib.php:1255
 #, php-format
 msgid "%s k"
 msgstr "%s k"
 
-#: ../lib/stdlib.php:1245 ../themes/MonoBook/templates/info.tmpl:32
+#: ../lib/stdlib.php:1257 ../themes/MonoBook/templates/info.tmpl:32
 #: ../themes/shamino_com/templates/info.tmpl:32
 #, php-format
 msgid "%s Kb (%s bytes)"
 msgstr "%s Kb (%s bytes)"
 
-#: ../lib/stdlib.php:1341
+#: ../lib/stdlib.php:1353
 #, php-format
 msgid "%s: argument index out of range"
 msgstr "%s: 引數索引超出範圍"
 
-#: ../lib/stdlib.php:1419 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1431 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s 是空白的."
 
-#: ../lib/stdlib.php:1426
+#: ../lib/stdlib.php:1438
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr "無法開啟目錄 '%s' 進行讀取"
 
-#: ../lib/stdlib.php:1900 ../lib/stdlib.php:1913
+#: ../lib/stdlib.php:1942 ../lib/stdlib.php:1955
 #, fuzzy, php-format
 msgid "... (first %s words)"
 msgstr "... 頭 %d 個字"
@@ -5585,7 +5753,7 @@
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:356
+#: ../lib/upgrade.php:357
 msgid "check for necessary database updates"
 msgstr ""
 
@@ -5608,133 +5776,137 @@
 msgid "check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:408 ../lib/upgrade.php:510 ../lib/upgrade.php:704
+#: ../lib/upgrade.php:407 ../lib/upgrade.php:712
+msgid "SKIP"
+msgstr ""
+
+#: ../lib/upgrade.php:410 ../lib/upgrade.php:517 ../lib/upgrade.php:717
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:418
+#: ../lib/upgrade.php:420
 msgid "check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:432 ../lib/upgrade.php:437 ../lib/upgrade.php:469
-#: ../lib/upgrade.php:478
+#: ../lib/upgrade.php:434 ../lib/upgrade.php:439 ../lib/upgrade.php:476
+#: ../lib/upgrade.php:485
 #, fuzzy
 msgid "fixed"
 msgstr "已變更"
 
-#: ../lib/upgrade.php:446
+#: ../lib/upgrade.php:453
 msgid "check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:480 ../lib/upgrade.php:517 ../lib/upgrade.php:770
-#: ../lib/upgrade.php:795 ../lib/upgrade.php:804 ../lib/upgrade.php:811
+#: ../lib/upgrade.php:487 ../lib/upgrade.php:524 ../lib/upgrade.php:784
+#: ../lib/upgrade.php:809 ../lib/upgrade.php:818 ../lib/upgrade.php:825
 msgid "FAILED"
 msgstr ""
 
-#: ../lib/upgrade.php:492
+#: ../lib/upgrade.php:499
 #, php-format
 msgid "version <em>%s</em> not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:500
+#: ../lib/upgrade.php:507
 msgid "check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:537
+#: ../lib/upgrade.php:544
 msgid "check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:540 ../lib/upgrade.php:556 ../lib/upgrade.php:577
+#: ../lib/upgrade.php:547 ../lib/upgrade.php:563 ../lib/upgrade.php:584
 #, fuzzy, php-format
 msgid "version <em>%s</em>"
 msgstr "版本 %s"
 
-#: ../lib/upgrade.php:541
+#: ../lib/upgrade.php:548
 #, fuzzy
 msgid "not affected"
 msgstr "尚未"
 
-#: ../lib/upgrade.php:557 ../lib/upgrade.php:578 ../lib/upgrade.php:599
-#: ../lib/upgrade.php:802
+#: ../lib/upgrade.php:564 ../lib/upgrade.php:585 ../lib/upgrade.php:606
+#: ../lib/upgrade.php:816
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:588
+#: ../lib/upgrade.php:595
 msgid "check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:654
+#: ../lib/upgrade.php:661
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:656
+#: ../lib/upgrade.php:663
 msgid ""
 "And on windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:660
+#: ../lib/upgrade.php:668
 msgid "DB admin user:"
 msgstr ""
 
-#: ../lib/upgrade.php:666
+#: ../lib/upgrade.php:674
 #, fuzzy
 msgid "DB admin password:"
 msgstr "改變密碼"
 
-#: ../lib/upgrade.php:698
+#: ../lib/upgrade.php:707
 msgid "check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:711
+#: ../lib/upgrade.php:724
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:752
+#: ../lib/upgrade.php:766
 msgid "check for necessary plugin argument updates"
 msgstr ""
 
-#: ../lib/upgrade.php:753
+#: ../lib/upgrade.php:767
 msgid "change RandomPage pages => numpages"
 msgstr ""
 
-#: ../lib/upgrade.php:805
+#: ../lib/upgrade.php:819
 #, fuzzy, php-format
 msgid "couldn't move %s to %s"
 msgstr "無法為頁面 '%s' 變更權限為 '%s'."
 
-#: ../lib/upgrade.php:812
+#: ../lib/upgrade.php:826
 #, fuzzy, php-format
 msgid "%s is not writable"
 msgstr "%s 無法寫入."
 
-#: ../lib/upgrade.php:818
+#: ../lib/upgrade.php:832
 msgid "check for necessary config updates"
 msgstr ""
 
-#: ../lib/upgrade.php:819
+#: ../lib/upgrade.php:833
 msgid "check for old CACHE_CONTROL = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:822
+#: ../lib/upgrade.php:836
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:829
+#: ../lib/upgrade.php:843
 msgid "check for GROUP_METHOD = NONE"
 msgstr ""
 
-#: ../lib/upgrade.php:832
+#: ../lib/upgrade.php:846
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:869
+#: ../lib/upgrade.php:883
 msgid "Upgrade disabled: user != isAdmin"
 msgstr "禁止升級: user != isAdmin"
 
-#: ../lib/upgrade.php:873
+#: ../lib/upgrade.php:887
 msgid "Upgrading this PhpWiki"
 msgstr "升級 PhpWiki"
 
@@ -5769,25 +5941,25 @@
 msgid "Members:"
 msgstr ""
 
-#: ../lib/ziplib.php:211
+#: ../lib/ziplib.php:199
 msgid "Can't inflate data: zlib support not enabled in this PHP"
 msgstr "無法壓縮資料: 此 PHP 的 zlib 支援未被啟動"
 
-#: ../lib/ziplib.php:397
+#: ../lib/ziplib.php:395
 #, php-format
 msgid "Can't open zip file '%s' for reading"
 msgstr "無法開啟 zip 檔案 '%s' 進行讀取"
 
-#: ../lib/ziplib.php:404
+#: ../lib/ziplib.php:405 ../lib/ziplib.php:409
 msgid "Unexpected EOF in zip file"
 msgstr "zip 檔案中存有不被期待的 EOF."
 
-#: ../lib/ziplib.php:703
+#: ../lib/ziplib.php:730
 #, php-format
 msgid "[%d] See [%s]"
 msgstr "[%d] 參閱 [%s]"
 
-#: ../lib/ziplib.php:710
+#: ../lib/ziplib.php:737
 msgid "References"
 msgstr "偏好設定"
 
@@ -5809,7 +5981,7 @@
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 #: ../themes/blog/templates/actionbar.tmpl:7
 #: ../themes/default/templates/actionbar.tmpl:17
-#: ../themes/default/templates/head.tmpl:52
+#: ../themes/default/templates/head.tmpl:53
 #: ../themes/shamino_com/templates/info.tmpl:165
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:5
@@ -5885,8 +6057,8 @@
 msgstr "查看目前版本"
 
 #: ../themes/Crao/templates/editpage.tmpl:4
-#: ../themes/Portland/templates/editpage.tmpl:80
-#: ../themes/Wordpress/templates/editpage.tmpl:80
+#: ../themes/Portland/templates/editpage.tmpl:61
+#: ../themes/Wordpress/templates/editpage.tmpl:63
 #: ../themes/default/templates/editpage.tmpl:4
 msgid "Preview only!  Changes not saved."
 msgstr "僅能預覽! 更動將不被儲存."
@@ -5904,36 +6076,36 @@
 msgstr "編輯區域"
 
 #: ../themes/Crao/templates/editpage.tmpl:18
-#: ../themes/Portland/templates/editpage.tmpl:46
-#: ../themes/Wordpress/templates/editpage.tmpl:44
+#: ../themes/Portland/templates/editpage.tmpl:25
+#: ../themes/Wordpress/templates/editpage.tmpl:23
 #: ../themes/default/templates/editpage.tmpl:20
 msgid "Warning: You are editing an old revision."
 msgstr "警告: 你正在編輯較舊的修訂."
 
 #: ../themes/Crao/templates/editpage.tmpl:19
-#: ../themes/Portland/templates/editpage.tmpl:47
-#: ../themes/Wordpress/templates/editpage.tmpl:45
+#: ../themes/Portland/templates/editpage.tmpl:26
+#: ../themes/Wordpress/templates/editpage.tmpl:24
 #: ../themes/default/templates/editpage.tmpl:21
 msgid "Saving this page will overwrite the current version."
 msgstr "儲存此頁面將會覆寫掉目前版本."
 
 #: ../themes/Crao/templates/editpage.tmpl:38
-#: ../themes/Portland/templates/editpage.tmpl:69
-#: ../themes/Wordpress/templates/editpage.tmpl:60
+#: ../themes/Portland/templates/editpage.tmpl:52
+#: ../themes/Wordpress/templates/editpage.tmpl:39
 #: ../themes/default/templates/editpage.tmpl:40
 msgid "H"
 msgstr "高"
 
 #: ../themes/Crao/templates/editpage.tmpl:39
-#: ../themes/Portland/templates/editpage.tmpl:71
-#: ../themes/Wordpress/templates/editpage.tmpl:61
+#: ../themes/Portland/templates/editpage.tmpl:53
+#: ../themes/Wordpress/templates/editpage.tmpl:40
 #: ../themes/default/templates/editpage.tmpl:41
 msgid "W"
 msgstr "寬"
 
 #: ../themes/Crao/templates/editpage.tmpl:40
-#: ../themes/Portland/templates/editpage.tmpl:73
-#: ../themes/Wordpress/templates/editpage.tmpl:62
+#: ../themes/Portland/templates/editpage.tmpl:54
+#: ../themes/Wordpress/templates/editpage.tmpl:41
 #: ../themes/default/templates/editpage.tmpl:42
 msgid "Adjust"
 msgstr "調整"
@@ -5943,84 +6115,76 @@
 msgid "Page Content: "
 msgstr "內容"
 
-#: ../themes/Crao/templates/editpage.tmpl:52
+#: ../themes/Crao/templates/editpage.tmpl:58
 #: ../themes/default/templates/editpage.tmpl:59
 msgid "This is a minor change."
 msgstr "這是次要變更."
 
-#: ../themes/Crao/templates/editpage.tmpl:53
-#: ../themes/Portland/templates/editpage.tmpl:75
-#: ../themes/Wordpress/templates/editpage.tmpl:65
+#: ../themes/Crao/templates/editpage.tmpl:59
+#: ../themes/Portland/templates/editpage.tmpl:56
+#: ../themes/Wordpress/templates/editpage.tmpl:44
 #: ../themes/default/templates/editpage.tmpl:60
 msgid "Use old markup"
 msgstr "使用舊標記"
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 #, php-format
 msgid "See %s tips for editing."
 msgstr "參照編輯時的 %s 小秘訣."
 
-#: ../themes/Crao/templates/editpage.tmpl:88
-#: ../themes/Crao/templates/editpage.tmpl:93
-#: ../themes/Portland/templates/editpage.tmpl:103
-#: ../themes/Portland/templates/editpage.tmpl:108
-#: ../themes/Wordpress/templates/editpage.tmpl:103
-#: ../themes/Wordpress/templates/editpage.tmpl:108
+#: ../themes/Crao/templates/editpage.tmpl:92
+#: ../themes/Crao/templates/editpage.tmpl:97
+#: ../themes/Portland/templates/editpage.tmpl:84
+#: ../themes/Portland/templates/editpage.tmpl:89
+#: ../themes/Wordpress/templates/editpage.tmpl:86
+#: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/default/templates/editpage.tmpl:113
 #: ../themes/default/templates/editpage.tmpl:118
 msgid "GoodStyle"
 msgstr "GoodStyle"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:104
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Wordpress/templates/editpage.tmpl:87
 #: ../themes/default/templates/editpage.tmpl:114
 msgid "OldTextFormattingRules"
 msgstr "OldTextFormattingRules"
 
-#: ../themes/Crao/templates/editpage.tmpl:89
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:104
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:104
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:93
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:85
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:87
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:114
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "Synopsis"
 msgstr "概要"
 
-#: ../themes/Crao/templates/editpage.tmpl:94
-#: ../themes/Portland/templates/editpage.tmpl:109
-#: ../themes/Wordpress/templates/editpage.tmpl:109
+#: ../themes/Crao/templates/editpage.tmpl:98
+#: ../themes/Portland/templates/editpage.tmpl:90
+#: ../themes/Wordpress/templates/editpage.tmpl:92
 #: ../themes/default/templates/editpage.tmpl:119
 msgid "TextFormattingRules"
 msgstr "TextFormattingRules"
 
 #: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
 #: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/head.tmpl:37
+#: ../themes/default/templates/head.tmpl:38
 #: ../themes/default/templates/htmldump.tmpl:22
 #: ../themes/wikilens/templates/head.tmpl:30
 #: ../themes/wikilens/templates/head.tmpl:31
 msgid "HowToUseWiki"
 msgstr "HowToUseWiki"
 
-#: ../themes/Crao/templates/head.tmpl:70 ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:75
-#: ../themes/default/templates/head.tmpl:76
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
-msgid "SandBox"
-msgstr "SandBox"
-
 #: ../themes/Crao/templates/navbar.tmpl:34
 #: ../themes/Wordpress/templates/actionbar.tmpl:37
 #: ../themes/default/templates/navbar.tmpl:51
@@ -6058,12 +6222,6 @@
 msgid "Enter your UserId to sign in"
 msgstr "輸入你的帳號進行簽入"
 
-#: ../themes/Crao/templates/signin.tmpl:54
-#: ../themes/smaller/templates/signin.tmpl:54
-#, fuzzy
-msgid "Sign in:"
-msgstr "簽入:"
-
 #: ../themes/Crao/templates/wikiblog.tmpl:19
 #: ../themes/blog/templates/wikiblog.tmpl:20
 #: ../themes/default/templates/comment.tmpl:18
@@ -6084,7 +6242,7 @@
 #: ../themes/MonoBook/themeinfo.php:72 ../themes/Portland/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:122 ../themes/SpaceWiki/themeinfo.php:43
 #: ../themes/Wordpress/themeinfo.php:61 ../themes/default/themeinfo.php:24
-#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:52
+#: ../themes/shamino_com/themeinfo.php:56 ../themes/smaller/themeinfo.php:51
 #: ../themes/wikilens/themeinfo.php:24
 msgid "Printer"
 msgstr "印表機"
@@ -6093,13 +6251,13 @@
 #: ../themes/Portland/themeinfo.php:60 ../themes/Sidebar/themeinfo.php:123
 #: ../themes/SpaceWiki/themeinfo.php:44 ../themes/Wordpress/themeinfo.php:62
 #: ../themes/default/themeinfo.php:26 ../themes/shamino_com/themeinfo.php:58
-#: ../themes/smaller/themeinfo.php:54 ../themes/wikilens/themeinfo.php:26
+#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:26
 msgid "Modern"
 msgstr "Modern"
 
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:73
 #: ../themes/default/themeinfo.php:25 ../themes/shamino_com/themeinfo.php:57
-#: ../themes/smaller/themeinfo.php:53 ../themes/wikilens/themeinfo.php:25
+#: ../themes/smaller/themeinfo.php:52 ../themes/wikilens/themeinfo.php:25
 msgid "Top & bottom toolbars"
 msgstr "Top & bottom 工具列"
 
@@ -6238,14 +6396,14 @@
 msgstr "頁面型態:"
 
 #: ../themes/MonoBook/templates/info.tmpl:170
-#: ../themes/blog/templates/_info.tmpl:5 ../themes/blog/templates/info.tmpl:5
+#: ../themes/blog/templates/info.tmpl:5
 #: ../themes/shamino_com/templates/info.tmpl:170
 #: ../themes/smaller/templates/info.tmpl:9
 msgid "Diff previous Revision"
 msgstr "與上個修訂做比對"
 
 #: ../themes/MonoBook/templates/info.tmpl:171
-#: ../themes/blog/templates/_info.tmpl:6 ../themes/blog/templates/info.tmpl:6
+#: ../themes/blog/templates/info.tmpl:6
 #: ../themes/shamino_com/templates/info.tmpl:171
 #: ../themes/smaller/templates/info.tmpl:10
 msgid "Diff previous Author"
@@ -6322,14 +6480,14 @@
 msgid "Page Execution took %s seconds"
 msgstr "執行此頁面花了 %s 秒"
 
-#: ../themes/Portland/templates/editpage.tmpl:65
-#: ../themes/Wordpress/templates/editpage.tmpl:74
+#: ../themes/Portland/templates/editpage.tmpl:48
+#: ../themes/Wordpress/templates/editpage.tmpl:57
 #, php-format
 msgid ""
 "I'm just doing minor edits. Please divert the usual logging to %s instead."
 msgstr "我正在做次要編輯. 請轉移常用日誌到替代的 %s."
 
-#: ../themes/Portland/templates/editpage.tmpl:69
+#: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/default/templates/userprefs.tmpl:195
 msgid "Edit Area Size"
 msgstr "編輯區域大小"
@@ -6859,6 +7017,36 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Warning"
+#~ msgstr "警告:"
+
+#~ msgid "AUTH_GROUP_FILE not defined"
+#~ msgstr "AUTH_GROUP_FILE 未定義"
+
+#~ msgid "LDAP_AUTH_HOST not defined"
+#~ msgstr "LDAP_AUTH_HOST 未定義"
+
+#, fuzzy
+#~ msgid "Sign in:"
+#~ msgstr "簽入:"
+
+#, fuzzy
+#~ msgid "Category"
+#~ msgstr "CategoryPage"
+
+#~ msgid "db type:"
+#~ msgstr "db 型態:"
+
+#~ msgid "db backend:"
+#~ msgstr "db 後台:"
+
+#~ msgid "dba handler:"
+#~ msgstr "dba handler:"
+
+#~ msgid "timeout:"
+#~ msgstr "逾時:"
+
+#, fuzzy
 #~ msgid ""
 #~ "DBA files are in the /tmp directory. Please read the INSTALL file and "
 #~ "move the database to a permanent location or risk losing all the pages!"
diff -ruN 11p1/locale/POFileChecker.html 12p3/locale/POFileChecker.html
--- 11p1/locale/POFileChecker.html	2005-02-12 09:33:43.000000000 -0600
+++ 12p3/locale/POFileChecker.html	2006-06-18 06:19:38.000000000 -0500
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><title>PO File Checker Report</title></head><body><h1>PO File Checker Report</h1><em>184 problems found</em><table border="1"><tr><td>file</td><td>message</td><td>line</td><td>problem</td></tr><tr valign="top"><td rowspan="1">po/de.po</td><td>1287</td><td>6406</td><td>missing .</td></tr><tr valign="top"><td rowspan="65">po/ja.euc-jp.po</td><td>15</td><td>96</td><td>missing .</td></tr><tr><td>147</td><td>772</td><td>missing .</td></tr><tr><td>174</td><td>914</td><td>missing .</td></tr><tr><td>175</td><td>919</td><td>missing .</td></tr><tr><td>176</td><td>924</td><td>missing .</td></tr><tr><td>181</td><td>955</td><td>missing .</td></tr><tr><td>182</td><td>959</td><td>missing .</td></tr><tr><td>200</td><td>1054</td><td>missing .</td></tr><tr><td>201</td><td>1059</td><td>missing .</td></tr><tr><td>244</td><td>1281</td><td>missing .</td></tr><tr><td>245</td><td>1285</td><td>missing .</td></tr><tr><td>270</td><td>1408</td><td>missing .</td></tr><tr><td>396</td><td>1990</td><td>missing .</td></tr><tr><td>430</td><td>2142</td><td>missing .</td></tr><tr><td>467</td><td>2345</td><td>missing .</td></tr><tr><td>471</td><td>2365</td><td>missing .</td></tr><tr><td>560</td><td>2772</td><td>missing :</td></tr><tr><td>589</td><td>2908</td><td>missing .</td></tr><tr><td>603</td><td>2973</td><td>missing :</td></tr><tr><td>620</td><td>3058</td><td>missing .</td></tr><tr><td>740</td><td>3614</td><td>missing :</td></tr><tr><td>741</td><td>3618</td><td>missing :</td></tr><tr><td>742</td><td>3622</td><td>missing :</td></tr><tr><td>743</td><td>3626</td><td>missing :</td></tr><tr><td>764</td><td>3730</td><td>missing : </td></tr><tr><td>768</td><td>3750</td><td>missing : </td></tr><tr><td>823</td><td>3999</td><td>missing : </td></tr><tr><td>830</td><td>4033</td><td>missing .</td></tr><tr><td>840</td><td>4093</td><td>missing .</td></tr><tr><td>841</td><td>4098</td><td>missing .</td></tr><tr><td>843</td><td>4106</td><td>missing .</td></tr><tr><td>859</td><td>4183</td><td>missing :</td></tr><tr><td>878</td><td>4272</td><td>missing .</td></tr><tr><td>882</td><td>4290</td><td>missing :</td></tr><tr><td>889</td><td>4319</td><td>missing .</td></tr><tr><td>891</td><td>4331</td><td>missing .</td></tr><tr><td>892</td><td>4336</td><td>missing .</td></tr><tr><td>897</td><td>4359</td><td>missing :</td></tr><tr><td>901</td><td>4376</td><td>missing .</td></tr><tr><td>902</td><td>4381</td><td>missing .</td></tr><tr><td>910</td><td>4418</td><td>missing .</td></tr><tr><td>914</td><td>4437</td><td>missing .</td></tr><tr><td>916</td><td>4447</td><td>missing .</td></tr><tr><td>919</td><td>4462</td><td>missing .</td></tr><tr><td>947</td><td>4586</td><td>missing : </td></tr><tr><td>951</td><td>4604</td><td>missing .</td></tr><tr><td>952</td><td>4609</td><td>missing .</td></tr><tr><td>957</td><td>4631</td><td>missing : </td></tr><tr><td>990</td><td>4774</td><td>missing .</td></tr><tr><td>991</td><td>4779</td><td>missing :</td></tr><tr><td>1105</td><td>5324</td><td>missing .</td></tr><tr><td>1127</td><td>5427</td><td>missing .</td></tr><tr><td>1142</td><td>5492</td><td>missing : </td></tr><tr><td>1158</td><td>5568</td><td>missing :</td></tr><tr><td>1193</td><td>5777</td><td>missing .</td></tr><tr><td>1196</td><td>5796</td><td>missing .</td></tr><tr><td>1201</td><td>5829</td><td>missing : </td></tr><tr><td>1216</td><td>5949</td><td>missing :</td></tr><tr><td>1251</td><td>6188</td><td>missing :</td></tr><tr><td>1292</td><td>6393</td><td>missing .</td></tr><tr><td>1319</td><td>6517</td><td>missing :</td></tr><tr><td>1321</td><td>6527</td><td>missing :</td></tr><tr><td>1322</td><td>6532</td><td>missing :</td></tr><tr><td>1337</td><td>6594</td><td>missing .</td></tr><tr><td>1338</td><td>6598</td><td>missing .</td></tr><tr valign="top"><td rowspan="65">po/ja.utf-8.po</td><td>15</td><td>98</td><td>missing .</td></tr><tr><td>147</td><td>774</td><td>missing .</td></tr><tr><td>174</td><td>916</td><td>missing .</td></tr><tr><td>175</td><td>921</td><td>missing .</td></tr><tr><td>176</td><td>926</td><td>missing .</td></tr><tr><td>181</td><td>957</td><td>missing .</td></tr><tr><td>182</td><td>961</td><td>missing .</td></tr><tr><td>200</td><td>1056</td><td>missing .</td></tr><tr><td>201</td><td>1061</td><td>missing .</td></tr><tr><td>244</td><td>1283</td><td>missing .</td></tr><tr><td>245</td><td>1287</td><td>missing .</td></tr><tr><td>270</td><td>1410</td><td>missing .</td></tr><tr><td>396</td><td>1992</td><td>missing .</td></tr><tr><td>430</td><td>2144</td><td>missing .</td></tr><tr><td>467</td><td>2347</td><td>missing .</td></tr><tr><td>471</td><td>2367</td><td>missing .</td></tr><tr><td>560</td><td>2774</td><td>missing :</td></tr><tr><td>589</td><td>2910</td><td>missing .</td></tr><tr><td>603</td><td>2975</td><td>missing :</td></tr><tr><td>620</td><td>3060</td><td>missing .</td></tr><tr><td>740</td><td>3616</td><td>missing :</td></tr><tr><td>741</td><td>3620</td><td>missing :</td></tr><tr><td>742</td><td>3624</td><td>missing :</td></tr><tr><td>743</td><td>3628</td><td>missing :</td></tr><tr><td>764</td><td>3732</td><td>missing : </td></tr><tr><td>768</td><td>3752</td><td>missing : </td></tr><tr><td>823</td><td>4001</td><td>missing : </td></tr><tr><td>830</td><td>4035</td><td>missing .</td></tr><tr><td>840</td><td>4095</td><td>missing .</td></tr><tr><td>841</td><td>4100</td><td>missing .</td></tr><tr><td>843</td><td>4108</td><td>missing .</td></tr><tr><td>859</td><td>4185</td><td>missing :</td></tr><tr><td>878</td><td>4274</td><td>missing .</td></tr><tr><td>882</td><td>4292</td><td>missing :</td></tr><tr><td>889</td><td>4321</td><td>missing .</td></tr><tr><td>891</td><td>4333</td><td>missing .</td></tr><tr><td>892</td><td>4338</td><td>missing .</td></tr><tr><td>897</td><td>4361</td><td>missing :</td></tr><tr><td>901</td><td>4378</td><td>missing .</td></tr><tr><td>902</td><td>4383</td><td>missing .</td></tr><tr><td>910</td><td>4420</td><td>missing .</td></tr><tr><td>914</td><td>4439</td><td>missing .</td></tr><tr><td>916</td><td>4449</td><td>missing .</td></tr><tr><td>919</td><td>4464</td><td>missing .</td></tr><tr><td>947</td><td>4588</td><td>missing : </td></tr><tr><td>951</td><td>4606</td><td>missing .</td></tr><tr><td>952</td><td>4611</td><td>missing .</td></tr><tr><td>957</td><td>4633</td><td>missing : </td></tr><tr><td>990</td><td>4776</td><td>missing .</td></tr><tr><td>991</td><td>4781</td><td>missing :</td></tr><tr><td>1105</td><td>5326</td><td>missing .</td></tr><tr><td>1127</td><td>5429</td><td>missing .</td></tr><tr><td>1142</td><td>5494</td><td>missing : </td></tr><tr><td>1158</td><td>5570</td><td>missing :</td></tr><tr><td>1193</td><td>5779</td><td>missing .</td></tr><tr><td>1196</td><td>5798</td><td>missing .</td></tr><tr><td>1201</td><td>5831</td><td>missing : </td></tr><tr><td>1216</td><td>5951</td><td>missing :</td></tr><tr><td>1251</td><td>6190</td><td>missing :</td></tr><tr><td>1292</td><td>6395</td><td>missing .</td></tr><tr><td>1319</td><td>6519</td><td>missing :</td></tr><tr><td>1321</td><td>6529</td><td>missing :</td></tr><tr><td>1322</td><td>6534</td><td>missing :</td></tr><tr><td>1337</td><td>6596</td><td>missing .</td></tr><tr><td>1338</td><td>6600</td><td>missing .</td></tr><tr valign="top"><td rowspan="53">po/zh.po</td><td>44</td><td>227</td><td>missing :</td></tr><tr><td>96</td><td>478</td><td>missing .</td></tr><tr><td>172</td><td>906</td><td>missing .</td></tr><tr><td>176</td><td>926</td><td>missing .</td></tr><tr><td>178</td><td>936</td><td>missing .</td></tr><tr><td>197</td><td>1043</td><td>missing .</td></tr><tr><td>197</td><td>1043</td><td>extra \n</td></tr><tr><td>198</td><td>1050</td><td>missing .</td></tr><tr><td>198</td><td>1050</td><td>extra \n</td></tr><tr><td>247</td><td>1309</td><td>missing .</td></tr><tr><td>270</td><td>1428</td><td>missing .</td></tr><tr><td>279</td><td>1468</td><td>missing .</td></tr><tr><td>300</td><td>1566</td><td>missing .</td></tr><tr><td>326</td><td>1685</td><td>missing :</td></tr><tr><td>396</td><td>1998</td><td>missing .</td></tr><tr><td>467</td><td>2352</td><td>missing .</td></tr><tr><td>510</td><td>2546</td><td>missing .</td></tr><tr><td>545</td><td>2703</td><td>missing .</td></tr><tr><td>636</td><td>3154</td><td>missing .</td></tr><tr><td>735</td><td>3602</td><td>missing .</td></tr><tr><td>764</td><td>3742</td><td>missing : </td></tr><tr><td>765</td><td>3747</td><td>missing : </td></tr><tr><td>813</td><td>3959</td><td>missing : </td></tr><tr><td>822</td><td>4005</td><td>missing .</td></tr><tr><td>823</td><td>4012</td><td>missing : </td></tr><tr><td>824</td><td>4017</td><td>missing .</td></tr><tr><td>826</td><td>4028</td><td>missing .</td></tr><tr><td>830</td><td>4047</td><td>missing .</td></tr><tr><td>831</td><td>4052</td><td>missing .</td></tr><tr><td>832</td><td>4057</td><td>missing .</td></tr><tr><td>914</td><td>4450</td><td>missing .</td></tr><tr><td>915</td><td>4455</td><td>missing .</td></tr><tr><td>919</td><td>4474</td><td>missing .</td></tr><tr><td>941</td><td>4569</td><td>missing : </td></tr><tr><td>947</td><td>4596</td><td>missing : </td></tr><tr><td>957</td><td>4644</td><td>missing : </td></tr><tr><td>968</td><td>4694</td><td>missing .</td></tr><tr><td>991</td><td>4797</td><td>missing :</td></tr><tr><td>1096</td><td>5278</td><td>missing .</td></tr><tr><td>1105</td><td>5328</td><td>missing .</td></tr><tr><td>1142</td><td>5497</td><td>missing : </td></tr><tr><td>1158</td><td>5573</td><td>missing :</td></tr><tr><td>1201</td><td>5835</td><td>missing : </td></tr><tr><td>1218</td><td>5971</td><td>missing .</td></tr><tr><td>1232</td><td>6062</td><td>missing :</td></tr><tr><td>1233</td><td>6068</td><td>missing :</td></tr><tr><td>1234</td><td>6074</td><td>missing :</td></tr><tr><td>1235</td><td>6080</td><td>missing :</td></tr><tr><td>1286</td><td>6369</td><td>missing .</td></tr><tr><td>1298</td><td>6430</td><td>missing .</td></tr><tr><td>1300</td><td>6444</td><td>missing .</td></tr><tr><td>1301</td><td>6448</td><td>missing : </td></tr><tr><td>1303</td><td>6457</td><td>missing .</td></tr></table></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title>PO File Checker Report</title></head><body><h1>PO File Checker Report</h1><em>124 problems found</em><table border="1"><tr><td>file</td><td>message</td><td>line</td><td>problem</td></tr><tr valign="top"><td rowspan="1">po/es.po</td><td>662</td><td>3328</td><td>missing : </td></tr><tr valign="top"><td rowspan="2">po/fr.po</td><td>662</td><td>3337</td><td>missing : </td></tr><tr><td>669</td><td>3379</td><td>missing : </td></tr><tr valign="top"><td rowspan="66">po/ja.po</td><td>16</td><td>99</td><td>missing .</td></tr><tr><td>150</td><td>788</td><td>missing .</td></tr><tr><td>178</td><td>938</td><td>missing .</td></tr><tr><td>179</td><td>943</td><td>missing .</td></tr><tr><td>180</td><td>948</td><td>missing .</td></tr><tr><td>185</td><td>980</td><td>missing .</td></tr><tr><td>186</td><td>984</td><td>missing .</td></tr><tr><td>205</td><td>1085</td><td>missing .</td></tr><tr><td>206</td><td>1090</td><td>missing .</td></tr><tr><td>250</td><td>1321</td><td>missing .</td></tr><tr><td>251</td><td>1325</td><td>missing .</td></tr><tr><td>278</td><td>1457</td><td>missing .</td></tr><tr><td>409</td><td>2081</td><td>missing .</td></tr><tr><td>443</td><td>2233</td><td>missing .</td></tr><tr><td>480</td><td>2436</td><td>missing .</td></tr><tr><td>487</td><td>2471</td><td>missing .</td></tr><tr><td>589</td><td>2940</td><td>missing :</td></tr><tr><td>618</td><td>3078</td><td>missing .</td></tr><tr><td>632</td><td>3143</td><td>missing :</td></tr><tr><td>648</td><td>3222</td><td>missing .</td></tr><tr><td>661</td><td>3300</td><td>missing .</td></tr><tr><td>662</td><td>3305</td><td>missing : </td></tr><tr><td>809</td><td>3985</td><td>missing : </td></tr><tr><td>813</td><td>4005</td><td>missing : </td></tr><tr><td>866</td><td>4236</td><td>missing .</td></tr><tr><td>869</td><td>4249</td><td>missing : </td></tr><tr><td>876</td><td>4283</td><td>missing .</td></tr><tr><td>883</td><td>4314</td><td>missing .</td></tr><tr><td>884</td><td>4319</td><td>missing .</td></tr><tr><td>886</td><td>4327</td><td>missing .</td></tr><tr><td>902</td><td>4404</td><td>missing :</td></tr><tr><td>921</td><td>4494</td><td>missing .</td></tr><tr><td>925</td><td>4512</td><td>missing :</td></tr><tr><td>932</td><td>4541</td><td>missing .</td></tr><tr><td>934</td><td>4554</td><td>missing .</td></tr><tr><td>935</td><td>4559</td><td>missing .</td></tr><tr><td>940</td><td>4582</td><td>missing :</td></tr><tr><td>943</td><td>4596</td><td>missing .</td></tr><tr><td>945</td><td>4606</td><td>missing .</td></tr><tr><td>946</td><td>4611</td><td>missing .</td></tr><tr><td>950</td><td>4631</td><td>missing :</td></tr><tr><td>954</td><td>4649</td><td>missing .</td></tr><tr><td>955</td><td>4654</td><td>missing .</td></tr><tr><td>963</td><td>4691</td><td>missing .</td></tr><tr><td>968</td><td>4715</td><td>missing .</td></tr><tr><td>971</td><td>4730</td><td>missing .</td></tr><tr><td>998</td><td>4850</td><td>missing : </td></tr><tr><td>1002</td><td>4868</td><td>missing .</td></tr><tr><td>1003</td><td>4873</td><td>missing .</td></tr><tr><td>1008</td><td>4895</td><td>missing : </td></tr><tr><td>1041</td><td>5038</td><td>missing .</td></tr><tr><td>1042</td><td>5043</td><td>missing :</td></tr><tr><td>1156</td><td>5588</td><td>missing .</td></tr><tr><td>1178</td><td>5691</td><td>missing .</td></tr><tr><td>1193</td><td>5756</td><td>missing : </td></tr><tr><td>1212</td><td>5845</td><td>missing :</td></tr><tr><td>1247</td><td>6052</td><td>missing .</td></tr><tr><td>1250</td><td>6071</td><td>missing .</td></tr><tr><td>1255</td><td>6104</td><td>missing : </td></tr><tr><td>1304</td><td>6456</td><td>missing :</td></tr><tr><td>1345</td><td>6661</td><td>missing .</td></tr><tr><td>1372</td><td>6785</td><td>missing :</td></tr><tr><td>1374</td><td>6795</td><td>missing :</td></tr><tr><td>1375</td><td>6800</td><td>missing :</td></tr><tr><td>1390</td><td>6862</td><td>missing .</td></tr><tr><td>1391</td><td>6866</td><td>missing .</td></tr><tr valign="top"><td rowspan="1">po/sv.po</td><td>866</td><td>4148</td><td>missing .</td></tr><tr valign="top"><td rowspan="54">po/zh.po</td><td>45</td><td>228</td><td>missing :</td></tr><tr><td>98</td><td>485</td><td>missing .</td></tr><tr><td>176</td><td>928</td><td>missing .</td></tr><tr><td>180</td><td>948</td><td>missing .</td></tr><tr><td>182</td><td>958</td><td>missing .</td></tr><tr><td>185</td><td>980</td><td>missing .</td></tr><tr><td>202</td><td>1072</td><td>missing .</td></tr><tr><td>202</td><td>1072</td><td>extra \n</td></tr><tr><td>203</td><td>1079</td><td>missing .</td></tr><tr><td>203</td><td>1079</td><td>extra \n</td></tr><tr><td>253</td><td>1347</td><td>missing .</td></tr><tr><td>278</td><td>1475</td><td>missing .</td></tr><tr><td>287</td><td>1516</td><td>missing .</td></tr><tr><td>338</td><td>1769</td><td>missing :</td></tr><tr><td>409</td><td>2089</td><td>missing .</td></tr><tr><td>480</td><td>2443</td><td>missing .</td></tr><tr><td>529</td><td>2669</td><td>missing .</td></tr><tr><td>574</td><td>2872</td><td>missing .</td></tr><tr><td>662</td><td>3315</td><td>missing : </td></tr><tr><td>669</td><td>3357</td><td>missing : </td></tr><tr><td>683</td><td>3420</td><td>missing .</td></tr><tr><td>785</td><td>3880</td><td>missing .</td></tr><tr><td>809</td><td>3999</td><td>missing : </td></tr><tr><td>810</td><td>4004</td><td>missing : </td></tr><tr><td>860</td><td>4224</td><td>missing : </td></tr><tr><td>868</td><td>4259</td><td>missing .</td></tr><tr><td>869</td><td>4264</td><td>missing : </td></tr><tr><td>870</td><td>4269</td><td>missing .</td></tr><tr><td>872</td><td>4280</td><td>missing .</td></tr><tr><td>876</td><td>4299</td><td>missing .</td></tr><tr><td>877</td><td>4304</td><td>missing .</td></tr><tr><td>878</td><td>4309</td><td>missing .</td></tr><tr><td>967</td><td>4728</td><td>missing .</td></tr><tr><td>971</td><td>4747</td><td>missing .</td></tr><tr><td>992</td><td>4837</td><td>missing : </td></tr><tr><td>998</td><td>4864</td><td>missing : </td></tr><tr><td>1008</td><td>4912</td><td>missing : </td></tr><tr><td>1019</td><td>4962</td><td>missing .</td></tr><tr><td>1042</td><td>5066</td><td>missing :</td></tr><tr><td>1147</td><td>5547</td><td>missing .</td></tr><tr><td>1156</td><td>5597</td><td>missing .</td></tr><tr><td>1193</td><td>5767</td><td>missing : </td></tr><tr><td>1212</td><td>5856</td><td>missing :</td></tr><tr><td>1255</td><td>6115</td><td>missing : </td></tr><tr><td>1270</td><td>6238</td><td>missing .</td></tr><tr><td>1285</td><td>6335</td><td>missing :</td></tr><tr><td>1286</td><td>6341</td><td>missing :</td></tr><tr><td>1287</td><td>6347</td><td>missing :</td></tr><tr><td>1288</td><td>6353</td><td>missing :</td></tr><tr><td>1339</td><td>6644</td><td>missing .</td></tr><tr><td>1351</td><td>6705</td><td>missing .</td></tr><tr><td>1353</td><td>6719</td><td>missing .</td></tr><tr><td>1354</td><td>6723</td><td>missing : </td></tr><tr><td>1356</td><td>6732</td><td>missing .</td></tr></table></body></html>
diff -ruN 11p1/locale/README.de.txt 12p3/locale/README.de.txt
--- 11p1/locale/README.de.txt	2003-10-09 23:41:20.000000000 -0500
+++ 12p3/locale/README.de.txt	2006-06-18 06:19:38.000000000 -0500
@@ -1,16 +1,15 @@
-
-Die bersetzungen der englischen Texte des PhpWikis in Deutsche sind
+Die bersetzungen der englischen Texte des PhpWikis ins Deutsche sind
 derzeit und schon lnger nicht mehr aktuell und auf dem Laufenden. Das
 ist vor allem dadurch bedingt, dass die englischen Texte bestndig
 ergnzt, berholt und verndert wurden. brigens sind auch die anderen
 fremdsprachigen Texte gegenber dem englischen Original nicht mehr
-ganz zeitgemss. Die PhpWiki Entwickler freuen sich immer, wenn von
-anderen auch an er sprachlichen Aktualisierung von PhpWiki
+ganz zeitgem. Die PhpWiki-Entwickler freuen sich immer, wenn von
+anderen auch an der sprachlichen Aktualisierung von PhpWiki
 weitergefeilt wird.
 
 Fr diejenigen, die daran mitwirken wollen, sind hier ein paar
 sachdienliche Vorschlge: Bitte laden Sie sich zunchst die neueste
-PhpWiki Version auf Ihren Rechner von:
+PhpWiki-Version auf Ihren Rechner von:
 
 Nightly CVS snapshot:
 http://phpwiki.sf.net/nightly/phpwiki.nightly.tar.gz
@@ -19,7 +18,7 @@
 phpwiki/locale/de/LC_MESSAGES/phpwiki.php direkt nicht editieren
 sollten, sondern vielmehr folgende: phpwiki/locale/po/de.po. Achten
 Sie auch darauf, diese Datei mit ISO-8859-1 abzuspeichern (nicht mit
-Macintosh Charset oder Windows-1252), sonst fehlen die Umlaute und das
+Macintosh-Charset oder Windows-1252), sonst fehlen die Umlaute und das
 nach lterer Schreibweise noch gebruchliche scharfe S bzw. Sz "".
 
 Zunchst wurden die Dateien in LC_MESSAGES automatisch erstellt:
@@ -30,17 +29,16 @@
 make
 
 Wenn Sie Windows benutzen, d.h. nicht Linux noch Unix/Mac OS X, knnen
-Sie auch GNUmake installieren. Eine Installationbeschreibung hierfr
-an dieser Stelle zu liefern wre zu ausfhrlich. In diesem Falle ist
-es fr beide Seiten, fr Sie wie fr mich, vom Aufwand her vermutlich
-einfacher und effektiver, wenn Sie mir Ihre neue
-phpwiki/locale/po/de.po Datei einfach schicken, und ich sie dann
-umsetzen kann. Sie erhalten danach phpwiki.mo und phpwiki.php per Mail
-zurck (was mir ein Freude wre!)
-
-Alle Ihre Korrektur werden dann von mir, sobald ein entsprechender
-Umfang erreicht ist, bei geeigneter Gelegenheit in ihrer Gesamtheit
-ins PhpWiki-CVS (auf Sourceforge) eingesetzt und damit dann fr alle
-PhpWiki Benutzer zugnglich und wirksam.
+Sie auch GNUmake installieren, am besten via cygwin. (Die
+Hauptentwicklung passiert momentan mit cygwin). Eine
+Installationbeschreibung hierfr an dieser Stelle zu liefern wre zu
+ausfhrlich. nderungen bitte an die phpwiki-talk mailingliste
+schicken oder den Bug Tracker eintragen.
+
+Alle Ihre Korrekturen werden dann von einem der Entwickler, sobald ein
+entsprechender Umfang erreicht ist, bei geeigneter Gelegenheit in
+ihrer Gesamtheit ins PhpWiki-CVS (auf Sourceforge) eingesetzt und
+damit dann fr alle PhpWiki-Benutzer zugnglich und wirksam.
 
---CarstenKlapp <carstenklapp@users.sourceforge.net>
+-- CarstenKlapp <carstenklapp@users.sourceforge.net>
+   Reini Urban
\ No newline at end of file
Files 11p1/locale/sv/LC_MESSAGES/phpwiki.mo and 12p3/locale/sv/LC_MESSAGES/phpwiki.mo differ
Files 11p1/locale/zh/LC_MESSAGES/phpwiki.mo and 12p3/locale/zh/LC_MESSAGES/phpwiki.mo differ
diff -ruN 11p1/locale/zh/LC_MESSAGES/phpwiki.php 12p3/locale/zh/LC_MESSAGES/phpwiki.php
--- 11p1/locale/zh/LC_MESSAGES/phpwiki.php	2005-09-18 07:12:31.000000000 -0500
+++ 12p3/locale/zh/LC_MESSAGES/phpwiki.php	2006-06-18 06:19:39.000000000 -0500
@@ -170,8 +170,6 @@
    "拒絕存取: 請先登入才能上傳檔案";
 $locale["ACL"] =
    "ACL";
-$locale["AUTH_GROUP_FILE not defined"] =
-   "AUTH_GROUP_FILE 未定義";
 $locale["Action page"] =
    "動作頁面";
 $locale["Add %s hours to the server's local time when reporting times."] =
@@ -688,8 +686,6 @@
    "JabberPresence";
 $locale["Keep up to %d major edits, but keep them no longer than %d days."] =
    "保持 %d 份主要編輯,但不超過 %d 天.";
-$locale["LDAP_AUTH_HOST not defined"] =
-   "LDAP_AUTH_HOST 未定義";
 $locale["Language"] =
    "語言";
 $locale["Last"] =
@@ -1638,12 +1634,6 @@
    "目前版本";
 $locale["days"] =
    "天";
-$locale["db backend:"] =
-   "db 後台:";
-$locale["db type:"] =
-   "db 型態:";
-$locale["dba handler:"] =
-   "dba handler:";
 $locale["default page permission"] =
    "預設頁面權限";
 $locale["diff"] =
@@ -1652,8 +1642,6 @@
    "比對此頁面";
 $locale["download a zip dump from this wiki"] =
    "從此 wiki 下載 zip dump";
-$locale["download an html zip dump from this wiki"] =
-   "從此 wiki 下載 html zip dump";
 $locale["dump html pages"] =
    "傾印 html 頁面";
 $locale["dump serial pages"] =
@@ -1732,8 +1720,6 @@
    "stddev: %2.3f";
 $locale["the file '%s'"] =
    "檔案 '%s'";
-$locale["timeout:"] =
-   "逾時:";
 $locale["to"] =
    "到";
 $locale["today"] =
diff -ruN 11p1/pgsrc/OldStyleTablePlugin.orig 12p3/pgsrc/OldStyleTablePlugin.orig
--- 11p1/pgsrc/OldStyleTablePlugin.orig	2004-07-04 03:44:08.000000000 -0500
+++ 12p3/pgsrc/OldStyleTablePlugin.orig	1969-12-31 18:00:00.000000000 -0600
@@ -1,75 +0,0 @@
-Date: Sun, 4 Jul 2004 01:31:02 -0700
-Mime-Version: 1.0 (Produced by PhpWiki 1.3.4pre)
-X-Rcs-Id: $Id: OldStyleTablePlugin,v 1.6 2004/07/04 08:44:08 rurban Exp $
-Content-Type: application/x-phpwiki;
-  pagename=OldStyleTablePlugin;
-  flags="";
-  pgsrc_version="2 $Revision: 1.6 $";
-  markup=2;
-  charset=iso-8859-1
-Content-Transfer-Encoding: binary
-
-The OldStyleTablePlugin can be used to include tables within a wiki
-page using the old-style markup syntax for tables.
-
-!!Usage:
-
-<verbatim>
-<?plugin OldStyleTable caption="OldStyleTable" border||=2
-||^  *Name*                |v *Cost*   |v *Notes*
-| *First*     | *Last*
-|> Jeff       |< Dairiki   |^  Cheap   |< Not worth it
-|> Marco      |< Polo      | Cheaper   |< Not available
-?>
-</verbatim>
-
-will get you
-
-<?plugin OldStyleTable caption="OldStyleTable" border||=2
-||^  *Name*                |v *Cost*   |v *Notes*
-| *First*     | *Last*
-|> Jeff       |< Dairiki   |^  Cheap   |< Not worth it
-|> Marco      |< Polo      | Cheaper   |< Not available
-?>
-
-Note that multiple __|__s lead to spanned columns, and __v__s can be
-used to span rows.  A __>__ generates a right justified column, __<__
-a left justified column and __^__ a centered column (which is the
-default.)
-
-!! Plugin Arguments
-
-__caption__:
-
-  Any string. Default: ""
-
-__border__:
-
-  Any number. Default: 1
-
-__cellspacing__:
-
-  Any number. Default: 1
-
-__cellpadding__:
-
-  Any number. Default: 1
-
-__summary__:
-
-  Any string. Default: ""
-
-----
-
-Note that within each table cell, _new-style_ markup is used.  You can
-only use inline markup --- no block level markup is allowed within
-table cells.
-
-(Using old-style markup wouldn't make much sense, since one can't
-include multi-line plugin invocations using the old-style markup
-rules.)
-
-
--------------
-
-PhpWikiDocumentation WikiPlugin
diff -ruN 11p1/pgsrc/PgsrcTranslation%2Fsv 12p3/pgsrc/PgsrcTranslation%2Fsv
--- 11p1/pgsrc/PgsrcTranslation%2Fsv	2005-02-02 13:44:49.000000000 -0600
+++ 12p3/pgsrc/PgsrcTranslation%2Fsv	2006-06-18 06:19:43.000000000 -0500
@@ -1,8 +1,8 @@
-Date: Mon, 17 Jan 2005 08:44:07 +0100
-Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
+Date: Sun, 18 Jun 2006 12:17:37 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.12p3)
 X-Rcs-Id: $Id: PgsrcTranslation%2Fsv,v 1.1 2005/02/02 19:44:49 rurban Exp $
 Content-Type: application/x-phpwiki;
-  pagename=PgsrcTranslation%5Fsv;
+  pagename=PgsrcTranslation%2Fsv;
   pgsrc_version="2 $Revision: 1.1 $";
   flags="";
   markup=2;
diff -ruN 11p1/pgsrc/ReleaseNotes 12p3/pgsrc/ReleaseNotes
--- 11p1/pgsrc/ReleaseNotes	2005-09-18 07:07:25.000000000 -0500
+++ 12p3/pgsrc/ReleaseNotes	2006-06-18 06:19:44.000000000 -0500
@@ -1,5 +1,5 @@
-Date: Sun, 18 Sep 2005 14:06:44 +0100
-Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
+Date: Sun, 18 Jun 2006 12:17:37 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.12p3)
 X-Rcs-Id: $Id: ReleaseNotes,v 1.55 2005/09/18 12:07:25 rurban Exp $
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -9,6 +9,114 @@
   charset=iso-8859-1
 Content-Transfer-Encoding: binary
 
+1.3.12p3 Jun, 18 2006, Reini Urban:
+
+* fix [/Subpage] links
+* fix pref storing of already crypted passwords. bug #1327470 (Tom Harding)
+* fix cache headers on errors (@ob_end_flush issue). (matt brown)
+* fix BogoLogin when ENABLE_PAGEPERM=false. patch #1438392 by Matt Brown
+* unique WIKI_ID cookies per WIKI_NAME. patch #1333957 by Matt Brown
+* added DATABASE_OPTIMISE_FREQUENCY feature. patch #1377011 by Matt Brown
+* don't check lock_table priv on action=upgrade
+* fix _accesslog->logtable and _is_buffering_output warnings (uckelman)
+* do not print wrong length header on url-rewriting. bug #1376007
+* fix pref->set: Error generated when login out. bug #1355533 (Thierry Nabeth)
+* fix default preferences for editheight maxrows, by Manuel Vacelet.
+* fix DBAUTH arguments to be position independent, bug #1358973
+* add PdoDbPassUser user
+* fix output of Homepage prefs update
+* update config-dist.ini format from CVS
+* update configurator.php from CVS
+* print optimize wikidb only when DEBUG
+* simplify messages for translators
+* added ImageTile.php
+* added tsearch2 to doc/INSTALL.pgsql
+* added basepage to Cached_WikiLink::asXML for subpages within CreateTOC
+* print filename on dba access error
+* use bind_textdomain_codeset. bug #1480077 (Kai Krakow)
+* make TextSearchQuery->_stoplist localizable and overridable within config.ini
+* fixes for mysql 5.x wantedpages join
+* add rel=nofollow to more actions. patch by Matt Brown
+* add verify to RevertPage, display reverted page as template
+* update plugin/CalendarList: patches by mpullen and banjo
+* update plugin/GraphViz
+* added plugin/PasswordReset
+* fixed hash() in plugin/RateIt
+* plugin/_AuthInfo: protect File passwords
+* added Captcha to Crao edit template
+* added MacOSX Pdf button
+* fixed Portland and Wordpress editpage template
+* removed Wordpress buttons, transparent default buttons should be used.
+* disabled RelatedChanges button
+
+1.3.12p2 Mar, 7 2006, Reini Urban:
+
+* fix change prefs for File WikiUser
+* fix HomepagePrefs update message
+* remove plugin/Imdb
+* apply PluginToolbarButton fix from cvs
+
+1.3.12p1 Mar, 4 2006, Reini Urban:
+
+* fix "Call-time pass-by-reference" in CreateBib
+* fix parse error in SiteMap.php
+
+1.3.12 Mar, 4 2006, Reini Urban:
+
+Rename function hash() and method final() for php-5.1 compatibility.
+Add various backports from cvs:
+
+fixes:
+* fix ZipReader
+* Fix "Call-time pass-by-reference has been deprecated" errors,
+  allow_call_time_pass_reference = Off
+* fix broken locale update for php-5.1.1
+* default locale fix by Thomas Harding
+* fix Bug #1381464 "Duplicate functions" with php-5.1.1
+* InterWikiMap: allow spaces in paths, even implicitly. fixes bug #1218733
+* fix 'VOID' in TextSearchQuery
+* remove LIMIT 1 in ADODB
+* fix SQL WantedPages
+* fix fulltext search for stoplists
+* fix bug #1327912 numeric pagenames can break plugins (Joachim Lous)
+* fix xmlrpc and tests/unit for !register_long_arrays
+* ensure absolute uploads path
+* fix GoogleMaps syntax error
+* fix ListPages for non-SQL backends. Add top3recs as default only if 
+  ratings are available
+* plugin/PageTrail improved empty cookie
+* plugin/_WikiTranslation: protect against 2x define
+* remove mysql specific ISNULL()
+* fix signout pref error
+* don't log on ACCESS_LOG_SQL < 2
+
+changes:
+* cache EditToolbars
+* beautify SCRIPT lines
+* added cfg-able markups only for default TextTransformation, not 
+  for links and others
+* add a proper Content-Encoding: gzip if compressed, and omit Content-Length then.
+  Trick to send the correct gzipped Content-Length
+* set dsn after SQL/ADODB switches in WikiDB backends for easier unit testing
+* email notifications: better From: header
+* add DBAUTH_PREF_INSERT: self-creating users. by John Stevens
+* improved WikiUser/Ldap error description
+* cache SystemInfo methods
+* VisualWiki: remove INCLUDED from EXCLUDED, includes override excludes.
+* improve postgresql schemas (tsearch2 and stored procedures not yet)
+
+new:
+* added NUM_SPAM_LINKS as config.ini option
+* new ENABLE_SPAMBLOCKLIST, lib/SpamBlocklist.php:
+  check external links against surbl.org and bl.spamcop.net 
+* added Captcha class and better spiral
+* added get_captcha_random_word() contributed by Dan Frankowski
+* dumphtml when not at admin page: dump the current or given page
+* added plugin FileInfo
+* major PhotoAlbum feature enhancements by Thomas Harding: 
+  slides mode, real thumbnails
+* add more backends to the testsuite (PearDB_pgsql, ...)
+
 1.3.11p1 Sep, 18 2005, Reini Urban:
 
 fixes:
diff -ruN 11p1/pgsrc/WikiPlugin 12p3/pgsrc/WikiPlugin
--- 11p1/pgsrc/WikiPlugin	2004-12-06 13:53:23.000000000 -0600
+++ 12p3/pgsrc/WikiPlugin	2006-06-18 06:19:45.000000000 -0500
@@ -1,5 +1,5 @@
-Date: Mon, 6 Dec 2004 02:20:43 -0800
-Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
+Date: Sun, 19 Feb 2006 02:20:43 -0800
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.12)
 X-Rcs-Id: $Id: WikiPlugin,v 1.12 2004/12/06 19:53:23 rurban Exp $
 Content-Type: application/x-phpwiki;
   pagename=WikiPlugin;
@@ -29,7 +29,7 @@
 In this very wiki all actions which are not entirely lowercased
 are implemented using plugins, and some lowercased convenience actions also. (rename, revert, setacl, diff, ...)
 
-(The old-style [MagicPhpWikiURLs] have been replaced by plugins entrirely.)
+(The old-style [MagicPhpWikiURLs] have been replaced by plugins entirely.)
 
 !!!Example
 
diff -ruN 11p1/tests/unit/lib/InlineParserTest.php 12p3/tests/unit/lib/InlineParserTest.php
--- 11p1/tests/unit/lib/InlineParserTest.php	2005-07-24 05:22:53.000000000 -0500
+++ 12p3/tests/unit/lib/InlineParserTest.php	2006-06-18 06:20:05.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: InlineParserTest.php,v 1.7 2005/07/24 10:22:53 rurban Exp $');
+rcs_id('$Id: InlineParserTest.php,v 1.8 2005/11/21 22:16:46 rurban Exp $');
 
 /* Copyright (C) 2004, Dan Frankowski <dfrankow@cs.umn.edu>
  * testLinks: Reini Urban
@@ -83,7 +83,7 @@
             $this->assertEquals($expected, $actual);
         }
     }
-    
+   
 }
 
 // (c-file-style: "gnu")
diff -ruN 11p1/tests/unit/lib/plugin/IncludePageTest.php 12p3/tests/unit/lib/plugin/IncludePageTest.php
--- 11p1/tests/unit/lib/plugin/IncludePageTest.php	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/lib/plugin/IncludePageTest.php	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1,67 @@
+<?php
+
+require_once 'lib/WikiPlugin.php';
+require_once 'lib/plugin/IncludePage.php';
+require_once 'PHPUnit.php';
+
+class IncludePageTest extends phpwiki_TestCase {
+
+    function _ensure_loaded($pagename) {
+        global $request;
+        $dbi = $request->getDbh();
+	if (! $dbi->isWikiPage($pagename)) {
+	    require_once 'lib/loadsave.php';
+
+	    $request->setArg('source', FindFile('pgsrc/'.urlencode($pagename)));
+	    $request->setArg('overwrite', 1);
+	    LoadAny($request, $request->getArg('source'));
+	    $request->setArg('source', false);
+	}
+    }
+
+    // extract Synopsis
+    function testOldTextFormattingRules() {
+        global $request;
+
+	$pagename = 'OldTextFormattingRules';
+    	$this->_ensure_loaded($pagename);
+        $dbi = $request->getDbh();
+        $p = $dbi->getPage($pagename);
+	$r = $p->getCurrentRevision();
+        $c = $r->getContent();
+	$section = extractSection('Synopsis', $c, $pagename, 1);
+	$this->assertTrue(strstr(join("", $section), "OldTextFormattingRules%%%"));
+    }
+
+    // extract Synopsis
+    function testTextFormattingRules() {
+        global $request;
+
+	$pagename = 'TextFormattingRules';
+    	$this->_ensure_loaded($pagename);
+        $dbi = $request->getDbh();
+        $p = $dbi->getPage($pagename);
+	$r = $p->getCurrentRevision();
+        $c = $r->getContent();
+	$section = extractSection('Synopsis', $c, $pagename, 1);
+	$this->assertTrue(strstr(join("", $section), "TextFormattingRules%%%"));
+    }
+
+    /**
+     * Test the plugin with the typical editpage template call.
+     */
+    function testIncludePageSynopsis() {
+        global $request;
+	$pagename = 'TextFormattingRules';
+
+        $lp = new WikiPlugin_IncludePage();
+        $this->assertEquals("IncludePage", $lp->getName());
+        $dbi = $request->getDbh();
+        $result = $lp->run($dbi, "page=$pagename section=Synopsis quiet=1", 
+			   $request, "IncludePage");
+        $this->assertType('object', $result, 'isa HtmlElement');
+	//TODO: check content for found and extracted section
+    }
+}
+
+?>
diff -ruN 11p1/tests/unit/lib/SetupWiki.php 12p3/tests/unit/lib/SetupWiki.php
--- 11p1/tests/unit/lib/SetupWiki.php	2004-12-22 12:33:15.000000000 -0600
+++ 12p3/tests/unit/lib/SetupWiki.php	2006-06-18 06:20:05.000000000 -0500
@@ -14,7 +14,7 @@
         $dbi->purgePage($pagename);
         $this->assertFalse($dbi->isWikiPage($pagename));
 
-        $request->setArg('source', FindFile('pgsrc/'.$pagename));
+        $request->setArg('source', FindFile('pgsrc/'.urlencode($pagename)));
         $request->setArg('overwrite', 1);
         LoadAny($request, $request->getArg('source'));
         $request->setArg('source', false);
diff -ruN 11p1/tests/unit/lib/TextSearchTest.php 12p3/tests/unit/lib/TextSearchTest.php
--- 11p1/tests/unit/lib/TextSearchTest.php	2005-09-11 08:57:16.000000000 -0500
+++ 12p3/tests/unit/lib/TextSearchTest.php	2006-06-18 06:20:05.000000000 -0500
@@ -47,6 +47,10 @@
         $this->assertTrue(in_array("AddCommentPlugin", $result), "found all, no regex");
 
         $query = new TextSearchQuery('WikiPlugin* to let users attach comments*', false); // auto
+	/* => (LOWER(pagename) LIKE 'wikiplugin%' OR content LIKE 'wikiplugin%') AND (LOWER(pagename) LIKE '%to%') AND (LOWER(pagename) LIKE '%let%' OR content LIKE '%let%') AND (LOWER(pagename) LIKE '%users%' OR content LIKE '%users%') AND (LOWER(pagename) LIKE '%attach%' OR content LIKE '%attach%') AND (LOWER(pagename) LIKE 'comments%' OR content LIKE 'comments%')
+	 SELECT page.id AS id, page.pagename AS pagename, page.hits AS hits,page.pagedata as pagedata,version.version AS version, version.mtime AS mtime, version.minor_edit AS minor_edit, version.content AS content, version.versiondata AS versiondata FROM nonempty, page, recent, version WHERE nonempty.id=page.id AND page.id=recent.id AND page.id=version.id AND latestversion=version AND ((LOWER(pagename) LIKE 'wikiplugin%' OR content LIKE 'wikiplugin%') AND (LOWER(pagename) LIKE '%to%') AND (LOWER(pagename) LIKE '%let%' OR content LIKE '%let%') AND (LOWER(pagename) LIKE '%users%' OR content LIKE '%users%') AND (LOWER(pagename) LIKE '%attach%' OR content LIKE '%attach%') AND (LOWER(pagename) LIKE 'comments%' OR content LIKE 'comments%'))
+	 SELECT page.id AS id, page.pagename AS pagename, page.hits AS hits,page.pagedata as pagedata,version.version AS version, version.mtime AS mtime, version.minor_edit AS minor_edit, version.content AS content, version.versiondata AS versiondata FROM nonempty, page, recent, version WHERE nonempty.id=page.id AND page.id=recent.id AND page.id=version.id AND latestversion=version AND ((LOWER(pagename) LIKE 'wikiplugin%' OR content LIKE 'wikiplugin%') AND (1=1) AND (LOWER(pagename) LIKE '%let%' OR content LIKE '%let%') AND (LOWER(pagename) LIKE '%users%' OR content LIKE '%users%') AND (LOWER(pagename) LIKE '%attach%' OR content LIKE '%attach%') AND (LOWER(pagename) LIKE 'comments%' OR content LIKE 'comments%'))
+	 */
         $pages = $dbi->fullSearch($query, $sortby, $limit, $exclude);
         $result = array();
 	while ($page = $pages->next())
diff -ruN 11p1/tests/unit/pgsql-test-initialize.sql 12p3/tests/unit/pgsql-test-initialize.sql
--- 11p1/tests/unit/pgsql-test-initialize.sql	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/pgsql-test-initialize.sql	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1,169 @@
+-- $Id: mysql-test-initialize.sql,v 1.3 2004/12/22 15:05:18 rurban Exp $
+-- for the regression suite
+
+\set prefix 	'test_'
+
+\set page_tbl 		:prefix 'page'
+\set version_tbl 	:prefix 'version'
+\set recent_tbl		:prefix 'recent'
+\set nonempty_tbl	:prefix 'nonempty'
+\set link_tbl 		:prefix 'link'
+\set session_tbl 	:prefix 'session'
+\set pref_tbl 	 	:prefix 'pref'
+--\set user_tbl 	 	:prefix 'users'
+\set member_tbl  	:prefix 'member'
+\set rating_tbl		:prefix 'rating'
+\set accesslog_tbl 	:prefix 'accesslog'
+
+\echo Dropping all test relations
+
+DROP TABLE :page_tbl CASCADE;
+DROP TABLE :version_tbl CASCADE;
+DROP TABLE :recent_tbl CASCADE;
+DROP TABLE :nonempty_tbl CASCADE;
+DROP TABLE :link_tbl CASCADE;
+DROP TABLE :session_tbl CASCADE;
+DROP TABLE :pref_tbl CASCADE;
+DROP TABLE :member_tbl CASCADE;
+DROP TABLE :rating_tbl CASCADE;
+DROP TABLE :accesslog_tbl CASCADE;
+
+------------------------------------------------------------
+
+\echo Creating :page_tbl
+CREATE TABLE :page_tbl (
+	id 		SERIAL PRIMARY KEY,
+        pagename 	VARCHAR(100) NOT NULL UNIQUE CHECK (pagename <> ''),
+	hits 		INT4 NOT NULL DEFAULT 0,
+        pagedata 	TEXT NOT NULL DEFAULT '',
+	cached_html  	bytea DEFAULT ''
+);
+-- CREATE UNIQUE INDEX :page_id_idx ON :page_tbl (id);
+-- CREATE UNIQUE INDEX :page_name_idx ON :page_tbl (pagename);
+
+\echo Creating :version_tbl
+CREATE TABLE :version_tbl (
+	id		INT4 REFERENCES :page_tbl ON DELETE CASCADE,
+        version		INT4 NOT NULL,
+	mtime		INT4 NOT NULL,
+--FIXME: should use boolean, but that returns 't' or 'f'. not 0 or 1. 
+	minor_edit	INT2 DEFAULT 0,
+        content		TEXT NOT NULL DEFAULT '',
+        versiondata	TEXT NOT NULL DEFAULT ''
+);
+CREATE UNIQUE INDEX :vers_id_idx ON :version_tbl (id, version);
+CREATE INDEX :vers_mtime_idx ON :version_tbl (mtime);
+
+\echo Creating :recent_tbl
+CREATE TABLE :recent_tbl (
+	id		INT4 REFERENCES :page_tbl ON DELETE CASCADE,
+	latestversion	INT4,
+	latestmajor	INT4,
+	latestminor	INT4
+);
+CREATE UNIQUE INDEX :recent_id_idx ON :recent_tbl (id);
+
+
+\echo Creating :nonempty_tbl
+CREATE TABLE :nonempty_tbl (
+	id		INT4 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE
+);
+CREATE UNIQUE INDEX :nonmt_id_idx ON :nonempty_tbl (id);
+
+\echo Creating :link_tbl
+CREATE TABLE :link_tbl (
+        linkfrom	INT4 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE,
+        linkto		INT4 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE
+);
+CREATE INDEX :link_from_idx ON :link_tbl (linkfrom);
+CREATE INDEX :link_to_idx   ON :link_tbl (linkto);
+
+-- if you plan to use the wikilens theme
+\echo Creating :rating_tbl
+CREATE TABLE :rating_tbl (
+        dimension INTEGER NOT NULL,
+        raterpage INT8 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE,
+        rateepage INT8 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE,
+        ratingvalue FLOAT NOT NULL,
+        rateeversion INT8 NOT NULL,
+        tstamp TIMESTAMP NOT NULL
+);
+CREATE UNIQUE INDEX :rating_id_idx ON :rating_tbl (dimension, raterpage, rateepage);
+
+--================================================================
+-- end of page relations
+--================================================================
+
+\echo Creating :session_tbl
+CREATE TABLE :session_tbl (
+	sess_id 	CHAR(32) PRIMARY KEY,
+    	sess_data 	bytea NOT NULL,
+    	sess_date 	INT4,
+    	sess_ip 	CHAR(40) NOT NULL
+);
+-- CREATE UNIQUE INDEX :sess_id_idx ON :session_tbl (sess_id);
+CREATE INDEX :sess_date_idx ON :session_tbl (sess_date);
+CREATE INDEX :sess_ip_idx   ON :session_tbl (sess_ip);
+
+-- Optional DB Auth and Prefs
+-- For these tables below the default table prefix must be used 
+-- in the DBAuthParam SQL statements also.
+
+\echo Creating :pref_tbl
+CREATE TABLE :pref_tbl (
+  	userid 	CHAR(48) PRIMARY KEY,
+  	prefs  	TEXT NULL DEFAULT '',
+	passwd  CHAR(48) DEFAULT '',
+	groupname CHAR(48) DEFAULT 'users'
+);
+-- CREATE UNIQUE INDEX :pref_id_idx ON :pref_tbl (userid);
+
+-- Use the member table, if you need it for n:m user-group relations,
+-- and adjust your DBAUTH_AUTH_ SQL statements.
+CREATE TABLE :member_tbl (
+	userid CHAR(48) NOT NULL REFERENCES :pref_tbl ON DELETE CASCADE, 
+	groupname CHAR(48) NOT NULL DEFAULT 'users'
+);
+CREATE INDEX :member_id_idx    ON :member_tbl (userid);
+CREATE INDEX :member_group_idx ON :member_tbl (groupname);
+
+-- if ACCESS_LOG_SQL > 0
+-- only if you need fast log-analysis (spam prevention, recent referrers)
+-- see http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
+\echo Creating :accesslog_tbl
+CREATE TABLE :accesslog_tbl (
+        time_stamp    INT,
+	remote_host   VARCHAR(50),
+	remote_user   VARCHAR(50),
+        request_method VARCHAR(10),
+	request_line  VARCHAR(255),
+	request_args  VARCHAR(255),
+	request_file  VARCHAR(255),
+	request_uri   VARCHAR(255),
+	request_time  CHAR(28),
+	status 	      INT2,
+	bytes_sent    INT4,
+        referer       VARCHAR(255), 
+	agent         VARCHAR(255),
+	request_duration FLOAT
+);
+CREATE INDEX :accesslog_time_idx ON :accesslog_tbl (time_stamp);
+CREATE INDEX :accesslog_host_idx ON :accesslog_tbl (remote_host);
+
+\set httpd_user	'wikiuser'
+
+-- FIXME: vacuum needs table owner rights
+\echo Applying permissions for role :httpd_user
+GRANT SELECT,INSERT,UPDATE,DELETE ON :page_tbl		TO :httpd_user;
+GRANT SELECT,INSERT,UPDATE,DELETE ON :version_tbl	TO :httpd_user;
+GRANT SELECT,INSERT,UPDATE,DELETE ON :recent_tbl	TO :httpd_user;
+GRANT SELECT,INSERT,UPDATE,DELETE ON :nonempty_tbl	TO :httpd_user;
+GRANT SELECT,INSERT,UPDATE,DELETE ON :link_tbl		TO :httpd_user;
+
+GRANT SELECT,INSERT,UPDATE,DELETE ON :session_tbl	TO :httpd_user;
+-- you may want to fine tune this:
+GRANT SELECT,INSERT,UPDATE,DELETE ON :pref_tbl		TO :httpd_user;
+-- GRANT SELECT ON :user_tbl	TO :httpd_user;
+GRANT SELECT ON :member_tbl	TO :httpd_user;
+GRANT SELECT,INSERT,UPDATE,DELETE ON :rating_tbl	TO :httpd_user;
+GRANT SELECT,INSERT,UPDATE,DELETE ON :accesslog_tbl	TO :httpd_user;
diff -ruN 11p1/tests/unit/runme_all 12p3/tests/unit/runme_all
--- 11p1/tests/unit/runme_all	2004-11-21 05:21:07.000000000 -0600
+++ 12p3/tests/unit/runme_all	2006-06-18 06:20:06.000000000 -0500
@@ -1,10 +1,16 @@
 #!/bin/sh
-# TODO: need to check write perms to the .testbox/* (mixed web/cli perms)
 
+# check write perms to the .testbox/* (mixed web/cli perms)
 chmod -R a+rw .testbox .dumphtml
 if [ -d .testbox/page_data -a ! -w .testbox/page_data/AllPages ]; then
   rm -rf .testbox/*
 fi
-for db in file dba SQL ADODB; do
-    php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | tee all_$db.result
+
+for db in file dba SQL ADODB cvs \
+    PearDB_mysql PearDB_pgsql PearDB_sqlite \
+    ADODB_mysql ADODB_postgres7 ADODB_sqlite
+    PDO_mysql PDO_pgsql PDO_sqlite
+do
+    php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | \
+	tee all_$db.result
 done
diff -ruN 11p1/tests/unit/runme_basic 12p3/tests/unit/runme_basic
--- 11p1/tests/unit/runme_basic	2004-10-20 08:10:58.000000000 -0500
+++ 12p3/tests/unit/runme_basic	2006-06-18 06:20:06.000000000 -0500
@@ -1,4 +1,6 @@
 #!/bin/sh
 # run load/save with dba only, without memory trace (debug=9).
 # this should catch most of existing errors, and needs only one external file.
+mkdir .testbox .dumphtml
+chmod -R a+rw .testbox .dumphtml
 php -Cq -d register_argc_argv=1 test.php test=SetupWiki test=DumpHtml db=dba level=10 debug=1
diff -ruN 11p1/tests/unit/runme_pgsql 12p3/tests/unit/runme_pgsql
--- 11p1/tests/unit/runme_pgsql	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/runme_pgsql	2006-06-18 06:20:06.000000000 -0500
@@ -0,0 +1,13 @@
+#!/bin/sh
+# init:
+# psql -U wikiuser phpwiki < pgsql-test-initialize.sql
+
+# need to check write perms to the .testbox/* (mixed web/cli perms)
+chmod -R a+rw .dumphtml
+if [ -d .dumphtml -a ! -w .dumphtml/AllPages.html ]; then
+  rm -rf .dumphtml/*
+fi
+# TODO: if php>5 add PDO
+for db in PearDB_pgsql ADODB_postgres7; do
+    php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | tee all_$db.result
+done
diff -ruN 11p1/tests/unit/runme_sql 12p3/tests/unit/runme_sql
--- 11p1/tests/unit/runme_sql	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/runme_sql	2006-06-18 06:20:06.000000000 -0500
@@ -0,0 +1,23 @@
+#!/bin/sh
+# need to check write perms to the .testbox/* (mixed web/cli perms)
+
+chmod -R a+rw .dumphtml
+if [ -d .dumphtml -a ! -w .dumphtml/AllPages.html ]; then
+  rm -rf .dumphtml/*
+fi
+# TODO: if php>5 add PDO
+# TODO: oracle (free download now)
+for db in PearDB_sqlite PearDB_mysql ADODB_sqlite ADODB_mysql; do
+    php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | tee all_$db.result
+done
+
+echo "Ready for postgresql ?"
+read
+
+rcmysql stop
+pg_ctl start
+for db in PearDB_pgsql ADODB_postgres7; do
+    php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | tee all_$db.result
+done
+pg_ctl stop
+rcmysql start
diff -ruN 11p1/tests/unit/.testbox/latest_ver/latest_versions 12p3/tests/unit/.testbox/latest_ver/latest_versions
--- 11p1/tests/unit/.testbox/latest_ver/latest_versions	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/latest_ver/latest_versions	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:128:{s:16:"AddCommentPlugin";i:1;s:11:"AddingPages";i:1;s:8:"AllPages";i:1;s:19:"AllPagesCreatedByMe";i:1;s:22:"AllPagesLastEditedByMe";i:1;s:17:"AllPagesOwnedByMe";i:1;s:8:"AllUsers";i:1;s:25:"AnalyseAccessLogSqlPlugin";i:1;s:10:"AppendText";i:1;s:16:"AppendTextPlugin";i:1;s:19:"AuthorHistoryPlugin";i:1;s:9:"BackLinks";i:1;s:18:"CalendarListPlugin";i:1;s:14:"CalendarPlugin";i:1;s:16:"CategoryCategory";i:1;s:13:"CategoryGroup";i:1;s:17:"CategoryHomePages";i:1;s:13:"CommentPlugin";i:1;s:10:"CreatePage";i:1;s:16:"CreatePagePlugin";i:1;s:15:"CreateTocPlugin";i:1;s:9:"DebugInfo";i:1;s:12:"EditMetaData";i:1;s:18:"EditMetaDataPlugin";i:1;s:8:"EditText";i:1;s:20:"ExternalSearchPlugin";i:1;s:8:"FindPage";i:1;s:16:"FoafViewerPlugin";i:1;s:18:"FrameIncludePlugin";i:1;s:17:"FullRecentChanges";i:1;s:14:"FullTextSearch";i:1;s:10:"FuzzyPages";i:1;s:9:"GoodStyle";i:1;s:10:"GoogleLink";i:1;s:16:"HelloWorldPlugin";i:1;s:13:"HomePageAlias";i:1;s:12:"HowToUseWiki";i:1;s:17:"IncludePagePlugin";i:1;s:9:"InterWiki";i:1;s:12:"InterWikiMap";i:1;s:15:"InterWikiSearch";i:1;s:9:"LikePages";i:1;s:12:"LinkDatabase";i:1;s:9:"LinkIcons";i:1;s:15:"ListPagesPlugin";i:1;s:16:"MagicPhpWikiURLs";i:1;s:13:"ModeratedPage";i:1;s:18:"MoreAboutMechanics";i:1;s:11:"MostPopular";i:1;s:17:"NewMarkupTestPage";i:1;s:17:"OldMarkupTestPage";i:1;s:19:"OldStyleTablePlugin";i:1;s:22:"OldTextFormattingRules";i:1;s:13:"OrphanedPages";i:1;s:8:"PageDump";i:1;s:13:"PageGroupTest";i:1;s:17:"PageGroupTestFour";i:1;s:16:"PageGroupTestOne";i:1;s:18:"PageGroupTestThree";i:1;s:16:"PageGroupTestTwo";i:1;s:11:"PageHistory";i:1;s:8:"PageInfo";i:1;s:15:"PagePermissions";i:1;s:16:"PgsrcTranslation";i:1;s:19:"PgsrcTranslation/de";i:1;s:19:"PgsrcTranslation/es";i:1;s:19:"PgsrcTranslation/fr";i:1;s:19:"PgsrcTranslation/it";i:1;s:19:"PgsrcTranslation/ja";i:1;s:19:"PgsrcTranslation/nl";i:1;s:19:"PgsrcTranslation_sv";i:1;s:19:"PgsrcTranslation/zh";i:1;s:16:"PhotoAlbumPlugin";i:1;s:18:"PhpHighlightPlugin";i:1;s:16:"PhpWeatherPlugin";i:1;s:7:"PhpWiki";i:1;s:21:"PhpWikiAdministration";i:1;s:27:"PhpWikiAdministration/Chmod";i:1;s:27:"PhpWikiAdministration/Chown";i:1;s:28:"PhpWikiAdministration/Remove";i:1;s:28:"PhpWikiAdministration/Rename";i:1;s:29:"PhpWikiAdministration/Replace";i:1;s:28:"PhpWikiAdministration/SetAcl";i:1;s:20:"PhpWikiDocumentation";i:1;s:11:"PhpWikiPoll";i:1;s:20:"PhpWikiRecentChanges";i:1;s:14:"PloticusPlugin";i:1;s:13:"PluginManager";i:1;s:14:"ProjectSummary";i:1;s:10:"RandomPage";i:1;s:6:"RateIt";i:1;s:13:"RawHtmlPlugin";i:1;s:13:"RecentChanges";i:1;s:14:"RecentComments";i:1;s:11:"RecentEdits";i:1;s:14:"RecentReleases";i:1;s:14:"RecentVisitors";i:1;s:16:"RedirectToPlugin";i:1;s:14:"RelatedChanges";i:1;s:12:"ReleaseNotes";i:1;s:15:"RichTablePlugin";i:1;s:13:"RssFeedPlugin";i:1;s:7:"SandBox";i:1;s:15:"SearchHighlight";i:1;s:21:"SearchHighlightPlugin";i:1;s:14:"SteveWainstead";i:1;s:23:"SyntaxHighlighterPlugin";i:1;s:16:"SystemInfoPlugin";i:1;s:15:"TemplateExample";i:1;s:14:"TemplatePlugin";i:1;s:13:"TeX2pngPlugin";i:1;s:19:"TextFormattingRules";i:1;s:11:"TitleSearch";i:1;s:16:"TranscludePlugin";i:1;s:13:"TranslateText";i:1;s:20:"UnfoldSubpagesPlugin";i:1;s:6:"UpLoad";i:1;s:12:"UpLoadPlugin";i:1;s:15:"UserPreferences";i:1;s:8:"WabiSabi";i:1;s:11:"WantedPages";i:1;s:11:"WhoIsOnline";i:1;s:15:"WikiAdminSelect";i:1;s:14:"WikiBlogPlugin";i:1;s:10:"WikiPlugin";i:1;s:11:"WikiWikiWeb";i:1;s:9:"_AuthInfo";i:1;s:8:"HomePage";i:1;}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AddCommentPlugin 12p3/tests/unit/.testbox/links/AddCommentPlugin
--- 11p1/tests/unit/.testbox/links/AddCommentPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AddCommentPlugin	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:10:"WikiPlugin";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AddingPages 12p3/tests/unit/.testbox/links/AddingPages
--- 11p1/tests/unit/.testbox/links/AddingPages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AddingPages	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:6:{i:0;s:26:"StringThemTogetherLikeThis";i:1;s:15:"square brackets";i:2;s:20:"ClickTheQuestionMark";i:3;s:7:"PhpWiki";i:4;s:19:"TextFormattingRules";i:5;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AllPages 12p3/tests/unit/.testbox/links/AllPages
--- 11p1/tests/unit/.testbox/links/AllPages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AllPages	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:13:"OrphanedPages";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AllPagesCreatedByMe 12p3/tests/unit/.testbox/links/AllPagesCreatedByMe
--- 11p1/tests/unit/.testbox/links/AllPagesCreatedByMe	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AllPagesCreatedByMe	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AllPagesLastEditedByMe 12p3/tests/unit/.testbox/links/AllPagesLastEditedByMe
--- 11p1/tests/unit/.testbox/links/AllPagesLastEditedByMe	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AllPagesLastEditedByMe	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AllPagesOwnedByMe 12p3/tests/unit/.testbox/links/AllPagesOwnedByMe
--- 11p1/tests/unit/.testbox/links/AllPagesOwnedByMe	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AllPagesOwnedByMe	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AllUsers 12p3/tests/unit/.testbox/links/AllUsers
--- 11p1/tests/unit/.testbox/links/AllUsers	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AllUsers	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:15:"UserPreferences";i:1;s:10:"WikiPlugin";i:2;s:13:"PluginManager";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AnalyseAccessLogSqlPlugin 12p3/tests/unit/.testbox/links/AnalyseAccessLogSqlPlugin
--- 11p1/tests/unit/.testbox/links/AnalyseAccessLogSqlPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AnalyseAccessLogSqlPlugin	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:19:"AnalyseAccessLogSql";i:2;s:7:"PhpWiki";i:4;s:20:"PhpWikiDocumentation";i:5;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AppendText 12p3/tests/unit/.testbox/links/AppendText
--- 11p1/tests/unit/.testbox/links/AppendText	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AppendText	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AppendTextPlugin 12p3/tests/unit/.testbox/links/AppendTextPlugin
--- 11p1/tests/unit/.testbox/links/AppendTextPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AppendTextPlugin	2006-06-18 06:19:50.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:10:"AppendText";i:1;s:10:"WikiPlugin";i:2;s:16:"AddCommentPlugin";i:3;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/_AuthInfo 12p3/tests/unit/.testbox/links/_AuthInfo
--- 11p1/tests/unit/.testbox/links/_AuthInfo	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/_AuthInfo	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/AuthorHistoryPlugin 12p3/tests/unit/.testbox/links/AuthorHistoryPlugin
--- 11p1/tests/unit/.testbox/links/AuthorHistoryPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/AuthorHistoryPlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:20:"PhpWikiDocumentation";i:1;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/BackLinks 12p3/tests/unit/.testbox/links/BackLinks
--- 11p1/tests/unit/.testbox/links/BackLinks	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/BackLinks	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:9:"BackLinks";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CalendarListPlugin 12p3/tests/unit/.testbox/links/CalendarListPlugin
--- 11p1/tests/unit/.testbox/links/CalendarListPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CalendarListPlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:18:"CalendarListPlugin";i:1;s:14:"CalendarPlugin";i:2;s:20:"PhpWikiDocumentation";i:3;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CalendarPlugin 12p3/tests/unit/.testbox/links/CalendarPlugin
--- 11p1/tests/unit/.testbox/links/CalendarPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CalendarPlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:8:{i:0;s:14:"CalendarPlugin";i:1;s:12:"PersonalWiki";i:2;s:10:"GaryBenson";i:3;s:10:"WikiPlugin";i:4;s:11:"JeffDairiki";i:6;s:7:"PhpWiki";i:7;s:10:"screenshot";i:8;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CategoryCategory 12p3/tests/unit/.testbox/links/CategoryCategory
--- 11p1/tests/unit/.testbox/links/CategoryCategory	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CategoryCategory	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CategoryGroup 12p3/tests/unit/.testbox/links/CategoryGroup
--- 11p1/tests/unit/.testbox/links/CategoryGroup	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CategoryGroup	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:14:"Administrators";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CategoryHomePages 12p3/tests/unit/.testbox/links/CategoryHomePages
--- 11p1/tests/unit/.testbox/links/CategoryHomePages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CategoryHomePages	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:16:"CategoryCategory";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CommentPlugin 12p3/tests/unit/.testbox/links/CommentPlugin
--- 11p1/tests/unit/.testbox/links/CommentPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CommentPlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:13:"CommentPlugin";i:1;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CreatePage 12p3/tests/unit/.testbox/links/CreatePage
--- 11p1/tests/unit/.testbox/links/CreatePage	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CreatePage	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CreatePagePlugin 12p3/tests/unit/.testbox/links/CreatePagePlugin
--- 11p1/tests/unit/.testbox/links/CreatePagePlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CreatePagePlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:10:"WikiPlugin";i:1;s:9:"WikiTheme";i:2;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/CreateTocPlugin 12p3/tests/unit/.testbox/links/CreateTocPlugin
--- 11p1/tests/unit/.testbox/links/CreateTocPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/CreateTocPlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:10:"WikiPlugin";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/DebugInfo 12p3/tests/unit/.testbox/links/DebugInfo
--- 11p1/tests/unit/.testbox/links/DebugInfo	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/DebugInfo	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/EditMetaData 12p3/tests/unit/.testbox/links/EditMetaData
--- 11p1/tests/unit/.testbox/links/EditMetaData	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/EditMetaData	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/EditMetaDataPlugin 12p3/tests/unit/.testbox/links/EditMetaDataPlugin
--- 11p1/tests/unit/.testbox/links/EditMetaDataPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/EditMetaDataPlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:20:"PhpWikiDocumentation";i:1;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/EditText 12p3/tests/unit/.testbox/links/EditText
--- 11p1/tests/unit/.testbox/links/EditText	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/EditText	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:8:"EditText";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/ExternalSearchPlugin 12p3/tests/unit/.testbox/links/ExternalSearchPlugin
--- 11p1/tests/unit/.testbox/links/ExternalSearchPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/ExternalSearchPlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:6:{i:0;s:20:"ExternalSearchPlugin";i:1;s:9:"InterWiki";i:2;s:12:"InterWikiMap";i:4;s:7:"PhpWiki";i:5;s:20:"PhpWikiDocumentation";i:6;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/FindPage 12p3/tests/unit/.testbox/links/FindPage
--- 11p1/tests/unit/.testbox/links/FindPage	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/FindPage	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:12:"HowToUseWiki";i:1;s:13:"RecentChanges";i:2;s:18:"MoreAboutMechanics";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/FoafViewerPlugin 12p3/tests/unit/.testbox/links/FoafViewerPlugin
--- 11p1/tests/unit/.testbox/links/FoafViewerPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/FoafViewerPlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:16:"FoafViewerPlugin";i:1;s:20:"PhpWikiDocumentation";i:2;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/FrameIncludePlugin 12p3/tests/unit/.testbox/links/FrameIncludePlugin
--- 11p1/tests/unit/.testbox/links/FrameIncludePlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/FrameIncludePlugin	2006-06-18 06:19:51.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:17:"IncludePagePlugin";i:1;s:20:"PhpWikiDocumentation";i:2;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/FullRecentChanges 12p3/tests/unit/.testbox/links/FullRecentChanges
--- 11p1/tests/unit/.testbox/links/FullRecentChanges	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/FullRecentChanges	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:13:"RecentChanges";i:1;s:11:"RecentEdits";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/FullTextSearch 12p3/tests/unit/.testbox/links/FullTextSearch
--- 11p1/tests/unit/.testbox/links/FullTextSearch	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/FullTextSearch	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:8:"FindPage";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/FuzzyPages 12p3/tests/unit/.testbox/links/FuzzyPages
--- 11p1/tests/unit/.testbox/links/FuzzyPages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/FuzzyPages	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:8:"FindPage";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/GoodStyle 12p3/tests/unit/.testbox/links/GoodStyle
--- 11p1/tests/unit/.testbox/links/GoodStyle	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/GoodStyle	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:8:"WabiSabi";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/GoogleLink 12p3/tests/unit/.testbox/links/GoogleLink
--- 11p1/tests/unit/.testbox/links/GoogleLink	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/GoogleLink	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:10:"GoogleLink";i:1;s:15:"UserPreferences";i:2;s:1:"G";i:3;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/HelloWorldPlugin 12p3/tests/unit/.testbox/links/HelloWorldPlugin
--- 11p1/tests/unit/.testbox/links/HelloWorldPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/HelloWorldPlugin	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";i:2;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/HomePage 12p3/tests/unit/.testbox/links/HomePage
--- 11p1/tests/unit/.testbox/links/HomePage	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/HomePage	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:11:{i:0;s:11:"WikiWikiWeb";i:1;s:12:"HowToUseWiki";i:2;s:11:"AddingPages";i:3;s:7:"SandBox";i:4;s:14:"RecentVisitors";i:5;s:13:"RecentChanges";i:6;s:11:"MostPopular";i:7;s:12:"ReleaseNotes";i:8;s:14:"RecentReleases";i:9;s:21:"PhpWikiAdministration";i:10;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/HomePageAlias 12p3/tests/unit/.testbox/links/HomePageAlias
--- 11p1/tests/unit/.testbox/links/HomePageAlias	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/HomePageAlias	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:16:"RedirectToPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/HowToUseWiki 12p3/tests/unit/.testbox/links/HowToUseWiki
--- 11p1/tests/unit/.testbox/links/HowToUseWiki	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/HowToUseWiki	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:7:{i:0;s:27:"SteveWainsteadEatsLiveWorms";i:1;s:22:"ThisPageShouldNotExist";i:2;s:11:"AddingPages";i:3;s:11:"WikiWikiWeb";i:4;s:19:"TextFormattingRules";i:5;s:15:"UserPreferences";i:6;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/IncludePagePlugin 12p3/tests/unit/.testbox/links/IncludePagePlugin
--- 11p1/tests/unit/.testbox/links/IncludePagePlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/IncludePagePlugin	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:5:{i:0;s:18:"FrameIncludePlugin";i:1;s:8:"HomePage";i:2;s:8:"WabiSabi";i:3;s:20:"PhpWikiDocumentation";i:4;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/InterWiki 12p3/tests/unit/.testbox/links/InterWiki
--- 11p1/tests/unit/.testbox/links/InterWiki	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/InterWiki	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:5:{i:0;s:9:"InterWiki";i:1;s:12:"InterWikiMap";i:3;s:7:"PhpWiki";i:7;s:16:"CategoryCategory";i:10;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/InterWikiMap 12p3/tests/unit/.testbox/links/InterWikiMap
--- 11p1/tests/unit/.testbox/links/InterWikiMap	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/InterWikiMap	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:133:{i:0;s:9:"InterWiki";i:1;s:6:"AIWiki";i:2;s:5:"ALife";i:3;s:10:"AbbeNormal";i:4;s:8:"AcadWiki";i:5;s:7:"Acronym";i:6;s:8:"Advogato";i:7;s:10:"Annotation";i:8;s:14:"AnnotationWiki";i:9;s:8:"AviSynth";i:10;s:13:"AwarenessWiki";i:11;s:10:"BcWireless";i:12;s:12:"BenefitsWiki";i:13;s:11:"BridgesWiki";i:14;s:7:"bsdWiki";i:15;s:6:"C2find";i:16;s:5:"CLiki";i:17;s:5:"Cache";i:18;s:8:"Category";i:19;s:6:"CmWiki";i:20;s:15:"CreationMatters";i:21;s:4:"CPAN";i:22;s:11:"DeWikiPedia";i:23;s:8:"DejaNews";i:24;s:4:"Dict";i:25;s:10:"Dictionary";i:26;s:11:"DiveIntoOsx";i:27;s:7:"DocBook";i:28;s:11:"DolphinWiki";i:29;s:7:"DseWiki";i:30;s:12:"EfnetCeeWiki";i:31;s:12:"EfnetCppWiki";i:32;s:15:"EfnetPythonWiki";i:33;s:12:"EfnetXmlWiki";i:34;s:7:"EljWiki";i:35;s:9:"EmacsWiki";i:36;s:11:"EoWikiPedia";i:37;s:11:"FinalEmpire";i:38;s:6:"Foldoc";i:39;s:7:"FoxWiki";i:40;s:11:"FrWikiPedia";i:41;s:10:"FreeBSDman";i:42;s:12:"FreeNetworks";i:43;s:9:"FreshMeat";i:44;s:7:"Froogle";i:45;s:6:"Google";i:46;s:12:"GoogleGroups";i:47;s:11:"GreenCheese";i:48;s:11:"HammondWiki";i:49;s:8:"Haribeau";i:50;s:6:"IAWiki";i:51;s:4:"IMDB";i:52;s:4:"ISBN";i:53;s:5:"IfDef";i:54;s:3:"JTF";i:55;s:10:"JargonFile";i:56;s:8:"JiniWiki";i:57;s:7:"JspWiki";i:58;s:6:"KmWiki";i:59;s:7:"KnowHow";i:60;s:11:"LanifexWiki";i:61;s:8:"LegoWiki";i:62;s:9:"LinuxWiki";i:63;s:5:"LugKR";i:64;s:7:"MACCAWS";i:65;s:13:"MathSongsWiki";i:66;s:6:"MbTest";i:67;s:8:"MeatBall";i:68;s:8:"MetaWiki";i:69;s:13:"MetaWikiPedia";i:70;s:8:"MoinMoin";i:71;s:10:"MoinMaster";i:72;s:5:"MuWeb";i:73;s:10:"NetVillage";i:74;s:8:"OpenWiki";i:75;s:11:"OrgPatterns";i:76;s:3:"PPR";i:77;s:14:"PangalacticOrg";i:78;s:13:"PersonalTelco";i:79;s:12:"php-function";i:80;s:10:"php-lookup";i:81;s:7:"PhpWiki";i:82;s:10:"PhpWikiCvs";i:83;s:11:"PhpWikiDemo";i:84;s:11:"PhpWikiTest";i:85;s:5:"Pikie";i:86;s:11:"PlWikiPedia";i:87;s:13:"PolitizenWiki";i:88;s:11:"PoundPython";i:89;s:7:"PurlNet";i:90;s:6:"PyWiki";i:91;s:10:"PythonInfo";i:92;s:10:"PythonWiki";i:93;s:3:"RFC";i:94;s:14:"RussellFreedom";i:95;s:7:"SVGWiki";i:96;s:6:"SeaPig";i:97;s:15:"SeattleWireless";i:98;s:14:"SenseisLibrary";i:99;s:6:"Shakti";i:100;s:11:"SourceForge";i:101;s:6:"Squeak";i:102;s:10:"StrikiWiki";i:103;s:6:"TMwiki";i:104;s:5:"TWiki";i:105;s:4:"Tavi";i:106;s:9:"Thesaurus";i:107;s:6:"Thinki";i:108;s:5:"TmNet";i:109;s:6:"Unreal";i:110;s:6:"UseMod";i:111;s:11:"VisualWorks";i:112;s:9:"WakkaWiki";i:113;s:12:"WebDevWikiNL";i:114;s:12:"WebSeitzWiki";i:115;s:3:"Why";i:116;s:10:"Wiktionary";i:117;s:4:"Wiki";i:118;s:8:"WikiLens";i:119;s:16:"WikiWikiWireless";i:120;s:9:"Wikibooks";i:121;s:9:"WikiPedia";i:122;s:9:"Wikiquote";i:123;s:10:"Wikisource";i:124;s:9:"WikiWorld";i:125;s:14:"WikkiTikkiTavi";i:126;s:4:"WLUG";i:127;s:11:"YpsiEyeball";i:128;s:5:"ZWiki";i:129;s:6:"OsFaq2";i:130;s:6:"Upload";i:131;s:4:"User";i:132;s:4:"Talk";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/InterWikiSearch 12p3/tests/unit/.testbox/links/InterWikiSearch
--- 11p1/tests/unit/.testbox/links/InterWikiSearch	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/InterWikiSearch	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:12:"InterWikiMap";i:1;s:20:"ExternalSearchPlugin";i:2;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/LikePages 12p3/tests/unit/.testbox/links/LikePages
--- 11p1/tests/unit/.testbox/links/LikePages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/LikePages	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:9:"LikePages";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/LinkDatabase 12p3/tests/unit/.testbox/links/LinkDatabase
--- 11p1/tests/unit/.testbox/links/LinkDatabase	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/LinkDatabase	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/LinkIcons 12p3/tests/unit/.testbox/links/LinkIcons
--- 11p1/tests/unit/.testbox/links/LinkIcons	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/LinkIcons	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:9:"LinkIcons";i:1;s:7:"PhpWiki";i:2;s:9:"InterWiki";i:9;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/ListPagesPlugin 12p3/tests/unit/.testbox/links/ListPagesPlugin
--- 11p1/tests/unit/.testbox/links/ListPagesPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/ListPagesPlugin	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:15:"ListPagesPlugin";i:1;s:20:"PhpWikiDocumentation";i:2;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/MagicPhpWikiURLs 12p3/tests/unit/.testbox/links/MagicPhpWikiURLs
--- 11p1/tests/unit/.testbox/links/MagicPhpWikiURLs	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/MagicPhpWikiURLs	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:5:{i:0;s:7:"PhpWiki";i:1;s:14:"FullTextSearch";i:2;s:11:"TitleSearch";i:3;s:7:"SandBox";i:4;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/ModeratedPage 12p3/tests/unit/.testbox/links/ModeratedPage
--- 11p1/tests/unit/.testbox/links/ModeratedPage	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/ModeratedPage	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:13:"ModeratedPage";i:4;s:15:"UserPreferences";i:11;s:20:"PhpWikiDocumentation";i:12;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/MoreAboutMechanics 12p3/tests/unit/.testbox/links/MoreAboutMechanics
--- 11p1/tests/unit/.testbox/links/MoreAboutMechanics	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/MoreAboutMechanics	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:6:{i:0;s:7:"PhpWiki";i:2;s:11:"WikiWikiWeb";i:4;s:11:"AddingPages";i:5;s:8:"WabiSabi";i:7;s:20:"PhpWikiDocumentation";i:8;s:12:"CategoryWiki";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/MostPopular 12p3/tests/unit/.testbox/links/MostPopular
--- 11p1/tests/unit/.testbox/links/MostPopular	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/MostPopular	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/NewMarkupTestPage 12p3/tests/unit/.testbox/links/NewMarkupTestPage
--- 11p1/tests/unit/.testbox/links/NewMarkupTestPage	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/NewMarkupTestPage	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:9:{i:0;s:8:"HomePage";i:3;s:24:"javascript:alert('oops')";i:4;s:5:"[Link";i:5;s:4:"Link";i:8;s:3:"%%%";i:9;s:14:"[not linked to";i:10;s:11:"NotLinkedTo";i:11;s:8:"WikiName";i:12;s:16:"WikiNameSameStem";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/OldMarkupTestPage 12p3/tests/unit/.testbox/links/OldMarkupTestPage
--- 11p1/tests/unit/.testbox/links/OldMarkupTestPage	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/OldMarkupTestPage	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:9:{i:0;s:8:"HomePage";i:3;s:24:"javascript:alert('oops')";i:4;s:5:"[Link";i:5;s:4:"Link";i:8;s:3:"%%%";i:9;s:14:"[not linked to";i:10;s:11:"NotLinkedTo";i:11;s:8:"WikiName";i:12;s:16:"WikiNameSameStem";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/OldStyleTablePlugin 12p3/tests/unit/.testbox/links/OldStyleTablePlugin
--- 11p1/tests/unit/.testbox/links/OldStyleTablePlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/OldStyleTablePlugin	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:19:"OldStyleTablePlugin";i:1;s:20:"PhpWikiDocumentation";i:2;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/OldTextFormattingRules 12p3/tests/unit/.testbox/links/OldTextFormattingRules
--- 11p1/tests/unit/.testbox/links/OldTextFormattingRules	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/OldTextFormattingRules	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:8:{i:0;s:22:"OldTextFormattingRules";i:1;s:19:"this is a page link";i:2;s:14:"UsingWikiWords";i:3;s:8:"HomePage";i:6;s:19:"TextFormatingsRules";i:7;s:19:"OldStyleTablePlugin";i:8;s:16:"MagicPhpWikiURLs";i:10;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/OrphanedPages 12p3/tests/unit/.testbox/links/OrphanedPages
--- 11p1/tests/unit/.testbox/links/OrphanedPages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/OrphanedPages	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:13:"OrphanedPages";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PageDump 12p3/tests/unit/.testbox/links/PageDump
--- 11p1/tests/unit/.testbox/links/PageDump	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PageDump	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:21:"PhpWikiAdministration";i:1;s:11:"TitleSearch";i:2;s:13:"PluginManager";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PageGroupTest 12p3/tests/unit/.testbox/links/PageGroupTest
--- 11p1/tests/unit/.testbox/links/PageGroupTest	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PageGroupTest	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:5:{i:0;s:13:"PageGroupTest";i:1;s:16:"PageGroupTestOne";i:2;s:16:"PageGroupTestTwo";i:3;s:18:"PageGroupTestThree";i:4;s:17:"PageGroupTestFour";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PageGroupTestFour 12p3/tests/unit/.testbox/links/PageGroupTestFour
--- 11p1/tests/unit/.testbox/links/PageGroupTestFour	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PageGroupTestFour	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:16:"PageGroupTestOne";i:1;s:13:"PageGroupTest";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PageGroupTestOne 12p3/tests/unit/.testbox/links/PageGroupTestOne
--- 11p1/tests/unit/.testbox/links/PageGroupTestOne	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PageGroupTestOne	2006-06-18 06:19:52.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:13:"PageGroupTest";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PageGroupTestThree 12p3/tests/unit/.testbox/links/PageGroupTestThree
--- 11p1/tests/unit/.testbox/links/PageGroupTestThree	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PageGroupTestThree	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PageGroupTestTwo 12p3/tests/unit/.testbox/links/PageGroupTestTwo
--- 11p1/tests/unit/.testbox/links/PageGroupTestTwo	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PageGroupTestTwo	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:9:"BackLinks";i:1;s:13:"PageGroupTest";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PageHistory 12p3/tests/unit/.testbox/links/PageHistory
--- 11p1/tests/unit/.testbox/links/PageHistory	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PageHistory	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PageInfo 12p3/tests/unit/.testbox/links/PageInfo
--- 11p1/tests/unit/.testbox/links/PageInfo	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PageInfo	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PagePermissions 12p3/tests/unit/.testbox/links/PagePermissions
--- 11p1/tests/unit/.testbox/links/PagePermissions	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PagePermissions	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:7:{i:0;s:7:"PhpWiki";i:1;s:9:"WikiGroup";i:2;s:4:"ToDo";i:4;s:8:"PageList";i:5;s:11:"ActionPages";i:7;s:8:"AllPages";i:8;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation 12p3/tests/unit/.testbox/links/PgsrcTranslation
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:21:{i:0;s:7:"PhpWiki";i:1;s:19:"ConvertTabsToSpaces";i:2;s:28:"KonvertiereLeerzeichenZuTabs";i:3;s:23:"ConvierteEspaciosEnTabs";i:4;s:21:"ConvertirTabEnEspaces";i:5;s:21:"ConvertiGliSpaziInTab";i:6;s:22:"VertaalSpatiesNaarTabs";i:7;s:30:"KonverteraMellanslagTillTabbar";i:8;s:6:"KBrown";i:9;s:16:"MagicPhpWikiURLs";i:10;s:9:"BacASable";i:11;s:18:"URLMagiquesPhpWiki";i:13;s:16:"ToverPhpWikiURLs";i:14;s:7:"Accueil";i:15;s:8:"Framsida";i:16;s:9:"Gstboken";i:17;s:9:"Sandldan";i:18;s:22:"Textformateringsregler";i:20;s:10:"Historique";i:21;s:4:"Info";i:22;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fde 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fde
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fde	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fde	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fes 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fes
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fes	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fes	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Ffr 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Ffr
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Ffr	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Ffr	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fit 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fit
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fit	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fit	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fja 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fja
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fja	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fja	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fnl 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fnl
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fnl	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fnl	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fzh 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fzh
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation%2Fzh	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation%2Fzh	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PgsrcTranslation_sv 12p3/tests/unit/.testbox/links/PgsrcTranslation_sv
--- 11p1/tests/unit/.testbox/links/PgsrcTranslation_sv	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PgsrcTranslation_sv	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhotoAlbumPlugin 12p3/tests/unit/.testbox/links/PhotoAlbumPlugin
--- 11p1/tests/unit/.testbox/links/PhotoAlbumPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhotoAlbumPlugin	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:20:"PhpWikiDocumentation";i:1;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpHighlightPlugin 12p3/tests/unit/.testbox/links/PhpHighlightPlugin
--- 11p1/tests/unit/.testbox/links/PhpHighlightPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpHighlightPlugin	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:18:"PhpHighlightPlugin";i:1;s:23:"SyntaxHighlighterPlugin";i:2;s:20:"PhpWikiDocumentation";i:3;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWeatherPlugin 12p3/tests/unit/.testbox/links/PhpWeatherPlugin
--- 11p1/tests/unit/.testbox/links/PhpWeatherPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWeatherPlugin	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:10:"WikiPlugin";i:1;s:10:"PhpWeather";i:2;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWiki 12p3/tests/unit/.testbox/links/PhpWiki
--- 11p1/tests/unit/.testbox/links/PhpWiki	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWiki	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:7:"PhpWiki";i:2;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiAdministration 12p3/tests/unit/.testbox/links/PhpWikiAdministration
--- 11p1/tests/unit/.testbox/links/PhpWikiAdministration	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiAdministration	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:10:{i:0;s:7:"PhpWiki";i:1;s:28:"PhpWikiAdministration/Remove";i:2;s:28:"PhpWikiAdministration/Rename";i:3;s:29:"PhpWikiAdministration/Replace";i:4;s:28:"PhpWikiAdministration/SetAcl";i:5;s:27:"PhpWikiAdministration/Chmod";i:6;s:27:"PhpWikiAdministration/Chown";i:7;s:7:"SandBox";i:10;s:8:"HomePage";i:11;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FChmod 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FChmod
--- 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FChmod	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FChmod	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FChown 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FChown
--- 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FChown	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FChown	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FRemove 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FRemove
--- 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FRemove	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FRemove	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FRename 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FRename
--- 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FRename	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FRename	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FReplace 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FReplace
--- 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FReplace	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FReplace	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FSetAcl 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FSetAcl
--- 11p1/tests/unit/.testbox/links/PhpWikiAdministration%2FSetAcl	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiAdministration%2FSetAcl	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiDocumentation 12p3/tests/unit/.testbox/links/PhpWikiDocumentation
--- 11p1/tests/unit/.testbox/links/PhpWikiDocumentation	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiDocumentation	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiPoll 12p3/tests/unit/.testbox/links/PhpWikiPoll
--- 11p1/tests/unit/.testbox/links/PhpWikiPoll	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiPoll	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PhpWikiRecentChanges 12p3/tests/unit/.testbox/links/PhpWikiRecentChanges
--- 11p1/tests/unit/.testbox/links/PhpWikiRecentChanges	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PhpWikiRecentChanges	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PloticusPlugin 12p3/tests/unit/.testbox/links/PloticusPlugin
--- 11p1/tests/unit/.testbox/links/PloticusPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PloticusPlugin	2006-06-18 06:19:53.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/PluginManager 12p3/tests/unit/.testbox/links/PluginManager
--- 11p1/tests/unit/.testbox/links/PluginManager	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/PluginManager	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:21:{i:0;s:7:"PhpWiki";i:1;s:10:"WikiPlugin";i:2;s:16:"HelloWorldPlugin";i:4;s:14:"TexToPngPlugin";i:5;s:14:"GraphVizPlugin";i:6;s:16:"VisualWikiPlugin";i:7;s:14:"PloticusPlugin";i:8;s:16:"PhpWeatherPlugin";i:9;s:23:"SyntaxHighlighterPlugin";i:10;s:16:"TranscludePlugin";i:11;s:11:"WhoIsOnline";i:12;s:14:"ProjectSummary";i:13;s:14:"RecentReleases";i:14;s:10:"HtmlParser";i:15;s:10:"ImportHtml";i:16;s:15:"HtmlAreaEditing";i:17;s:23:"PageChangeNotifications";i:18;s:13:"ModeratedPage";i:19;s:12:"GooglePlugin";i:20;s:6:"RateIt";i:21;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/ProjectSummary 12p3/tests/unit/.testbox/links/ProjectSummary
--- 11p1/tests/unit/.testbox/links/ProjectSummary	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/ProjectSummary	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RandomPage 12p3/tests/unit/.testbox/links/RandomPage
--- 11p1/tests/unit/.testbox/links/RandomPage	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RandomPage	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RateIt 12p3/tests/unit/.testbox/links/RateIt
--- 11p1/tests/unit/.testbox/links/RateIt	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RateIt	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RawHtmlPlugin 12p3/tests/unit/.testbox/links/RawHtmlPlugin
--- 11p1/tests/unit/.testbox/links/RawHtmlPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RawHtmlPlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:20:"PhpWikiDocumentation";i:1;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RecentChanges 12p3/tests/unit/.testbox/links/RecentChanges
--- 11p1/tests/unit/.testbox/links/RecentChanges	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RecentChanges	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:11:"RecentEdits";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RecentComments 12p3/tests/unit/.testbox/links/RecentComments
--- 11p1/tests/unit/.testbox/links/RecentComments	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RecentComments	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RecentEdits 12p3/tests/unit/.testbox/links/RecentEdits
--- 11p1/tests/unit/.testbox/links/RecentEdits	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RecentEdits	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:13:"RecentChanges";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RecentReleases 12p3/tests/unit/.testbox/links/RecentReleases
--- 11p1/tests/unit/.testbox/links/RecentReleases	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RecentReleases	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RecentVisitors 12p3/tests/unit/.testbox/links/RecentVisitors
--- 11p1/tests/unit/.testbox/links/RecentVisitors	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RecentVisitors	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RedirectToPlugin 12p3/tests/unit/.testbox/links/RedirectToPlugin
--- 11p1/tests/unit/.testbox/links/RedirectToPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RedirectToPlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:16:"RedirectToPlugin";i:2;s:8:"HomePage";i:3;s:13:"HomePageAlias";i:4;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RelatedChanges 12p3/tests/unit/.testbox/links/RelatedChanges
--- 11p1/tests/unit/.testbox/links/RelatedChanges	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RelatedChanges	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/ReleaseNotes 12p3/tests/unit/.testbox/links/ReleaseNotes
--- 11p1/tests/unit/.testbox/links/ReleaseNotes	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/ReleaseNotes	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:150:{i:0;s:20:"ReleaseNotes/Subpage";i:1;s:9:"BogoLogin";i:2;s:13:"PdoDbPassUser";i:3;s:9:"ImageTile";i:4;s:8:"WikiLink";i:5;s:15:"TextSearchQuery";i:6;s:10:"RevertPage";i:7;s:12:"CalendarList";i:8;s:8:"GraphViz";i:9;s:13:"PasswordReset";i:10;s:6:"RateIt";i:11;s:8:"AuthInfo";i:12;s:14:"RelatedChanges";i:13;s:8:"WikiUser";i:14;s:13:"HomepagePrefs";i:15;s:19:"PluginToolbarButton";i:16;s:9:"CreateBib";i:17;s:7:"SiteMap";i:18;s:9:"ZipReader";i:19;s:12:"InterWikiMap";i:21;s:11:"WantedPages";i:22;s:10:"GoogleMaps";i:23;s:9:"ListPages";i:24;s:9:"PageTrail";i:25;s:15:"WikiTranslation";i:26;s:12:"EditToolbars";i:27;s:18:"TextTransformation";i:29;s:10:"SystemInfo";i:30;s:10:"VisualWiki";i:31;s:13:"SpamBlocklist";i:32;s:8:"FileInfo";i:33;s:10:"PhotoAlbum";i:34;s:20:"OldStyleTablesPlugin";i:35;s:14:"OldStyleTables";i:36;s:15:"WikiAdminSelect";i:37;s:9:"OldMarkup";i:38;s:7:"PhpWiki";i:39;s:8:"PageList";i:40;s:9:"WikiGroup";i:41;s:13:"PluginManager";i:42;s:14:"ArchiveCleaner";i:43;s:13:"RssFeedPlugin";i:44;s:13:"TranslateText";i:46;s:12:"UpLoadPlugin";i:47;s:15:"CreateTocPlugin";i:49;s:15:"UserPreferences";i:50;s:12:"GooglePlugin";i:51;s:16:"AddCommentPlugin";i:53;s:14:"WikiAdminUtils";i:54;s:10:"FileFinder";i:55;s:8:"WikiLens";i:56;s:20:"ExternalSearchPlugin";i:58;s:8:"PageDump";i:59;s:10:"ViewSource";i:62;s:9:"SqlResult";i:63;s:22:"OldTextFormattingRules";i:64;s:21:"PhpWikiAdministration";i:65;s:13:"RecentChanges";i:67;s:9:"DbSession";i:70;s:11:"AddCategory";i:71;s:9:"AddPlugin";i:73;s:10:"PluginName";i:74;s:12:"IncludePages";i:75;s:16:"CreatePagePlugin";i:79;s:8:"WikiSpam";i:80;s:12:"SpamAssassin";i:81;s:16:"WikiPluginCached";i:82;s:17:"SyntaxHighlighter";i:83;s:14:"PloticusPlugin";i:85;s:9:"WikiAdmin";i:86;s:8:"AllPages";i:87;s:19:"AllPagesCreatedByMe";i:88;s:22:"AllPagesLastEditedByMe";i:89;s:17:"AllPagesOwnedByMe";i:90;s:15:"SearchHighlight";i:91;s:10:"LiveSearch";i:92;s:13:"OverWrite All";i:93;s:16:"Load & OverWrite";i:95;s:22:"PageChangeNotification";i:96;s:16:"AppendTextPlugin";i:99;s:34:"Purge all empty unreferenced pages";i:100;s:19:"Convert cached_html";i:101;s:13:"ModeratedPage";i:102;s:21:"] old markup [Convert";i:103;s:12:"LinkDatabase";i:104;s:9:"AsciiMath";i:105;s:25:"AnalyseAccessLogSqlPlugin";i:106;s:14:"TemplatePlugin";i:108;s:13:"WhichDatabase";i:111;s:11:"MostPopular";i:113;s:14:"WikiNameRegexp";i:114;s:11:"TitleSearch";i:116;s:9:"FrontPage";i:118;s:9:"RichTable";i:119;s:10:"PrettyWiki";i:120;s:15:"WikiAdminRemove";i:124;s:9:"PageGroup";i:125;s:5:"links";i:126;s:10:"HttpClient";i:127;s:7:"RssFeed";i:128;s:9:"CreateToc";i:130;s:12:"ReleaseNotes";i:132;s:8:"WikiName";i:134;s:12:"InlineParser";i:135;s:13:"PopularNearby";i:137;s:10:"GoogleLink";i:138;s:1:"G";i:146;s:6:"UpLoad";i:148;s:10:"DbPassUser";i:149;s:4:"GoTo";i:151;s:11:"WikiUserNew";i:152;s:11:"WhoIsOnline";i:154;s:15:"PagePermissions";i:155;s:15:"WikiAdminRename";i:156;s:22:"WikiAdminSearchReplace";i:157;s:15:"WikiAdminSetAcl";i:158;s:8:"WikiPoll";i:161;s:10:"AddComment";i:164;s:7:"NoCache";i:166;s:10:"NathanGass";i:167;s:14:"IncludeSiteMap";i:169;s:10:"CreatePage";i:172;s:9:"InterWiki";i:175;s:17:"EmailVerification";i:178;s:13:"OldStyleTable";i:180;s:9:"PdfOutput";i:183;s:11:"BlockParser";i:184;s:14:"UnfoldSubpages";i:185;s:12:"EditMetaData";i:186;s:13:"MichaelVanDam";i:187;s:18:"UserFileManagement";i:188;s:16:"UserRegistration";i:189;s:8:"PageType";i:190;s:15:"InterWikiSearch";i:192;s:8:"WikiBlog";i:194;s:12:"PersonalPage";i:198;s:8:"AllUsers";i:200;s:10:"RedirectTo";i:204;s:8:"TexToPng";i:205;s:10:"PhpWeather";i:206;s:8:"PrevNext";i:207;s:11:"IncludePage";i:208;s:12:"FrameInclude";i:211;s:10:"WikiPlugin";i:216;s:16:"MagicPhpWikiURLs";i:223;s:18:"new linking scheme";i:226;s:11:"WikiWikiWeb";i:227;s:8:"EditCopy";i:230;s:14:"SteveWainstead";i:231;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RichTablePlugin 12p3/tests/unit/.testbox/links/RichTablePlugin
--- 11p1/tests/unit/.testbox/links/RichTablePlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RichTablePlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:15:"RichTablePlugin";i:1;s:19:"OldStyleTablePlugin";i:2;s:20:"PhpWikiDocumentation";i:3;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/RssFeedPlugin 12p3/tests/unit/.testbox/links/RssFeedPlugin
--- 11p1/tests/unit/.testbox/links/RssFeedPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/RssFeedPlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:10:"WikiPlugin";i:1;s:10:"PhpWikiRss";i:2;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/SandBox 12p3/tests/unit/.testbox/links/SandBox
--- 11p1/tests/unit/.testbox/links/SandBox	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/SandBox	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/SearchHighlight 12p3/tests/unit/.testbox/links/SearchHighlight
--- 11p1/tests/unit/.testbox/links/SearchHighlight	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/SearchHighlight	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/SearchHighlightPlugin 12p3/tests/unit/.testbox/links/SearchHighlightPlugin
--- 11p1/tests/unit/.testbox/links/SearchHighlightPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/SearchHighlightPlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:15:"SearchHighLight";i:1;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/SteveWainstead 12p3/tests/unit/.testbox/links/SteveWainstead
--- 11p1/tests/unit/.testbox/links/SteveWainstead	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/SteveWainstead	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:11:"WikiWikiWeb";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/SyntaxHighlighterPlugin 12p3/tests/unit/.testbox/links/SyntaxHighlighterPlugin
--- 11p1/tests/unit/.testbox/links/SyntaxHighlighterPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/SyntaxHighlighterPlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:20:"PhpWikiDocumentation";i:1;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/SystemInfoPlugin 12p3/tests/unit/.testbox/links/SystemInfoPlugin
--- 11p1/tests/unit/.testbox/links/SystemInfoPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/SystemInfoPlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:16:"SystemInfoPlugin";i:1;s:7:"PhpWiki";i:2;s:20:"PhpWikiDocumentation";i:3;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/TemplateExample 12p3/tests/unit/.testbox/links/TemplateExample
--- 11p1/tests/unit/.testbox/links/TemplateExample	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/TemplateExample	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/TemplatePlugin 12p3/tests/unit/.testbox/links/TemplatePlugin
--- 11p1/tests/unit/.testbox/links/TemplatePlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/TemplatePlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:6:{i:0;s:10:"CreatePage";i:1;s:12:"InlineParser";i:2;s:15:"TemplateExample";i:4;s:9:"TestTitle";i:5;s:20:"PhpWikiDocumentation";i:6;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/TeX2pngPlugin 12p3/tests/unit/.testbox/links/TeX2pngPlugin
--- 11p1/tests/unit/.testbox/links/TeX2pngPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/TeX2pngPlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:10:"WikiPlugin";i:1;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/TextFormattingRules 12p3/tests/unit/.testbox/links/TextFormattingRules
--- 11p1/tests/unit/.testbox/links/TextFormattingRules	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/TextFormattingRules	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:11:{i:0;s:19:"TextFormattingRules";i:2;s:13:"RawHtmlPlugin";i:3;s:9:"WikiLinks";i:4;s:19:"this is a page link";i:5;s:14:"UsingWikiWords";i:6;s:8:"HomePage";i:8;s:19:"OldStyleTablePlugin";i:9;s:16:"MagicPhpWikiURLs";i:10;s:10:"WikiPlugin";i:11;s:13:"PluginManager";i:12;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/TitleSearch 12p3/tests/unit/.testbox/links/TitleSearch
--- 11p1/tests/unit/.testbox/links/TitleSearch	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/TitleSearch	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:8:"FindPage";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/TranscludePlugin 12p3/tests/unit/.testbox/links/TranscludePlugin
--- 11p1/tests/unit/.testbox/links/TranscludePlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/TranscludePlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:2:{i:0;s:16:"TranscludePlugin";i:1;s:10:"JavaScript";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/TranslateText 12p3/tests/unit/.testbox/links/TranslateText
--- 11p1/tests/unit/.testbox/links/TranslateText	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/TranslateText	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/UnfoldSubpagesPlugin 12p3/tests/unit/.testbox/links/UnfoldSubpagesPlugin
--- 11p1/tests/unit/.testbox/links/UnfoldSubpagesPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/UnfoldSubpagesPlugin	2006-06-18 06:19:54.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:10:"WikiPlugin";i:1;s:14:"WikiBlogPlugin";i:2;s:14:"CalendarPlugin";i:3;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/UpLoad 12p3/tests/unit/.testbox/links/UpLoad
--- 11p1/tests/unit/.testbox/links/UpLoad	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/UpLoad	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/UpLoadPlugin 12p3/tests/unit/.testbox/links/UpLoadPlugin
--- 11p1/tests/unit/.testbox/links/UpLoadPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/UpLoadPlugin	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:4:{i:0;s:6:"UpLoad";i:1;s:10:"WikiPlugin";i:2;s:12:"InterWikiMap";i:3;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/UserPreferences 12p3/tests/unit/.testbox/links/UserPreferences
--- 11p1/tests/unit/.testbox/links/UserPreferences	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/UserPreferences	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/WabiSabi 12p3/tests/unit/.testbox/links/WabiSabi
--- 11p1/tests/unit/.testbox/links/WabiSabi	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/WabiSabi	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:1:{i:0;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/WantedPages 12p3/tests/unit/.testbox/links/WantedPages
--- 11p1/tests/unit/.testbox/links/WantedPages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/WantedPages	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/WhoIsOnline 12p3/tests/unit/.testbox/links/WhoIsOnline
--- 11p1/tests/unit/.testbox/links/WhoIsOnline	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/WhoIsOnline	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/WikiAdminSelect 12p3/tests/unit/.testbox/links/WikiAdminSelect
--- 11p1/tests/unit/.testbox/links/WikiAdminSelect	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/WikiAdminSelect	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:0:{}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/WikiBlogPlugin 12p3/tests/unit/.testbox/links/WikiBlogPlugin
--- 11p1/tests/unit/.testbox/links/WikiBlogPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/WikiBlogPlugin	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:3:{i:0;s:13:"RecentChanges";i:1;s:20:"PhpWikiDocumentation";i:2;s:10:"WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/WikiPlugin 12p3/tests/unit/.testbox/links/WikiPlugin
--- 11p1/tests/unit/.testbox/links/WikiPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/WikiPlugin	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:15:{i:0;s:7:"PhpWiki";i:2;s:13:"PluginManager";i:3;s:16:"HelloWorldPlugin";i:5;s:10:"WikiPlugin";i:7;s:16:"MagicPhpWikiURLs";i:8;s:9:"BackLinks";i:12;s:13:"RecentChanges";i:13;s:11:"RecentEdits";i:14;s:11:"MostPopular";i:15;s:12:"LeastPopular";i:16;s:8:"AllPages";i:17;s:19:"AllPagesCreatedByMe";i:18;s:22:"AllPagesLastEditedByMe";i:19;s:17:"AllPagesOwnedByMe";i:21;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/links/WikiWikiWeb 12p3/tests/unit/.testbox/links/WikiWikiWeb
--- 11p1/tests/unit/.testbox/links/WikiWikiWeb	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/links/WikiWikiWeb	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:9:{i:0;s:11:"WikiWikiWeb";i:1;s:8:"EditText";i:2;s:8:"FindPage";i:3;s:8:"WabiSabi";i:4;s:14:"RecentVisitors";i:5;s:12:"HowToUseWiki";i:6;s:11:"AddingPages";i:7;s:14:"SteveWainstead";i:8;s:20:"PhpWikiDocumentation";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/AddCommentPlugin and 12p3/tests/unit/.testbox/page_data/AddCommentPlugin differ
Files 11p1/tests/unit/.testbox/page_data/AddingPages and 12p3/tests/unit/.testbox/page_data/AddingPages differ
diff -ruN 11p1/tests/unit/.testbox/page_data/AllPages 12p3/tests/unit/.testbox/page_data/AllPages
--- 11p1/tests/unit/.testbox/page_data/AllPages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/AllPages	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1,4 @@
+a:3:{s:4:"date";i:1068942342;s:8:"pagename";s:8:"AllPages";s:12:"_cached_html";s:311:"xUAO0
++g7nqҬ6[8y	E
;&(! xZk̞QxToN1+nei@_PUl6R@~dӪ#(#Cx7ߺs/RK5н
+;
Bie/-H{%ap0%U)!ωYbNZܢO#aB
+:RHsLן(0J<T_Oc
ÛCK)+NphajuzMWJyzd1xN[@q";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/page_data/AllPagesCreatedByMe 12p3/tests/unit/.testbox/page_data/AllPagesCreatedByMe
--- 11p1/tests/unit/.testbox/page_data/AllPagesCreatedByMe	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/AllPagesCreatedByMe	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1,2 @@
+a:3:{s:4:"date";i:1087141086;s:8:"pagename";s:19:"AllPagesCreatedByMe";s:12:"_cached_html";s:285:"xEAO0
++'ܮpƁBUfEH&ۨwU(?fw(b/mظGQF򠉃ע\av˭Nuso9ǀe	eOƼs^z-nQl6R&yZ)(a!.uϽHێ7h΋`(DpHנ&eX0-\n$.v|nDIݼ@txے%wd,S(yA1=9j3";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/page_data/AllPagesLastEditedByMe 12p3/tests/unit/.testbox/page_data/AllPagesLastEditedByMe
--- 11p1/tests/unit/.testbox/page_data/AllPagesLastEditedByMe	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/AllPagesLastEditedByMe	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1087141086;s:8:"pagename";s:22:"AllPagesLastEditedByMe";s:12:"_cached_html";s:292:"xE=O0w~,4B%Mli,mnKTsRX,ߏ%7( mڨiQ+Q,1EFO}<L	\ˠE,C`]Ë%}_;gQ4&4Osl#C?Yԛ^ʵQ{u({0-@$Cd6nyэ$ʙ.D1YMڛF[mw`"	EX08W:Xb*͸$rF-i=";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/page_data/AllPagesOwnedByMe 12p3/tests/unit/.testbox/page_data/AllPagesOwnedByMe
--- 11p1/tests/unit/.testbox/page_data/AllPagesOwnedByMe	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/AllPagesOwnedByMe	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1,3 @@
+a:3:{s:4:"date";i:1087141086;s:8:"pagename";s:17:"AllPagesOwnedByMe";s:12:"_cached_html";s:276:"xEN0w	ڤB%M*B\c[UywΩ
+}cr"T	7xȋ2LD-Ź՗:sk<<HO_'xP<.+k 2-
+AVG~+E.wAM{G`jc&;-\4 {9jFO7W"SptUGu*2:(1R\F%ۏOK	iQfs<<rAF<΁";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/page_data/AllUsers 12p3/tests/unit/.testbox/page_data/AllUsers
--- 11p1/tests/unit/.testbox/page_data/AllUsers	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/AllUsers	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1100870856;s:8:"pagename";s:8:"AllUsers";s:12:"_cached_html";s:396:"xڍ?o0w>sUH9TݺTt:"UcGVs:Dݻ3l"zi5U>1raZ9f(ZYS/vCY@ޡx2-B9F1kyv3AQTzďoYoʥ!ѭEL@`tV M	A#*QBXm*j<ؐv&HCAOb1KC`PO4L1BhAF0$ .m9(ry>iޚM[dCSEfc/S<])O(.N2׷TF(޹څ:&IG2ܜG_3'</>Q";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/AnalyseAccessLogSqlPlugin and 12p3/tests/unit/.testbox/page_data/AnalyseAccessLogSqlPlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/AppendText 12p3/tests/unit/.testbox/page_data/AppendText
--- 11p1/tests/unit/.testbox/page_data/AppendText	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/AppendText	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1,3 @@
+a:3:{s:4:"date";i:1101390961;s:8:"pagename";s:10:"AppendText";s:12:"_cached_html";s:203:"xEAN0E"8B-%'}:C:jpڔVUΘ
+Xӟwh@BzO<ddB[|Lvfn2_r;W$<+w@6A1r
+~jrRz䎬Ǧy<q%H8eM(cտ@~L#A-~򡵋QmU{ ,Z";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/AppendTextPlugin and 12p3/tests/unit/.testbox/page_data/AppendTextPlugin differ
Files 11p1/tests/unit/.testbox/page_data/_AuthInfo and 12p3/tests/unit/.testbox/page_data/_AuthInfo differ
Files 11p1/tests/unit/.testbox/page_data/AuthorHistoryPlugin and 12p3/tests/unit/.testbox/page_data/AuthorHistoryPlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/BackLinks 12p3/tests/unit/.testbox/page_data/BackLinks
--- 11p1/tests/unit/.testbox/page_data/BackLinks	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/BackLinks	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1,2 @@
+a:3:{s:4:"date";i:1012170535;s:8:"pagename";s:9:"BackLinks";s:12:"_cached_html";s:418:"xڭOo0-vˀEc"Jr!wiOwnşuQ?N^cئ=QZfRo_@.SԟY3Eʱb+Cw	]RGO]31>j_[v]|o-yZ߀:#bZhR%
!o&9$Ui'.3wSH
D8.4`OOl;aΐus3ej)d}5[L Q,}7ɑ{Egʊ~3
+jƷ; 7ۈ]'98ߢ1p\t6_WӬ)/8tYtm~\TV!g|#PԻ</y9s^z";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/CalendarListPlugin and 12p3/tests/unit/.testbox/page_data/CalendarListPlugin differ
Files 11p1/tests/unit/.testbox/page_data/CalendarPlugin and 12p3/tests/unit/.testbox/page_data/CalendarPlugin differ
Files 11p1/tests/unit/.testbox/page_data/CategoryCategory and 12p3/tests/unit/.testbox/page_data/CategoryCategory differ
Files 11p1/tests/unit/.testbox/page_data/CategoryGroup and 12p3/tests/unit/.testbox/page_data/CategoryGroup differ
diff -ruN 11p1/tests/unit/.testbox/page_data/CategoryHomePages 12p3/tests/unit/.testbox/page_data/CategoryHomePages
--- 11p1/tests/unit/.testbox/page_data/CategoryHomePages	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/CategoryHomePages	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1029880402;s:8:"pagename";s:17:"CategoryHomePages";s:12:"_cached_html";s:283:"xUAn0E9@!.tLac[Iw8$i<~ހFPH~ae^|ёfnR:H~ow`eGE*9`$X<Ad5JIv`qUuaթ!Ml*hqeR-EHWTcnje'Y*&8|{dm-Efon4ޛnLBKeXA>^Bz0_cͰU2[ZXrIB{";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/CommentPlugin and 12p3/tests/unit/.testbox/page_data/CommentPlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/CreatePage 12p3/tests/unit/.testbox/page_data/CreatePage
--- 11p1/tests/unit/.testbox/page_data/CreatePage	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/CreatePage	2006-06-18 06:19:55.000000000 -0500
@@ -0,0 +1,2 @@
+a:3:{s:4:"date";i:1077376248;s:8:"pagename";s:10:"CreatePage";s:12:"_cached_html";s:202:"xEAn@E"H&BE@o	$L)xwX,H>ȗX-xZNs+'yr9ަ+8`9oT>`)7a9sWrVǦDpCӊE=I
+ԃeol[=L#Q-hqPIQ*RNZ/";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/CreatePagePlugin and 12p3/tests/unit/.testbox/page_data/CreatePagePlugin differ
Files 11p1/tests/unit/.testbox/page_data/CreateTocPlugin and 12p3/tests/unit/.testbox/page_data/CreateTocPlugin differ
Files 11p1/tests/unit/.testbox/page_data/DebugInfo and 12p3/tests/unit/.testbox/page_data/DebugInfo differ
Files 11p1/tests/unit/.testbox/page_data/EditMetaData and 12p3/tests/unit/.testbox/page_data/EditMetaData differ
Files 11p1/tests/unit/.testbox/page_data/EditMetaDataPlugin and 12p3/tests/unit/.testbox/page_data/EditMetaDataPlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/EditText 12p3/tests/unit/.testbox/page_data/EditText
--- 11p1/tests/unit/.testbox/page_data/EditText	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/EditText	2006-06-18 06:19:56.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1012170535;s:8:"pagename";s:8:"EditText";s:12:"_cached_html";s:343:"xڥQj0+OۥmҎJl0;j46۵+vJ$=?Ehe?m*!#VHdKLQ8X),/	oҗ+e@
iO_$(AGC[nP5ANOu
q:(r<VihoA=l@d(}(4U4`ߖJ{6 Ig( 4AiC@^bn%'+Ӭ<56?hT|Q[OQDW]Sڽ3٪ݖ#ygsM8b$s\UUk8?c";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/ExternalSearchPlugin and 12p3/tests/unit/.testbox/page_data/ExternalSearchPlugin differ
Files 11p1/tests/unit/.testbox/page_data/FindPage and 12p3/tests/unit/.testbox/page_data/FindPage differ
Files 11p1/tests/unit/.testbox/page_data/FoafViewerPlugin and 12p3/tests/unit/.testbox/page_data/FoafViewerPlugin differ
Files 11p1/tests/unit/.testbox/page_data/FrameIncludePlugin and 12p3/tests/unit/.testbox/page_data/FrameIncludePlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/FullRecentChanges 12p3/tests/unit/.testbox/page_data/FullRecentChanges
--- 11p1/tests/unit/.testbox/page_data/FullRecentChanges	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/FullRecentChanges	2006-06-18 06:19:56.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1012170535;s:8:"pagename";s:17:"FullRecentChanges";s:12:"_cached_html";s:438:"xڭRn0)]nY=-v+=@JVKiyv6(E~Cx$EhK׬u P<lk-2HQ
n5kowc~BRv=7~p6PULRd%>Aa3qbȳXhR-jҍ4[(ZXg!Tu64*[;FإЂ<%Qekݠ}29FtrJy4rGP"onYүGCjHi8-4ς"]LU֯^V5{,iD$6ZOP=HKY1-7`pj_^f)=I,mGi4At=.c[	YO®]rYneRc||g&|cYdt*";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/FullTextSearch and 12p3/tests/unit/.testbox/page_data/FullTextSearch differ
Files 11p1/tests/unit/.testbox/page_data/FuzzyPages and 12p3/tests/unit/.testbox/page_data/FuzzyPages differ
diff -ruN 11p1/tests/unit/.testbox/page_data/global_data 12p3/tests/unit/.testbox/page_data/global_data
--- 11p1/tests/unit/.testbox/page_data/global_data	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/global_data	2006-06-18 06:19:56.000000000 -0500
@@ -0,0 +1 @@
+a:2:{s:8:"__global";a:1:{s:10:"_timestamp";a:2:{i:0;i:1150625928;i:1;i:128;}}s:8:"pagename";s:11:"global_data";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/GoodStyle and 12p3/tests/unit/.testbox/page_data/GoodStyle differ
Files 11p1/tests/unit/.testbox/page_data/GoogleLink and 12p3/tests/unit/.testbox/page_data/GoogleLink differ
Files 11p1/tests/unit/.testbox/page_data/HelloWorldPlugin and 12p3/tests/unit/.testbox/page_data/HelloWorldPlugin differ
Files 11p1/tests/unit/.testbox/page_data/HomePage and 12p3/tests/unit/.testbox/page_data/HomePage differ
diff -ruN 11p1/tests/unit/.testbox/page_data/HomePageAlias 12p3/tests/unit/.testbox/page_data/HomePageAlias
--- 11p1/tests/unit/.testbox/page_data/HomePageAlias	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/HomePageAlias	2006-06-18 06:19:56.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1045352861;s:8:"pagename";s:13:"HomePageAlias";s:12:"_cached_html";s:299:"xUAo0ȧ2hlsh@*mCk&&>ۤ\l<~kfᠭ߹Cg`>`'<Wo ]cHО.	,,7"c l~iI{i>t6 l~"p?Ujp3 %xwv.S}^%{t,`,,{-ɜVz3LN	ʤV3nIcBQ:
yOtzNQ۩%vD7m-|ˌy7?ۂ#c|"</}6Z9l0|hs";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/HowToUseWiki and 12p3/tests/unit/.testbox/page_data/HowToUseWiki differ
diff -ruN 11p1/tests/unit/.testbox/page_data/IncludePagePlugin 12p3/tests/unit/.testbox/page_data/IncludePagePlugin
--- 11p1/tests/unit/.testbox/page_data/IncludePagePlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/IncludePagePlugin	2006-06-18 06:19:56.000000000 -0500
@@ -0,0 +1,5 @@
+a:3:{s:4:"date";i:1088929862;s:8:"pagename";s:17:"IncludePagePlugin";s:12:"_cached_html";s:524:"xڽMO0#
VJEB=!'nF8v;@w.[
+)9؞k9KZeڵ.~
+Bg/.nX^h^==qs5W0]W2-,(p6hR)A(BYn*JU\#
+=4:<1psa=_ny9\}W`ttn
]enG_%&QeΦcFpC}Ho-	E} TtUw`*ʼ(SP`M7/a|E$*S,QN
+PEhA{/d3l[j3bon-ʄSN'U7$Z&;b茠l*>c82`Frī^ﮎKYT;{QroU?;Zѿ`Bp8ݮ$)VUsK_\4]"xa]Nc?6|;ԾhKTĉa}i20";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/InterWiki and 12p3/tests/unit/.testbox/page_data/InterWiki differ
Files 11p1/tests/unit/.testbox/page_data/InterWikiMap and 12p3/tests/unit/.testbox/page_data/InterWikiMap differ
diff -ruN 11p1/tests/unit/.testbox/page_data/InterWikiSearch 12p3/tests/unit/.testbox/page_data/InterWikiSearch
--- 11p1/tests/unit/.testbox/page_data/InterWikiSearch	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/InterWikiSearch	2006-06-18 06:19:56.000000000 -0500
@@ -0,0 +1,3 @@
+a:3:{s:4:"date";i:1044053943;s:8:"pagename";s:15:"InterWikiSearch";s:12:"_cached_html";s:392:"xڍRKo0+-vab&ЈTMx	g44?{8SK+eV+<<8Iߗ((=npy8:HD9d\xJs.Z/"ES-;TRc
rI\\zӠJ
+oKڃ2{`(6sie$$UiYf)dpv\}U%~ZJHQˠwd,@ANWQ+}˸ZPY 9v
+9$gUԤW}wb;RiT\X/GnW^z\M֜8C5#M'
~I|zvDı.oƗzoW"7,X?	N˵Sr7";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/LikePages and 12p3/tests/unit/.testbox/page_data/LikePages differ
Files 11p1/tests/unit/.testbox/page_data/LinkDatabase and 12p3/tests/unit/.testbox/page_data/LinkDatabase differ
Files 11p1/tests/unit/.testbox/page_data/LinkIcons and 12p3/tests/unit/.testbox/page_data/LinkIcons differ
Files 11p1/tests/unit/.testbox/page_data/ListPagesPlugin and 12p3/tests/unit/.testbox/page_data/ListPagesPlugin differ
Files 11p1/tests/unit/.testbox/page_data/MagicPhpWikiURLs and 12p3/tests/unit/.testbox/page_data/MagicPhpWikiURLs differ
Files 11p1/tests/unit/.testbox/page_data/ModeratedPage and 12p3/tests/unit/.testbox/page_data/ModeratedPage differ
Files 11p1/tests/unit/.testbox/page_data/MoreAboutMechanics and 12p3/tests/unit/.testbox/page_data/MoreAboutMechanics differ
Files 11p1/tests/unit/.testbox/page_data/MostPopular and 12p3/tests/unit/.testbox/page_data/MostPopular differ
Files 11p1/tests/unit/.testbox/page_data/NewMarkupTestPage and 12p3/tests/unit/.testbox/page_data/NewMarkupTestPage differ
Files 11p1/tests/unit/.testbox/page_data/OldMarkupTestPage and 12p3/tests/unit/.testbox/page_data/OldMarkupTestPage differ
Files 11p1/tests/unit/.testbox/page_data/OldStyleTablePlugin and 12p3/tests/unit/.testbox/page_data/OldStyleTablePlugin differ
Files 11p1/tests/unit/.testbox/page_data/OldTextFormattingRules and 12p3/tests/unit/.testbox/page_data/OldTextFormattingRules differ
Files 11p1/tests/unit/.testbox/page_data/OrphanedPages and 12p3/tests/unit/.testbox/page_data/OrphanedPages differ
Files 11p1/tests/unit/.testbox/page_data/PageDump and 12p3/tests/unit/.testbox/page_data/PageDump differ
Files 11p1/tests/unit/.testbox/page_data/PageGroupTest and 12p3/tests/unit/.testbox/page_data/PageGroupTest differ
Files 11p1/tests/unit/.testbox/page_data/PageGroupTestFour and 12p3/tests/unit/.testbox/page_data/PageGroupTestFour differ
Files 11p1/tests/unit/.testbox/page_data/PageGroupTestOne and 12p3/tests/unit/.testbox/page_data/PageGroupTestOne differ
Files 11p1/tests/unit/.testbox/page_data/PageGroupTestThree and 12p3/tests/unit/.testbox/page_data/PageGroupTestThree differ
Files 11p1/tests/unit/.testbox/page_data/PageGroupTestTwo and 12p3/tests/unit/.testbox/page_data/PageGroupTestTwo differ
diff -ruN 11p1/tests/unit/.testbox/page_data/PageHistory 12p3/tests/unit/.testbox/page_data/PageHistory
--- 11p1/tests/unit/.testbox/page_data/PageHistory	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/PageHistory	2006-06-18 06:19:57.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1012170535;s:8:"pagename";s:11:"PageHistory";s:12:"_cached_html";s:204:"xMMn0F=!ϐlDqÈԎbܽ"v͛='G>}O&T%ȢѓCm@}o>[6'	xLRre*!ؒX\kж
6=k2%ur֝|׎Wρ%:9.#ZsOMCܟ_.TffhYۥ/d[L";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/PageInfo and 12p3/tests/unit/.testbox/page_data/PageInfo differ
Files 11p1/tests/unit/.testbox/page_data/PagePermissions and 12p3/tests/unit/.testbox/page_data/PagePermissions differ
Files 11p1/tests/unit/.testbox/page_data/PgsrcTranslation and 12p3/tests/unit/.testbox/page_data/PgsrcTranslation differ
diff -ruN 11p1/tests/unit/.testbox/page_data/PgsrcTranslation%2Fde 12p3/tests/unit/.testbox/page_data/PgsrcTranslation%2Fde
--- 11p1/tests/unit/.testbox/page_data/PgsrcTranslation%2Fde	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/PgsrcTranslation%2Fde	2006-06-18 06:19:57.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1105947847;s:8:"pagename";s:19:"PgsrcTranslation/de";s:12:"_cached_html";s:693:"xڕTMo0+F>vUCPzJ#2ΔX8v6vq+z{o#|){eg8Ns-x|Y!Z&_^p~/])g^Y9Jk<"4QrℳI puMbϫeFb-Қz䓨=,So^r[!/JtNaޠϙ2t\keVvJGD.+)斣s
a!E,PׂPNJ\cƯS	i !}%BߓITL{1Aմ+e {Y|솚h]MIT]χB.Sl h:>g7NpzMkS -a!@-̲栗J|SY?5R*բH!I~?V,淤9~FIDEF"IGReV6ndH5ᐼ|Մ<qD3Eu;X5r$$+!ۜMkgy=Z;~o!?kf<q.~}V(q-߬e|JZYt{!8dH1꺯Nv"z^yd~G/[ڑ7%";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/PgsrcTranslation%2Fes and 12p3/tests/unit/.testbox/page_data/PgsrcTranslation%2Fes differ
Files 11p1/tests/unit/.testbox/page_data/PgsrcTranslation%2Ffr and 12p3/tests/unit/.testbox/page_data/PgsrcTranslation%2Ffr differ
Files 11p1/tests/unit/.testbox/page_data/PgsrcTranslation%2Fit and 12p3/tests/unit/.testbox/page_data/PgsrcTranslation%2Fit differ
Files 11p1/tests/unit/.testbox/page_data/PgsrcTranslation%2Fja and 12p3/tests/unit/.testbox/page_data/PgsrcTranslation%2Fja differ
Files 11p1/tests/unit/.testbox/page_data/PgsrcTranslation%2Fnl and 12p3/tests/unit/.testbox/page_data/PgsrcTranslation%2Fnl differ
Files 11p1/tests/unit/.testbox/page_data/PgsrcTranslation%2Fzh and 12p3/tests/unit/.testbox/page_data/PgsrcTranslation%2Fzh differ
Files 11p1/tests/unit/.testbox/page_data/PgsrcTranslation_sv and 12p3/tests/unit/.testbox/page_data/PgsrcTranslation_sv differ
Files 11p1/tests/unit/.testbox/page_data/PhotoAlbumPlugin and 12p3/tests/unit/.testbox/page_data/PhotoAlbumPlugin differ
Files 11p1/tests/unit/.testbox/page_data/PhpHighlightPlugin and 12p3/tests/unit/.testbox/page_data/PhpHighlightPlugin differ
Files 11p1/tests/unit/.testbox/page_data/PhpWeatherPlugin and 12p3/tests/unit/.testbox/page_data/PhpWeatherPlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/PhpWiki 12p3/tests/unit/.testbox/page_data/PhpWiki
--- 11p1/tests/unit/.testbox/page_data/PhpWiki	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/PhpWiki	2006-06-18 06:19:57.000000000 -0500
@@ -0,0 +1,3 @@
+a:3:{s:4:"date";i:1012170535;s:8:"pagename";s:7:"PhpWiki";s:12:"_cached_html";s:431:"xڭn1w?
,qbڽ.]:SNc|BΒ F޽d.6 A _B}$uH{j
+-
+xȉMVW/PE#yo7&xϸddZed6b.9k/Z'XPw39Q:cZiA	QտC&C-xjmy뜿Q8=x)N%1G@i][Jw{wo5a>qCWX%VO]'hH+,3^7%o]:cl	LjKXUbq%^ڎƞJ>Ds>Nh9ś,1>)(5XVg.糳6AB`J	{UsNNl/`Srޚy!i(Ă?<";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/PhpWikiAdministration and 12p3/tests/unit/.testbox/page_data/PhpWikiAdministration differ
Files 11p1/tests/unit/.testbox/page_data/PhpWikiAdministration%2FChmod and 12p3/tests/unit/.testbox/page_data/PhpWikiAdministration%2FChmod differ
Files 11p1/tests/unit/.testbox/page_data/PhpWikiAdministration%2FChown and 12p3/tests/unit/.testbox/page_data/PhpWikiAdministration%2FChown differ
Files 11p1/tests/unit/.testbox/page_data/PhpWikiAdministration%2FRemove and 12p3/tests/unit/.testbox/page_data/PhpWikiAdministration%2FRemove differ
Files 11p1/tests/unit/.testbox/page_data/PhpWikiAdministration%2FRename and 12p3/tests/unit/.testbox/page_data/PhpWikiAdministration%2FRename differ
diff -ruN 11p1/tests/unit/.testbox/page_data/PhpWikiAdministration%2FReplace 12p3/tests/unit/.testbox/page_data/PhpWikiAdministration%2FReplace
--- 11p1/tests/unit/.testbox/page_data/PhpWikiAdministration%2FReplace	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/PhpWikiAdministration%2FReplace	2006-06-18 06:19:58.000000000 -0500
@@ -0,0 +1 @@
+a:3:{s:4:"date";i:1086203379;s:8:"pagename";s:29:"PhpWikiAdministration/Replace";s:12:"_cached_html";s:224:"x=N0<Eؚl*KMkѥQm{B\H_t69VxI(&Fr]GZ7?7n9ዀ{H	4v}=p$cXSBϲǐ)dNK]6O\Jp`Kb*|Omc'iW4R=ʵ
+>MSlj%KrK"HmBB`f";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/PhpWikiAdministration%2FSetAcl and 12p3/tests/unit/.testbox/page_data/PhpWikiAdministration%2FSetAcl differ
Files 11p1/tests/unit/.testbox/page_data/PhpWikiDocumentation and 12p3/tests/unit/.testbox/page_data/PhpWikiDocumentation differ
Files 11p1/tests/unit/.testbox/page_data/PhpWikiPoll and 12p3/tests/unit/.testbox/page_data/PhpWikiPoll differ
Files 11p1/tests/unit/.testbox/page_data/PhpWikiRecentChanges and 12p3/tests/unit/.testbox/page_data/PhpWikiRecentChanges differ
Files 11p1/tests/unit/.testbox/page_data/PloticusPlugin and 12p3/tests/unit/.testbox/page_data/PloticusPlugin differ
Files 11p1/tests/unit/.testbox/page_data/PluginManager and 12p3/tests/unit/.testbox/page_data/PluginManager differ
Files 11p1/tests/unit/.testbox/page_data/ProjectSummary and 12p3/tests/unit/.testbox/page_data/ProjectSummary differ
Files 11p1/tests/unit/.testbox/page_data/RandomPage and 12p3/tests/unit/.testbox/page_data/RandomPage differ
Files 11p1/tests/unit/.testbox/page_data/RateIt and 12p3/tests/unit/.testbox/page_data/RateIt differ
Files 11p1/tests/unit/.testbox/page_data/RawHtmlPlugin and 12p3/tests/unit/.testbox/page_data/RawHtmlPlugin differ
Files 11p1/tests/unit/.testbox/page_data/RecentChanges and 12p3/tests/unit/.testbox/page_data/RecentChanges differ
Files 11p1/tests/unit/.testbox/page_data/RecentComments and 12p3/tests/unit/.testbox/page_data/RecentComments differ
diff -ruN 11p1/tests/unit/.testbox/page_data/RecentEdits 12p3/tests/unit/.testbox/page_data/RecentEdits
--- 11p1/tests/unit/.testbox/page_data/RecentEdits	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/RecentEdits	2006-06-18 06:19:58.000000000 -0500
@@ -0,0 +1,2 @@
+a:3:{s:4:"date";i:1102328443;s:8:"pagename";s:11:"RecentEdits";s:12:"_cached_html";s:426:"xڭRn@+[nֲ([XlֻIj8r%ۭODr4n
+q-6VaסZlUg6=҈KVkj:˴5I wAzjazO:yU30/ՙ*S/Ц?"ߩ%, 9Zؒ=ԭq2[X	80ac")jA:;[l;,Gmg'_ƝyiZ|8ep#^O［aZκjR=̪IT8kӆg_@Q
DF\HuYެRdc1B e<)6MRnD6e(ϨIQm랺A$>jIҌcFroD~";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/RecentReleases and 12p3/tests/unit/.testbox/page_data/RecentReleases differ
diff -ruN 11p1/tests/unit/.testbox/page_data/RecentVisitors 12p3/tests/unit/.testbox/page_data/RecentVisitors
--- 11p1/tests/unit/.testbox/page_data/RecentVisitors	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/RecentVisitors	2006-06-18 06:19:58.000000000 -0500
@@ -0,0 +1,4 @@
+a:3:{s:4:"date";i:1101847613;s:8:"pagename";s:14:"RecentVisitors";s:12:"_cached_html";s:340:"xmN@E
+3H,,@e$nb5f<8-튝}}g|qp&za|Ehp?u-3дTr/?e-{_oԘQ`h^9g%Ht>t굺rgfL}Շ}O
+nq}:iZ$e5CtIgRZ [@Am<Xj2M{3kL:k$K5"muZ=$ÂĆT$pG^+O5m{eo>#@Xp}49K}w\-vmpx`khjyw[ΙxمH/86
+n<ݳ8SiO'_{X";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/RedirectToPlugin and 12p3/tests/unit/.testbox/page_data/RedirectToPlugin differ
Files 11p1/tests/unit/.testbox/page_data/RelatedChanges and 12p3/tests/unit/.testbox/page_data/RelatedChanges differ
Files 11p1/tests/unit/.testbox/page_data/ReleaseNotes and 12p3/tests/unit/.testbox/page_data/ReleaseNotes differ
Files 11p1/tests/unit/.testbox/page_data/RichTablePlugin and 12p3/tests/unit/.testbox/page_data/RichTablePlugin differ
Files 11p1/tests/unit/.testbox/page_data/RssFeedPlugin and 12p3/tests/unit/.testbox/page_data/RssFeedPlugin differ
Files 11p1/tests/unit/.testbox/page_data/SandBox and 12p3/tests/unit/.testbox/page_data/SandBox differ
Files 11p1/tests/unit/.testbox/page_data/SearchHighlight and 12p3/tests/unit/.testbox/page_data/SearchHighlight differ
Files 11p1/tests/unit/.testbox/page_data/SearchHighlightPlugin and 12p3/tests/unit/.testbox/page_data/SearchHighlightPlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/SteveWainstead 12p3/tests/unit/.testbox/page_data/SteveWainstead
--- 11p1/tests/unit/.testbox/page_data/SteveWainstead	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/SteveWainstead	2006-06-18 06:19:59.000000000 -0500
@@ -0,0 +1,5 @@
+a:3:{s:4:"date";i:1012170535;s:8:"pagename";s:14:"SteveWainstead";s:12:"_cached_html";s:407:"xڕn0@
+AfiLj츝:`l"$HL"迏rР;`&}4GoGX	$qzwt0=DG-V
+0]j
#>rt9UZ띁-	J}G&;}^kCXT샮S~&2v9JJ,-fW
+zO#/+Ic5<5I>pnFgp6\I9@YNThXI:n#}4ُiQP,}o3"g4dCB=~8ɟbX8KVΌܵ^H<tHɻRf}t7w
+f@";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/SyntaxHighlighterPlugin and 12p3/tests/unit/.testbox/page_data/SyntaxHighlighterPlugin differ
Files 11p1/tests/unit/.testbox/page_data/SystemInfoPlugin and 12p3/tests/unit/.testbox/page_data/SystemInfoPlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/TemplateExample 12p3/tests/unit/.testbox/page_data/TemplateExample
--- 11p1/tests/unit/.testbox/page_data/TemplateExample	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/TemplateExample	2006-06-18 06:19:59.000000000 -0500
@@ -0,0 +1,4 @@
+a:3:{s:4:"date";i:1126384931;s:8:"pagename";s:15:"TemplateExample";s:12:"_cached_html";s:525:"xڕSۊ0}W	޴ne7nmB'XDTv8/ь933GꚂ2Eָݗ/b
F9[#j-JsVAYI %302<T;%ZP
ѽB.$,0?X,9kcto	*+7~wB.!7MH$/C*pf蒰[!0)w9SA"ų(
rC[7U3R,'3"b]C2E*P;b
+=h-uq%S'QP8T`<O͢x:dz?gǠC_k4X$WS`פ
{d]F%g
+9nYR4
}|U8y/J4ӣjf\O1+SyBxOZGv,ڊfb5N.eE}
+砅WM\"*εd-uq/L";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/TemplatePlugin and 12p3/tests/unit/.testbox/page_data/TemplatePlugin differ
Files 11p1/tests/unit/.testbox/page_data/TeX2pngPlugin and 12p3/tests/unit/.testbox/page_data/TeX2pngPlugin differ
Files 11p1/tests/unit/.testbox/page_data/TextFormattingRules and 12p3/tests/unit/.testbox/page_data/TextFormattingRules differ
Files 11p1/tests/unit/.testbox/page_data/TitleSearch and 12p3/tests/unit/.testbox/page_data/TitleSearch differ
Files 11p1/tests/unit/.testbox/page_data/TranscludePlugin and 12p3/tests/unit/.testbox/page_data/TranscludePlugin differ
Files 11p1/tests/unit/.testbox/page_data/TranslateText and 12p3/tests/unit/.testbox/page_data/TranslateText differ
Files 11p1/tests/unit/.testbox/page_data/UnfoldSubpagesPlugin and 12p3/tests/unit/.testbox/page_data/UnfoldSubpagesPlugin differ
diff -ruN 11p1/tests/unit/.testbox/page_data/UpLoad 12p3/tests/unit/.testbox/page_data/UpLoad
--- 11p1/tests/unit/.testbox/page_data/UpLoad	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/UpLoad	2006-06-18 06:19:59.000000000 -0500
@@ -0,0 +1,4 @@
+a:3:{s:4:"date";i:1086868086;s:8:"pagename";s:6:"UpLoad";s:12:"_cached_html";s:293:"xEKn0D9EuMK
+d!ˊEԑT!K,Ig3H{?LGBVprdPIssO%ܦo*2]K+wdR%g%5WTϵT` ZOLD]8F(G&g61bWF^5wܩKx:z*g/*P/*;^!6H5]ckE蝄"u@0sf\K
+0	H'ͩU-i
+";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/UpLoadPlugin and 12p3/tests/unit/.testbox/page_data/UpLoadPlugin differ
Files 11p1/tests/unit/.testbox/page_data/UserPreferences and 12p3/tests/unit/.testbox/page_data/UserPreferences differ
Files 11p1/tests/unit/.testbox/page_data/WabiSabi and 12p3/tests/unit/.testbox/page_data/WabiSabi differ
Files 11p1/tests/unit/.testbox/page_data/WantedPages and 12p3/tests/unit/.testbox/page_data/WantedPages differ
Files 11p1/tests/unit/.testbox/page_data/WhoIsOnline and 12p3/tests/unit/.testbox/page_data/WhoIsOnline differ
Files 11p1/tests/unit/.testbox/page_data/WikiAdminSelect and 12p3/tests/unit/.testbox/page_data/WikiAdminSelect differ
diff -ruN 11p1/tests/unit/.testbox/page_data/WikiBlogPlugin 12p3/tests/unit/.testbox/page_data/WikiBlogPlugin
--- 11p1/tests/unit/.testbox/page_data/WikiBlogPlugin	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/page_data/WikiBlogPlugin	2006-06-18 06:19:59.000000000 -0500
@@ -0,0 +1,6 @@
+a:3:{s:4:"date";i:1088929862;s:8:"pagename";s:14:"WikiBlogPlugin";s:12:"_cached_html";s:432:"xڽMO@@
+kλ`a Ai$&VQf [UiSROc;?J0(7vu d*w^RbNՃpCR^BybeJj:[?v/5PUiM&v(S5e
+_ĩ}9nOUtu"nЃQM3@u=4[JШKI`KxЫMML:k[P
+eĻR;4lt"œ.}L=?)h=ʘR
+Z(
Ǝ@pF;̑G8y
+h͑'a1nb淀|"a߅r	,dB5,6ۋ:<6I'M$bPrcޯ7GlAǖG5nƋRR
xθ
~Sp<e";}
\ No newline at end of file
Files 11p1/tests/unit/.testbox/page_data/WikiPlugin and 12p3/tests/unit/.testbox/page_data/WikiPlugin differ
Files 11p1/tests/unit/.testbox/page_data/WikiWikiWeb and 12p3/tests/unit/.testbox/page_data/WikiWikiWeb differ
Files 11p1/tests/unit/.testbox/test_pagedb.db3 and 12p3/tests/unit/.testbox/test_pagedb.db3 differ
diff -ruN 11p1/tests/unit/.testbox/ver_data/AddCommentPlugin--1 12p3/tests/unit/.testbox/ver_data/AddCommentPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/AddCommentPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AddCommentPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,32 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:958:"WikiPlugin to let users attach comments to the end of a page. Since v1.3.8.
+Change the layout via the templates comment.tmpl and addcomment.tmpl, and the CSS classes
+wikicomment, wikicomment-header, wikicomment-body, wikicomment-footer
+
+!! Usage
+<verbatim>
+     <?plugin AddComment order||=normal jshide||=0 mode||=show,add noheader||=0 ?>
+</verbatim>
+
+!! Plugin Arguments
+__jshide__: |
+  Boolean if the comments and/or textbox should be initially hidden and on click expanded. Default: 0
+__order__:  |
+  List comments in chronological (order=normal) or reverse order (order=reverse)
+__mode__:  |
+  List of add and/or show.  Default: add,show
+__noheader__:  |
+  Boolean if the "Comments" h2 header should be omitted. Default: 0
+__pagename__:  |
+  Attach to which page? Default: current pagename
+
+!! Known Problems
+
+jshide does not work yet. Not very well tested.
+
+!! Examples
+
+<?plugin AddComment jshide||=1 ?>
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AddingPages--1 12p3/tests/unit/.testbox/ver_data/AddingPages--1
--- 11p1/tests/unit/.testbox/ver_data/AddingPages--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AddingPages--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,25 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:950:"To add a new page to Wiki, all you have to do is come up with a
+meaningful title, capitalize all the words and
+StringThemTogetherLikeThis. Wiki automagically recognizes it as a
+hyperlink. Alternatively, you can put anything into [square brackets].
+
+Then you can go ahead and ClickTheQuestionMark at the end of your new
+hyperlink, and the Wiki will give you a window for making the new
+page.
+
+If you wish to add documents with complex markup to the Wiki, you
+might be better off providing a URL to it than trying to add the text
+of the document here, like so:
+
+PhpWiki project homepage: http://phpwiki.sourceforge.net/
+
+The Wiki does not support HTML tags (see TextFormattingRules).
+<tags>They will just render like text.</tags> Wiki is meant to be as
+simple as possible to encourage use.
+
+Note that there is a feature that your system administrator can enable
+to allow embedded HTML, but there are security risks involved.
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AllPages--1 12p3/tests/unit/.testbox/ver_data/AllPages--1
--- 11p1/tests/unit/.testbox/ver_data/AllPages--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AllPages--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,4 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:126:"Here is the list of all pages on this Wiki, including any
+OrphanedPages which are otherwise inaccessible.
+
+<?plugin AllPages?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AllPagesCreatedByMe--1 12p3/tests/unit/.testbox/ver_data/AllPagesCreatedByMe--1
--- 11p1/tests/unit/.testbox/ver_data/AllPagesCreatedByMe--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AllPagesCreatedByMe--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,3 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:109:"The list of pages which were created by you. (If you are authenticated only)
+
+<?plugin AllPages creator=[] ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AllPagesLastEditedByMe--1 12p3/tests/unit/.testbox/ver_data/AllPagesLastEditedByMe--1
--- 11p1/tests/unit/.testbox/ver_data/AllPagesLastEditedByMe--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AllPagesLastEditedByMe--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,3 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:117:"The list of pages for which you were the last author. (If you are authenticated only)
+
+<?plugin AllPages author=[] ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AllPagesOwnedByMe--1 12p3/tests/unit/.testbox/ver_data/AllPagesOwnedByMe--1
--- 11p1/tests/unit/.testbox/ver_data/AllPagesOwnedByMe--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AllPagesOwnedByMe--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,3 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:95:"The list of pages which you own. (If you are authenticated only)
+
+<?plugin AllPages owner=[] ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AllUsers--1 12p3/tests/unit/.testbox/ver_data/AllUsers--1
--- 11p1/tests/unit/.testbox/ver_data/AllUsers--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AllUsers--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,6 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:193:"Here is a list of all users who have once successfully logged in,
+created their own home page or have saved UserPreferences at least once.
+----
+<?plugin AllUsers?>
+----
+WikiPlugin PluginManager";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AnalyseAccessLogSqlPlugin--1 12p3/tests/unit/.testbox/ver_data/AnalyseAccessLogSqlPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/AnalyseAccessLogSqlPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AnalyseAccessLogSqlPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,95 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:4871:"The AnalyseAccessLogSql plugin provides a framework to analyse the SQL access log
+and display the results.
+This information may be sensitive and therefore this plugin is limited to
+administrator access only.
+
+A small number of queries that may (or might not) use the ~MySQL
+specific dialect of SQL are provided in <tt>lib/plugin/~AnalyseAccessLogSql.php</tt>.
+For more information, please see the section *Adding new queries* below.
+
+!!!Usage
+Experimental! Will change a lot.
+
+!!!Usage
+<verbatim>
+  <?plugin AnalyseAccessLogSql mode=<QUERY NAME> ?>
+</verbatim>
+
+!Parameters
+mode _(required parameter)_:
+  The name of the query to execute. See *Adding new queries* below.
+
+period:
+  Use in combination with the _count_ parameter. The type of history period to retrieve from the SQL access log. Blank (the default) for all history, or one of "*weeks*", "*days*", "*hours*", or "*minutes*".
+
+count:
+  Use in combination with the _period_ parameter. Must be a number. The number of periods to retrieve from the access log.
+
+caption:
+  The value of this parameter is used as the caption for the output. If not set, the caption on the table defaults to the mode.
+
+center:
+  If set, the table is centered on the page, otherwise left justified.
+
+debugShowQuery:
+  If set, the SQL will be displayed in the table footer. Useful while debugging new queries or just for interest.
+
+user:
+  Blank (the default) to retrieve all users, or a specific user, or "*<NONE>*" for SQL access log entries with no user.
+
+host:
+  Blank (the default) to retrieve all remote_hosts, or a specific host.
+
+referrer:
+  Blank (the default) to retrieve all referrers, "*<NONE>*" to retrieve entries with no referrer, otherwise any referrer that matches this parameter, truncating longer referrers before matching. So a parameter of referrer='~http://localhost' will match '~http://localhost/wiki/index.php', '~http://localhost/wiki/index.php/~HomePage' etc.
+
+local_referrers:
+  If set (the default), return all referrers. If not set, return only external referring sites, excluding references from within the wiki.
+
+!!!Adding new queries
+The file <tt>lib/plugin/AnalyseAccessLogSql.php</tt> contains a default set of queries against the SQL access log.
+Feel free to change this file to suit your own needs, but please note that this requires filesystem access to the web server where PhpWiki is running.
+In particular, this file may need to be modified to correctly query databases other than MySQL.
+The queries supplied by default are: "*Referring URLs*", "*Referring Domains*", "*Remote Hosts*", "*Users*" and "*Host Users*".
+
+To add a new query, add a new section towards the end of the file, using one of the existing queries as a template. An example of an existing query is:
+<pre>
+} elseif ($mode=="Users") {
+    $query = "SELECT "
+        ."remote_user AS User, "
+        ."count(*) AS 'Access Count' "
+        ."FROM $accesslog "
+        .($whereConditions ? 'WHERE '.$whereConditions : '')
+        ."GROUP BY User";
+</pre>
+
+If you do add a query, please consider contributing it back to the PhpWiki project at http://http://sourceforge.net/projects/phpwiki
+!API for ~AnalyseAccessLogSql
+* input arguments:
+  - *$mode* contains the name of the query requested in the plugin parameters.
+  - *$accesslog* contains the qualified name of the accesslog table, which may or may not be equal to "accesslog".
+  - *$whereConditions* contains the conditions (specific user, etc.) requested in the plugin parameters.
+
+* output:
+  - *$query* must contain the final SQL query to be executed.
+
+* conventions:
+  - While constructing the query string,
+    * each clause is on a separate line and
+    * each clause contains the required trailing punctuation or space.
+  - The mode parameter is, by default, displayed as the caption in the final output, so please choose a user friendly name.
+  - The column names displayed on the wiki page are generated from the SQL column names defined in the queries, so please choose user friendly names. MySQL allows column names to include spaces.  If spaces are not allowed, then "*_*" is probably the next best choice.
+
+* language hints for PHP newbies - please remember:
+  - terminate statements with "*;*",
+  - assignment uses "*=*" and comparison uses "*==*",
+  - concatenate strings using the "*.*" operator,
+  - the parentheses around the expression "*=($whereConditions ? 'WHERE '.$whereConditions : '' )=*" are essential,
+  - strings enclosed in single quotes may not contain substrings enclosed in single quotes (actually the truth is more complex but let's leave it like that here), and
+  - strings enclosed in double quotes will evaluate and replace variable names so that, for example, *"FROM $accesslog "* might be evaluated to *"FROM phpwiki_accesslog "*.
+
+! Author
+PhpWiki:CharlesCorrigan %%%
+Changes by PhpWiki:ReiniUrban
+----
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AppendText--1 12p3/tests/unit/.testbox/ver_data/AppendText--1
--- 11p1/tests/unit/.testbox/ver_data/AppendText--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AppendText--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:22:"<?plugin AppendText ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AppendTextPlugin--1 12p3/tests/unit/.testbox/ver_data/AppendTextPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/AppendTextPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AppendTextPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,34 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:1008:"AppendText is a WikiPlugin to automatically add text to a page. For general
+usage better use the AddCommentPlugin.
+
+<verbatim>
+<?plugin AppendText ?>
+</verbatim>
+
+!! Plugin Arguments
+__page__: |
+  Append to which page. Default: Current page.
+__s__:  |
+  What text to add. Note: A \n is always prepended.
+__before__:  |
+  (Optional) Add before the matching line beginning with before.
+__after__:  |
+  (Optional) Add after the matching line beginning with after.
+
+!! Examples
+
+Add from a list of all available plugins one to the current page.
+<verbatim>
+  <?plugin WikiFormRich action=AppendText buttontext="AddPlugin"
+  	   pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=WikiPlugin !>
+  	   ?>
+</verbatim>
+
+Add from a list of all available Categories to the current page.
+<verbatim>
+  <?plugin WikiFormRich action=AppendText buttontext="AddCategory"
+  	   pulldown[] name=s text="Categories: " value=<!plugin-list TitleSearch s=Category !>
+  	   ?>
+</verbatim>
+----
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/_AuthInfo--1 12p3/tests/unit/.testbox/ver_data/_AuthInfo--1
--- 11p1/tests/unit/.testbox/ver_data/_AuthInfo--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/_AuthInfo--1	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625928;s:8:"%content";s:21:"<?plugin _AuthInfo ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/AuthorHistoryPlugin--1 12p3/tests/unit/.testbox/ver_data/AuthorHistoryPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/AuthorHistoryPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/AuthorHistoryPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,17 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:442:"This plugin allows you to list the history of edits by a particular
+author; you can specify the page name as well (default is the current
+page).
+
+<verbatim>
+<?plugin AuthorHistory user="test" ?>
+
+<?plugin AuthorHistory page=HomePage ?>
+</verbatim>
+
+The second example will default to the current page. We can't provide
+examples for you since we don't know any potential usernames for your
+wiki.
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/BackLinks--1 12p3/tests/unit/.testbox/ver_data/BackLinks--1
--- 11p1/tests/unit/.testbox/ver_data/BackLinks--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/BackLinks--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,7 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:262:"The contents of all pages are searched to find links to the current
+page. The BackLinks function also answers the question: "Which pages
+contain the title of this page?".
+
+----
+
+<?plugin BackLinks exclude||='' include_self||=1 noheader||=0 page||='' info||='' ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CalendarListPlugin--1 12p3/tests/unit/.testbox/ver_data/CalendarListPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/CalendarListPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CalendarListPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,18 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625908;s:8:"%content";s:512:"The CalendarListPlugin is used in conjunction with the CalendarPlugin. It was written for those who use a wiki as a personal information manager.
+
+Just click any date in the calendar, edit the for that date, then come back to this page. The event should be listed below the calendar.
+
+Usage:
+<verbatim>
+<?plugin Calendar ?>
+<?plugin CalendarList ?>
+</verbatim>
+
+Example (click any date and edit it, then return to this page):
+<?plugin Calendar ?>
+
+<?plugin CalendarList ?>
+
+-----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CalendarPlugin--1 12p3/tests/unit/.testbox/ver_data/CalendarPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/CalendarPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CalendarPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,88 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:2365:"The CalendarPlugin can be used to generate a monthly calendar in a
+wiki page. It's handy for PersonalWiki~s.
+
+Individual dates in the calendar link to specially named wiki pages.
+The names for the "day pages" are by default formed by appending the
+date to the pagename on which the calendar appears.
+
+_This feature was inspired by [Manila|http://manila.userland.com/],
+and first implemented by GaryBenson. It was later implemented as a
+WikiPlugin by JeffDairiki._
+
+!!Usage:
+
+<verbatim>
+<?plugin Calendar?>
+</verbatim>
+
+will get you:
+<?plugin Calendar?>
+
+--------
+
+!! Plugin Arguments
+
+!Selection of Month
+
+<strong>year</strong>:
+
+  Specify the year for the calendar.  (Default: current year.)
+
+<strong>month</strong>:
+
+  Specify the month for the calendar.  (Default: current month.)
+
+<strong>month_offset</strong>:
+
+  Added to ''month''. Can be used to include several months worth of
+  calendars on a single wiki page.
+
+  <?plugin Calendar month_offset=+1?>
+
+!"Day Page" Names
+
+<strong>date_format</strong>:
+
+  [Strftime| php-function:strftime] style format string used to
+  generate page names for the "day pages." The default value is
+  =%Y-%m-%d=.
+
+<strong>prefix</strong>:
+
+  Prepended to the date (formatted per ''date_format'') to generate
+  the "day page" names. The default value is =~[pagename]/=.
+
+!Appearance
+
+<strong>month_format</strong>:
+
+  [Strftime| php-function:strftime] style format string used to
+  generate the title of the calendar. (Default: =%B, %Y=.)
+
+<strong>wday_format</strong>:
+
+  [Strftime| php-function:strftime] style format string used to
+  generate the day-of-week names at the top of the calendar.
+
+<strong>start_wday</strong>:
+
+  What day of the week does the calendar start on. This should be
+  specified as an integer in the range zero (Sunday) through six
+  (Saturday), inclusive.
+
+  <?plugin Calendar start_wday=1 ?>
+
+-----
+
+! Patch for 1.2
+
+GaryBenson wrote the first calendar implementation for PhpWiki 1.2.
+(Since 1.2 doesn't support plugins, it uses a =###CALENDAR###= token
+as a trigger.) Gary provides a screenshot at [ http://inauspicious.org/files/screenshots/calender.png | screenshot ],
+a [patch | http://inauspicious.org/files/phpwiki/phpwiki-1.2.0-calendar.patch] (on 1.2.0), and
+[calendar.php | http://inauspicious.org/files/phpwiki/calendar.php]
+(which renders a view of the year.)
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CategoryCategory--1 12p3/tests/unit/.testbox/ver_data/CategoryCategory--1
--- 11p1/tests/unit/.testbox/ver_data/CategoryCategory--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CategoryCategory--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:69:"<?plugin TitleSearch s=Category noheader=1 exclude=CategoryCategory?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CategoryGroup--1 12p3/tests/unit/.testbox/ver_data/CategoryGroup--1
--- 11p1/tests/unit/.testbox/ver_data/CategoryGroup--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CategoryGroup--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,6 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:223:"All links in this page will be used to find user groups for the
+WIKIPAGE group method.  User group pages must contain a list of
+usernames, and then for consistency after four hyphens a link to this
+page.
+
+* [Administrators]";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CategoryHomePages--1 12p3/tests/unit/.testbox/ver_data/CategoryHomePages--1
--- 11p1/tests/unit/.testbox/ver_data/CategoryHomePages--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CategoryHomePages--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,5 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:60:"<?plugin AllUsers include_empty=0 ?>
+
+----
+
+CategoryCategory";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CommentPlugin--1 12p3/tests/unit/.testbox/ver_data/CommentPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/CommentPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CommentPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,37 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:709:"!!! Synopsis
+
+The CommentPlugin lets you hide parts of a Wiki page without actually
+deleting the text. Comments will only be visible in the Wiki markup
+when editing or viewing the source.
+
+!!! Usage
+
+Simply place the text to be commented out between =<?plugin Comment=
+and =?>=:
+
+<verbatim>
+<?plugin Comment
+
+!!! A Hidden Section
+
+This text will not show up in the generated HTML page, but it is still
+visible when editing the WikiMarkup.
+
+?>
+</verbatim>
+
+!!! Author
+
+Martin Geisler mailto:gimpster@gimpster.com.
+
+<?plugin Comment
+
+!!! "Fuzzy" Logic
+Theorem: a cat has nine tails.
+Proof:
+    No cat has eight tails. A cat has one tail more than no cat.
+    Therefore, a cat has nine tails.
+
+?>
+----
+WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CreatePage--1 12p3/tests/unit/.testbox/ver_data/CreatePage--1
--- 11p1/tests/unit/.testbox/ver_data/CreatePage--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CreatePage--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:22:"<?plugin CreatePage ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CreatePagePlugin--1 12p3/tests/unit/.testbox/ver_data/CreatePagePlugin--1
--- 11p1/tests/unit/.testbox/ver_data/CreatePagePlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CreatePagePlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,64 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:1957:"WikiPlugin to easily create new pages, optionally with default content. Since v1.3.8
+
+This allows you to create a page geting the new pagename from a
+forms-based interface, and optionally with the initial content from
+some template.
+
+Put a "<~?plugin-form ~CreatePage ?~>" at some page, browse this page,
+enter the name of the page to create, then click the button.
+
+!! Usage
+<verbatim>
+     <?plugin-form CreatePage ?>
+     <?plugin-form CreatePage template=CategoryHomePage ?>
+     <?plugin-form CreatePage template=SomeTemplatePage vars="year=2004&name=None" ?>
+</verbatim>
+
+!! Plugin Arguments
+*s*: |
+  The pagename, which will passed to the plugin. Default: ""
+*initial_content*:  |
+  The new page will be pre-filled with this content. Default: ""
+*template*:  |
+  The new page will be pre-filled with the content of this page. Default: ""
+*vars*: |
+  variables to be expanded. Default: ""
+*overwrite*: |
+  Whether to overwrite an existing page. Default: ""
+
+!! Known Problems
+
+None
+
+!! Variable Expansion
+
+The content (either initial_content or template) might hold some variables, which will be
+expanded on creation. Unassigned variables will stay as %%<var>%%, assigned variables without
+matching %%<var>%% placeholder will be ignored, without any warning.
+
+A variable in a template is denoted as <tt>%%var%%</tt>, which will be expanded by the
+value of <tt>var</tt> given to the vars argument (in urlencoded php notation).
+
+Some special variables are automatically assigned:
+
+%%ctime%% |
+  $WikiTheme->formatDateTime(time())
+%%author%% |
+  $user->getId()
+
+This forms together with page templates and the PhpWiki:WikiFormRichPlugin and
+optionally the PhpWiki:SqlResultPlugin a framework to create templated pages.
+
+!! Authors
+
+Dan Frankowski, Reini Urban
+
+!! Examples
+
+<?plugin-form CreatePage s=MyHomePage ?>
+
+See also PhpWiki:EasilyCreateNewPages, PhpWiki:WikiFormRichPlugin, PhpWiki:SqlResultPlugin
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/CreateTocPlugin--1 12p3/tests/unit/.testbox/ver_data/CreateTocPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/CreateTocPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/CreateTocPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,36 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:1027:"<?plugin CreateToc jshide||=1 ?>
+
+WikiPlugin to create a dynamical *Table Of Contents* of all headers. Since v1.3.8
+
+!! Usage
+<verbatim>
+     <?plugin CreateToc ?>
+     <?plugin CreateToc jshide||=1 with_toclink||=1 ?>
+</verbatim>
+
+!! Plugin Arguments
+__jshide__: |
+  Boolean if the TOC should be initially hidden and on click expanded. Default: 0
+__with_toclink__:  |
+  Boolean if headers should link back to the TOC. Default: 0
+__headers__:  |
+  Which headers to include.  Default: !!!,!!,!    1,2,3 also allowed
+__noheader__:  |
+  Boolean if the "Table of Contents" h2 header should be omitted. Default: 0
+__liststyle__:  |
+  dl or ol or ul. Default: dl
+__indentstr__:  |
+  Default: &nbsp;&nbsp;
+__pagename__:  |
+  TOC of which page? Default: current pagename
+
+!! Known Problems
+
+If any header contains a link or a ~WikiWord or non-word characters, ~CreateToc will print a warning and refuse to link this header.
+
+!! Examples
+
+See for example PhpWikiDemo:en/TextFormattingRules
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/DebugInfo--1 12p3/tests/unit/.testbox/ver_data/DebugInfo--1
--- 11p1/tests/unit/.testbox/ver_data/DebugInfo--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/DebugInfo--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,4 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:124:"Detailed view of a page, which is probably more useful for debugging
+than anything else.
+
+<?plugin _BackendInfo page||='' ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/EditMetaData--1 12p3/tests/unit/.testbox/ver_data/EditMetaData--1
--- 11p1/tests/unit/.testbox/ver_data/EditMetaData--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/EditMetaData--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:24:"<?plugin EditMetaData ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/EditMetaDataPlugin--1 12p3/tests/unit/.testbox/ver_data/EditMetaDataPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/EditMetaDataPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/EditMetaDataPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,13 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:494:"<b>This plugin allows you to add/edit/delete metadata key/value pairs for a given page. You must be logged in as the administrator to do this. The page's metadata contains things like the page hit count, last edit time and so on.</b>
+
+<b>Editing the metadata for the homepage would look like this:</b>
+------
+<?plugin EditMetaData page="HomePage" ?>
+------
+<b>With no arguments the plugin defaults to the current page:</b>
+------
+<?plugin EditMetaData ?>
+
+-----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/EditText--1 12p3/tests/unit/.testbox/ver_data/EditText--1
--- 11p1/tests/unit/.testbox/ver_data/EditText--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/EditText--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,6 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:159:"All pages (except search results) have an EditText link at the bottom.
+You can edit the page you are reading by clicking that link.
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/ExternalSearchPlugin--1 12p3/tests/unit/.testbox/ver_data/ExternalSearchPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/ExternalSearchPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/ExternalSearchPlugin--1	2006-06-18 06:20:00.000000000 -0500
@@ -0,0 +1,60 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:1704:"!! Synopsis
+
+The ExternalSearchPlugin creates a form to query InterWiki~s or other
+internet sites.
+
+!! Typical Usage
+<verbatim>
+<?plugin ExternalSearch
+         url="InterWiki or URL"
+         name="button text"
+?>
+</verbatim>
+
+
+!! Arguments
+__url__:
+  Specify a wiki from the InterWikiMap or a url. Any text entered by
+  the user will be appended to the search url. The string placeholder
+  '__=%s=__' can be used to insert a search query into the url rather
+  than appending it.
+
+__name__:
+  Text to display in the submit button. For InterWiki sites the
+  default is the wiki name, for other urls the default is the text
+  "External Search".
+
+__formsize__:
+  Specify the input area size. (default: 30 characters)
+
+__debug__:
+  Don't really redirect to the external site, just print out the url
+  that would be redirected to.
+
+
+!! Examples
+
+<verbatim>
+  url="http://sunir.org/apps/meta.pl?"       name="Metawiki Search"
+  url="http://www.usemod.com/cgi-bin/mb.pl?" name="MeatBall Search"
+  url=php-lookup
+  url=php-function
+  url=PhpWiki
+</verbatim>
+
+Perform a full-text search on multiple wiki's:
+<?plugin ExternalSearch url="http://sunir.org/apps/meta.pl?" name="Metawiki Search" ?>
+
+Perform a full-text search on [MeatBall|MeatBall:SiteSearch] wiki:
+<?plugin ExternalSearch url="http://www.usemod.com/cgi-bin/mb.pl?" name="MeatBall Search" ?>
+
+Search the PHP web site for a function name:
+<?plugin ExternalSearch url=php-lookup name="PHP Lookup" ?>
+
+Enter the name of a PHP function to view the documentation page:%%%
+<?plugin ExternalSearch url=php-function ?>
+
+Enter any existing page name on PhpWiki to jump to that page:
+<?plugin ExternalSearch url=PhpWiki ?>
+----
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/FindPage--1 12p3/tests/unit/.testbox/ver_data/FindPage--1
--- 11p1/tests/unit/.testbox/ver_data/FindPage--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/FindPage--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,46 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:1901:"Here are some good starting points for browsing.
+
+* HowToUseWiki gives you the quick lowdown on Wiki markup.
+* RecentChanges recorded automatically.
+* MoreAboutMechanics of browsing and editing on this server.
+
+Here's a title search. Try something like <tt>wiki or sandwich</tt>.
+
+<?plugin WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+  checkbox[] name=case_exact
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql" ?>
+
+Use the following for a full text search. This takes a few seconds.
+The results will show all lines on a given page which contain a
+match.
+
+<?plugin WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+  checkbox[] name=case_exact
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql" ?>
+
+In a fuzzy pages search the titles of all pages are examined to find
+those which are similarly spelled or similar sounding (english).
+
+<?plugin-form FuzzyPages ?>
+
+------
+
+! Tips
+Separate words with a space. All words have to match as substrings. %%%
+'OR', grouping with parenthesis, string-quoting and some glob-style wildcard
+characters are also supported. %%%
+To exclude words from a title search or full text search, prepend a '-'. %%%
+Use '^xx' or 'xx*' to match words starting with 'xx'. %%%
+Use '~*xx' or 'xx$' to match words ending with 'xx'. %%%
+Use '^word$' to match exact words. %%%
+Use regex=auto and 're:' like 're:word.*xx' or regex=posix to use posix regular expressions. (not yet) %%%
+Use regex=auto and '//' like '/^word$/' or regex=pcre to match using perl-style regular expressions. %%%
+Use regex=sql to match using SQL-style wildcards '%' and '_'. %%%
+Use regex=none to match any wildcards verbatim. %%%
+
+Example: 'wiki text -php' looks for all pages containing the words 'wiki' and 'text',  %%%
+         but not containing the word 'php'.";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/FoafViewerPlugin--1 12p3/tests/unit/.testbox/ver_data/FoafViewerPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/FoafViewerPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/FoafViewerPlugin--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,21 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:515:"!About
+FoafViewerPlugin is written to facilitate the viewing of FOAF / RDF files in human readable form. Please note, it provides only basic features at this time.
+
+!Version
+0.0.1
+
+!Usage
+<verbatim>
+<?plugin FoafViewer foaf=http://www.myfoaf.com/foaf.rdf ?>
+/FoafViewerPlugin?foaf=http://www.myfoaf.com/foaf.rdf
+</verbatim>
+
+!Download from....
+http://www.ahsonline.com.au/dod/FoafViewerPlugin.zip
+
+!Example
+<?plugin FoafViewer foaf=http://www.ahsonline.com.au/dod/FOAF.rdf ?>
+
+-----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/FrameIncludePlugin--1 12p3/tests/unit/.testbox/ver_data/FrameIncludePlugin--1
--- 11p1/tests/unit/.testbox/ver_data/FrameIncludePlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/FrameIncludePlugin--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,21 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:799:"This plugin will create an HTML frame that will fill the entire display area of the page (that is, the whole area the user is allowed to edit). All other text will be discarded when the page is rendered (anything outside the call to plugin, that is). In the language of hypertext this is called <i>transclusion</i>.
+
+You might also be interested in the IncludePagePlugin.
+
+Examples: to include a page from another site, use the <b>src</b> attribute:
+
+<verbatim>
+<?plugin FrameInclude src="http://phpwiki.org/" ?>
+</verbatim>
+
+To include a page from within this wiki, use the <b>page</b> attribute:
+
+<verbatim>
+<?plugin FrameInclude page=HomePage ?>
+</verbatim>
+
+For more information on this plugin please read the PHP source code in the /lib/plugin directory.
+
+-----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/FullRecentChanges--1 12p3/tests/unit/.testbox/ver_data/FullRecentChanges--1
--- 11p1/tests/unit/.testbox/ver_data/FullRecentChanges--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/FullRecentChanges--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,7 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:249:"Here's a list of all recently changed pages on this wiki, not just the
+most recent ones found in RecentChanges. (See RecentEdits for all
+recent minor edits and changes).
+
+--------
+
+<?plugin RecentChanges days||=3 show_all=1 daylist=1,3,7,30,90,-1 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/FullTextSearch--1 12p3/tests/unit/.testbox/ver_data/FullTextSearch--1
--- 11p1/tests/unit/.testbox/ver_data/FullTextSearch--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/FullTextSearch--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,31 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:756:"<?plugin FullTextSearch ?>
+
+----
+
+Additional Searches:
+<?plugin WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+  checkbox[] name=case_exact
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql" ?>
+
+<?plugin WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+  checkbox[] name=case_exact
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql" ?>
+
+<?plugin WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+  checkbox[] name=case_exact ?>
+
+----
+
+Create or edit page:
+
+<?plugin-form CreatePage?>
+
+----
+
+<?plugin IncludePage page=FindPage quiet=1 section=Tips sectionhead=1 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/FuzzyPages--1 12p3/tests/unit/.testbox/ver_data/FuzzyPages--1
--- 11p1/tests/unit/.testbox/ver_data/FuzzyPages--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/FuzzyPages--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,18 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:272:"<?plugin FuzzyPages ?>
+
+----
+
+Additional Searches:
+<?plugin-form TitleSearch?>
+<?plugin-form FullTextSearch?>
+<?plugin-form FuzzyPages?>
+
+----
+
+Create or edit page:
+
+<?plugin-form CreatePage?>
+
+----
+
+<?plugin IncludePage page=FindPage quiet=1 section=Tips sectionhead=1 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/GoodStyle--1 12p3/tests/unit/.testbox/ver_data/GoodStyle--1
--- 11p1/tests/unit/.testbox/ver_data/GoodStyle--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/GoodStyle--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,20 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:748:""Young writers often suppose that style is a garnish for the meat of
+prose, a sauce by which a dull dish is made palatable. Style has no
+such separate entity; it is nondetachable, unfilterable. The beginner
+should approach style warily, realizing that it is himself he is
+approaching, no other; and he should begin by turning resolutely away
+from all devices that are popularly believed to indicate style--all
+mannerisms, tricks, adornments. The approach to style is by way of
+plainness, simplicity, orderliness, sincerity."
+
+--Strunk and White, "The Elements of Style"
+
+''And thus an American textbook, typical required reading for
+10th-grade English students, unknowingly extols some virtues of
+WabiSabi''
+
+--scummings
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/GoogleLink--1 12p3/tests/unit/.testbox/ver_data/GoogleLink--1
--- 11p1/tests/unit/.testbox/ver_data/GoogleLink--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/GoogleLink--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,8 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:192:"!! GoogleLink
+
+A new UserPreferences setting to optionally add a [G] link to unknown pages,
+with a link to Google:[pagename]. Default: Off
+
+See MeatBall::GooglePrompt
+----
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/HelloWorldPlugin--1 12p3/tests/unit/.testbox/ver_data/HelloWorldPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/HelloWorldPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/HelloWorldPlugin--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,74 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625911;s:8:"%content";s:2008:"A simple example plugin.
+
+<?plugin HelloWorld salutation="Hello," name="WikiUser" ?>
+
+From the source of this page:
+
+<verbatim>
+<?plugin HelloWorld salutation="Hello," name="WikiUser" ?>
+</verbatim>
+
+-----
+PhpWiki's plugin architecture allows you to add custom page elements to your wiki. All you have to do is extend (subclass) the ~WikiPlugin class and create your output via the run() method, dependend on the Wiki- or Request arguments,
+
+* either with the predefined HTML classes to create valid XHTML,
+* or by using templates, which are easier customizable, but generally more a mess to use and easier to create invalid XHTML.
+
+<?plugin PhpHighlight
+
+/**
+ * A simple demonstration WikiPlugin.
+ *
+ * Usage:
+ * <?plugin HelloWorld?&gt;
+ * <?plugin HelloWorld
+ *          salutation="Greetings, "
+ *          name=Wikimeister
+ * ? >
+ * <?plugin HelloWorld salutation=Hi ? >
+ * <?plugin HelloWorld name=WabiSabi ? >
+ */
+
+// Constants are defined before the class.
+if (!defined('THE_END'))
+    define('THE_END', "!");
+
+class WikiPlugin_HelloWorld
+extends WikiPlugin
+{
+    // Five required functions in a WikiPlugin.
+
+    function getName () {
+        return _("HelloWorld");
+    }
+
+    function getDescription () {
+        return _("Simple Sample Plugin");
+
+    }
+
+    function getVersion() {
+        return preg_replace("/[Revision: $]/", '',
+                            "\$Revision: 1.5 $");
+    }
+
+    // Establish default values for each of this plugin's arguments.
+    function getDefaultArguments() {
+        return array('salutation' => "Hello,",
+                     'name'       => "World");
+    }
+
+    function run($dbi, $argstr, $request) {
+        extract($this->getArgs($argstr, $request));
+
+        // Any text that is returned will not be further transformed,
+        // so use html where necessary.
+        $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
+                         THE_END);
+        return $html;
+    }
+};
+?>
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/HomePage--1 12p3/tests/unit/.testbox/ver_data/HomePage--1
--- 11p1/tests/unit/.testbox/ver_data/HomePage--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/HomePage--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,9 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625928;s:8:"%content";s:436:"* What is a WikiWikiWeb? A description of this application.
+* Learn HowToUseWiki and learn about AddingPages.
+* Use the SandBox page to experiment with Wiki pages.
+* Please sign your name in RecentVisitors.
+* See RecentChanges for the latest page additions and changes.
+* Find out which pages are MostPopular.
+* Read the ReleaseNotes and RecentReleases.
+* Administer this wiki via PhpWikiAdministration.
+* See more PhpWikiDocumentation.";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/HomePageAlias--1 12p3/tests/unit/.testbox/ver_data/HomePageAlias--1
--- 11p1/tests/unit/.testbox/ver_data/HomePageAlias--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/HomePageAlias--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,3 @@
+a:6:{s:5:"mtime";s:10:"1045352861";s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:8:"%content";s:88:"<?plugin RedirectTo page=HomePage ?>
+
+(This is a demonstration of the RedirectToPlugin.)";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/HowToUseWiki--1 12p3/tests/unit/.testbox/ver_data/HowToUseWiki--1
--- 11p1/tests/unit/.testbox/ver_data/HowToUseWiki--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/HowToUseWiki--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,69 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625912;s:8:"%content";s:2122:"''"Wiki wiki"'' means "quick" in Hawai'ian.
+
+*All you really need to know is:*
+
+* To edit any page click on the Edit link at the bottom of the page.
+  You should do that right now, and read the source code of this page.
+  It will make more sense.
+
+* You get italics by surrounding words with underscores on either side
+  _like this_.
+
+* You get *bold text* by using two asterisks on either side.
+
+* And, *_bold italics_* by using both.
+
+* You get =monospaced text= by using two equal-signs on either side.
+
+* You get bullets by using an asterisk * at the start of the line.
+
+* To have a paragraph in plain monospaced font, start it with <pre>
+  and end it with </pre>:
+
+  <pre>
+  this is a poem for sure
+  about monospacing
+  i wrote in purple velour
+  but couldn't find a rhyme for monospacing
+  </pre>
+
+* You separate paragraphs with an extra blank line. Example:
+
+  I am a paragraph.
+
+  I am a paragraph too. We're just very small paragraphs.
+
+* You can get horizontal rules with four or more dashes like this:
+
+  ---------
+
+* To create hyperlinks you just capitalize the words and string them
+  together. Let's say you want to create a page about how Steve
+  Wainstead eats worms. All you have to do is capitalize each word and
+  string them together like this: SteveWainsteadEatsLiveWorms. If the
+  page does not exist yet a question mark appears after the link,
+  inviting you to create the page: ThisPageShouldNotExist. (And please
+  don't ruin the example by creating one.)
+
+* To link to pages outside the Wiki, you can just type in the URL and
+  Wiki will link it for you: http://www.nytimes.com/
+
+* To put images in, just provide the hyperlink in brackets like this:
+  ~[~http://www.yourhost.yourdomain/images/picture.png]. Image URLs not
+  in brackets will just appear as hyperlinks to the image.
+
+* Now you are ready to begin AddingPages.
+
+----
+
+A WikiWikiWeb is meant to be fast and easy to edit. It has very simple
+markup that you can read about in TextFormattingRules.
+
+----
+
+If you don't like the size of the text editing window you get, you can
+change it.  See UserPreferences.
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/IncludePagePlugin--1 12p3/tests/unit/.testbox/ver_data/IncludePagePlugin--1
--- 11p1/tests/unit/.testbox/ver_data/IncludePagePlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/IncludePagePlugin--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,9 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625912;s:8:"%content";s:379:"This plugin will "include" other pages in this wiki. In the language of hypertext this is called <i>transclusion</i>. The pages will render in distinct tables. You can also load external pages in a more limited fashion with the FrameIncludePlugin. Examples:
+
+<?plugin IncludePage page="HomePage" ?>
+
+<?plugin IncludePage page="WabiSabi" ?>
+
+-----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/InterWiki--1 12p3/tests/unit/.testbox/ver_data/InterWiki--1
--- 11p1/tests/unit/.testbox/ver_data/InterWiki--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/InterWiki--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,36 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625912;s:8:"%content";s:1667:"This wiki supports InterWiki links in a style copied from [UseMod:]
+wiki. Links to pages in other wikis can be made without having to know
+or type the full URLs, for example: MeatBall:InterWiki will link to
+the page named "~InterWiki" at Meatball wiki.
+
+The ~InterWiki map is taken from the the <verbatim> block in
+InterWikiMap, but that page must be locked for it to work. This denies
+a potential hacker the ability to nefariously change every ~InterWiki
+link to point to some evil URL. If no map is found in InterWikiMap (or
+the page is not locked), PhpWiki will fall back to using the file
+lib/interwiki.map in your phpwiki distribution. The ~InterWiki map
+file in use at PhpWiki: can be viewed at
+[http://phpwiki.sf.net/interwiki.map].
+
+The map file is manually updated. It is based upon and periodically
+synchronized with [UseMod's InterMap|http://usemod.com/intermap.txt]
+but it is not quite identical. One notable difference from [UseMod:]
+is that PhpWiki supports '%s' within the URLs in the map--see the
+entry for RFC for an example of how this works.
+
+Not all of the entries in the InterWikiMap are actual wikis. For
+example, these are just regular web sites: Dictionary:fungible,
+[JargonFile:Alderson loop], [IMDB:Roman Holiday], RFC:2822, and
+ISBN:020171499X.
+
+The "Category" moniker is a special entry which allows one to link a
+wiki page to a Category page without creating a back-reference. Thus
+Category:Category links to the CategoryCategory page, yet this page
+won't show up in the back-links listing of CategoryCategory.
+
+The term "InterWiki" also refers to a broader concept. See
+PhpWiki:InterWikiSearch for more links.
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/InterWikiMap--1 12p3/tests/unit/.testbox/ver_data/InterWikiMap--1
--- 11p1/tests/unit/.testbox/ver_data/InterWikiMap--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/InterWikiMap--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,135 @@
+a:6:{s:8:"pagetype";s:12:"interwikimap";s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:5:"mtime";i:1150625912;s:8:"%content";s:6164:"The InterWiki map used on this wiki is listed below.  The map is taken
+from the text in the verbatim block below.  (But this only works if
+this page is locked.)
+<verbatim>
+AIWiki http://www.ifi.unizh.ch/ailab/aiwiki/aiw.cgi?
+ALife http://news.alife.org/wiki/index.php?
+AbbeNormal http://www.ourpla.net/cgi-bin/pikie.cgi?
+AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
+Acronym http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=
+Advogato http://www.advogato.org/
+Annotation http://bayle.stanford.edu/crit/nph-med.cgi/
+AnnotationWiki http://www.seedwiki.com/page.cfm?wikiid=368&doc=
+AviSynth http://www.avisynth.org/
+AwarenessWiki http://taoriver.net/aware/
+BcWireless http://www.bcwireless.net/wiki-moinmoin/moin.cgi/
+BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
+BridgesWiki http://c2.com/w2/bridges/
+bsdWiki http://profile.sh/syswiki/index.php?
+C2find http://c2.com/cgi/wiki?FindPage&value=
+CLiki http://ww.telent.net/cliki/
+Cache http://www.google.com/search?q=cache:
+Category Category
+CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?
+CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
+CPAN http://search.cpan.org/
+DeWikiPedia http://de.wikipedia.org/wiki/
+DejaNews http://www.deja.com/=dnc/getdoc.xp?AN=
+Dict http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=
+Dictionary http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=
+DiveIntoOsx http://diveintoosx.org/
+DocBook http://docbook.org/wiki/moin.cgi/
+DolphinWiki http://www.object-arts.com/wiki/html/Dolphin/
+DseWiki http://www.wikiservice.at/dse/wiki.cgi?
+EfnetCeeWiki http://purl.net/wiki/c/
+EfnetCppWiki http://purl.net/wiki/cpp/
+EfnetPythonWiki http://purl.net/wiki/python/
+EfnetXmlWiki http://purl.net/wiki/xml/
+EljWiki http://elj.sourceforge.net/phpwiki/index.php/
+EmacsWiki http://www.emacswiki.org/cgi-bin/wiki.pl?
+EoWikiPedia http://eo.wikipedia.org/wiki/
+FinalEmpire http://final-empire.sourceforge.net/cgi-bin/wiki.pl?
+Foldoc http://www.foldoc.org/foldoc/foldoc.cgi?
+FoxWiki http://fox.wikis.com/wc.dll?Wiki~
+FrWikiPedia http://fr.wikipedia.org/wiki/
+FreeBSDman http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=
+FreeNetworks http://www.freenetworks.org/index.cgi/
+FreshMeat http://freshmeat.net/
+Froogle http://froogle.google.com/froogle?q=
+Google http://www.google.com/search?q=
+GoogleGroups http://groups.google.com/groups?q=
+GreenCheese http://www.greencheese.org/
+HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
+Haribeau http://wiki.haribeau.de/cgi-bin/wiki.pl?
+IAWiki http://www.IAwiki.net/
+IMDB http://us.imdb.com/Title?
+ISBN http://www.amazon.com/exec/obidos/ISBN=
+IfDef http://ifdef.undef.net/
+JTF http://www.justthefaqs.org/?page=
+JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
+JiniWiki http://www.cdegroot.com/cgi-bin/jini?
+JspWiki http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=
+KmWiki http://www.voght.com/cgi-bin/pywiki?
+KnowHow http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi?
+LanifexWiki http://opt.lanifex.com/cgi-bin/wiki.pl?
+LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/
+LinuxWiki http://www.linuxwiki.de/
+LugKR http://lug-kr.sourceforge.net/cgi-bin/lugwiki.pl?
+MACCAWS http://www.maccaws.com/wiki/
+MathSongsWiki http://SeedWiki.com/page.cfm?wikiid=237&doc=
+MbTest http://www.usemod.com/cgi-bin/mbtest.pl?
+MeatBall http://www.usemod.com/cgi-bin/mb.pl?
+MetaWiki http://sunir.org/apps/meta.pl?
+MetaWikiPedia http://meta.wikipedia.com/wiki/
+MoinMoin http://moinmoin.wikiwikiweb.de/
+MoinMaster http://moinmaster.wikiwikiweb.de/
+MuWeb http://www.dunstable.com/scripts/MuWebWeb?
+NetVillage http://www.netbros.com/?
+OpenWiki http://openwiki.com/?
+OrgPatterns http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?
+PPR http://c2.com/cgi/wiki?
+PangalacticOrg http://www.pangalactic.org/Wiki/
+PersonalTelco http://www.personaltelco.net/index.cgi/
+php-function http://www.php.net/%s
+php-lookup http://www.php.net/manual-lookup.php?pattern=
+PhpWiki http://phpwiki.sourceforge.net/phpwiki/
+PhpWikiCvs http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpwiki/phpwiki/
+PhpWikiDemo http://phpwiki.sourceforge.net/demo/
+PhpWikiTest http://phpwiki.sourceforge.net/test/
+Pikie http://pikie.darktech.org/cgi/pikie?
+PlWikiPedia http://pl.wikipedia.org/wiki/
+PolitizenWiki http://www.politizen.com/wiki.asp?
+PoundPython http://twistedmatrix.com/wiki/python/
+PurlNet http://www.palowireless.com/zigbee/
+PyWiki http://www.voght.com/cgi-bin/pywiki?
+PythonInfo http://www.python.org/cgi-bin/moinmoin/
+PythonWiki http://www.pythonwiki.de/
+RFC http://www.faqs.org/rfcs/rfc%s.html
+RussellFreedom http://www.russellfreedom.com/
+SVGWiki http://www.protocol7.com/svg-wiki/default.asp?
+SeaPig http://www.seapig.org/ 
+SeattleWireless http://seattlewireless.net/?
+SenseisLibrary http://senseis.xmp.net/?
+Shakti http://cgi.algonet.se/htbin/cgiwrap/pgd/ShaktiWiki/
+SourceForge http://sourceforge.net/
+Squeak http://minnow.cc.gatech.edu/squeak/
+StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
+TMwiki http://www.EasyTopicMaps.com/?page=
+TWiki http://twiki.org/cgi-bin/view/
+Tavi http://tavi.sourceforge.net/index.php?
+Thesaurus http://www.thesaurus.com/cgi-bin/search?config=roget&words=
+Thinki http://www.thinkware.se/cgi-bin/thinki.cgi/
+TmNet http://www.technomanifestos.net/?
+Unreal http://wiki.beyondunreal.com/wiki/
+UseMod http://www.usemod.com/cgi-bin/wiki.pl?
+VisualWorks http://wiki.cs.uiuc.edu/VisualWorks/
+WakkaWiki http://www.wakkawiki.com/
+WebDevWikiNL http://www.promo-it.nl/WebDevWiki/index.php?page=
+WebSeitzWiki http://webseitz.fluxent.com/wiki/
+Why http://clublet.com/c/c/why?
+Wiktionary http://wiktionary.org/wiki/
+Wiki http://c2.com/cgi/wiki?
+WikiLens http://www.wikilens.org/wiki.php/
+WikiWikiWireless http://www.andaluciawireless.net/
+Wikibooks http://wikibooks.org/wiki/
+WikiPedia http://www.wikipedia.com/wiki/
+Wikiquote http://wikiquote.org/wiki/
+Wikisource http://wikisource.org/wiki/
+WikiWorld http://WikiWorld.com/wiki/index.php/
+WikkiTikkiTavi http://tavi.sourceforge.net/
+WLUG http://www.wlug.org.nz/
+YpsiEyeball http://sknkwrks.dyndns.org:1957/writewiki/wiki.pl?
+ZWiki http://www.zwiki.org/
+OsFaq2 http://www.mega-tokyo.com/osfaq2/index.php/
+</verbatim>
+";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/InterWikiSearch--1 12p3/tests/unit/.testbox/ver_data/InterWikiSearch--1
--- 11p1/tests/unit/.testbox/ver_data/InterWikiSearch--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/InterWikiSearch--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,9 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625912;s:8:"%content";s:200:"Query any Wiki listed in the InterWikiMap by entering a desired page
+name below.
+
+To add one of these searches to another page use the
+ExternalSearchPlugin.
+
+<?plugin InterWikiSearch?>
+----
+WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/LikePages--1 12p3/tests/unit/.testbox/ver_data/LikePages--1
--- 11p1/tests/unit/.testbox/ver_data/LikePages--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/LikePages--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,6 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625912;s:8:"%content";s:149:"LikePages are pages which share an initial or final word with that
+page. See also Wiki:LikePages and MeatBall:LikePages.
+
+----
+
+<?plugin LikePages ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/LinkDatabase--1 12p3/tests/unit/.testbox/ver_data/LinkDatabase--1
--- 11p1/tests/unit/.testbox/ver_data/LinkDatabase--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/LinkDatabase--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,9 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625912;s:8:"%content";s:266:"<?plugin LinkDatabase ?>
+
+<?plugin Comment
+  With ?format=text to be used by WikiBrowser at http://touchgraph.sourceforge.net/
+  Save the output as textfile.
+
+  Warning: format=text and format=xml pages will break HTML and ZIP dumps!
+  They must be excluded then.
+?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/LinkIcons--1 12p3/tests/unit/.testbox/ver_data/LinkIcons--1
--- 11p1/tests/unit/.testbox/ver_data/LinkIcons--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/LinkIcons--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,54 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625917;s:8:"%content";s:1927:"LinkIcons are an optional new feature of PhpWiki. When activated,
+icons will be displayed in front of URLs to indicate the type of link.
+
+* [http://phpwiki.sourceforge.net/demo/themes/default/images/http.png]
+  http link
+* [http://phpwiki.sourceforge.net/demo/themes/default/images/url.png]
+  generic internet link
+* [http://phpwiki.sourceforge.net/demo/themes/default/images/interwiki.png]
+  InterWiki link
+* [http://phpwiki.sourceforge.net/demo/themes/default/images/https.png]
+  https link
+* [http://phpwiki.sourceforge.net/demo/themes/default/images/mailto.png]
+  mailto link
+* [http://phpwiki.sourceforge.net/demo/themes/default/images/ftp.png]
+  ftp link
+
+__Note__: Some of the default icons use the alpha channel feature of
+the [PNG | http://www.libpng.org/pub/png/png-sitemap.html] image format
+for smooth rendering on any page color or textured background. Older
+browsers may not display all the images properly.
+
+!!!Examples
+
+The following examples will display with the above link icons only if
+the administrator has enabled this feature.
+
+!! InterWiki links
+
+* InterWiki link PhpWiki:InterWiki
+* A named InterWiki [read WhyWikiWorks at c2|Wiki:WhyWikiWorks].
+
+!!URLs
+
+* Email address [PhpWiki-talk mailing list|mailto:phpwiki-talk@lists.sourceforge.net]
+* Normal http link [PhpWiki's Home Page|http://phpwiki.sourceforge.net/phpwiki/]
+* Secure http link [PhpWiki's Home Page|https://phpwiki.sourceforge.net/phpwiki/]
+* File transfer ftp://ftp.sourceforge.net/
+
+''A generic icon is shown for other less common link types.''
+
+* news://nntp.news.com
+* gopher://gopher.caltech.cmu.edu
+
+LinkIcons will only display when the URL protocol is one which PhpWiki
+is allowed to link to. The following examples won't show any icons and
+PhpWiki won't automatically provide double-clickable links either,
+unless the administrator adds them:
+
+* bogus://oedipus.nostradamus.com
+* bolo://lgm.cheshire.org
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/ListPagesPlugin--1 12p3/tests/unit/.testbox/ver_data/ListPagesPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/ListPagesPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/ListPagesPlugin--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,19 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625917;s:8:"%content";s:677:"The ListPagesPlugin is the simpliest plugin to explicitly list a set of pages with all available
+[pagelist|PhpWiki:PageList] options, mainly used for a wikilens theme to display ratings info
+and recommendations.
+
+It can also be used with the PhpWiki:PluginList method to list a set of pages generated by
+another plugin, and/or to exclude a set of pages generated by another plugin.
+
+See the PhpWiki:PageList options.
+
+Usage:
+<verbatim>
+  <?plugin ListPages pages=HomePage,FindPage,WikiWikiWeb ?>
+
+  <?plugin ListPages info=hits sortby=hits pages=<!plugin-list BackLink page=[] !> exclude=ListPagesPlugin,WikiPlugin ?>
+</verbatim>
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/MagicPhpWikiURLs--1 12p3/tests/unit/.testbox/ver_data/MagicPhpWikiURLs--1
--- 11p1/tests/unit/.testbox/ver_data/MagicPhpWikiURLs--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/MagicPhpWikiURLs--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,123 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625918;s:8:"%content";s:2789:"!!! About phpwiki: URLs
+
+A special type of URL is available for making links to perform
+administrative and other special functions in PhpWiki.  Here is a
+brief description of how they work.
+
+The basic syntax of a phpwiki: URL is
+
+<pre>
+__phpwiki:__''pagename''__?__''query-args''
+</pre>
+
+If _pagename_ is omitted it defaults to the current page.
+
+_Query-args_ should be a set of parameters in standard HTTP GET
+format.
+
+The "action=''x''" parameter should almost always be given.  It can be one of
+__browse__, __diff__, __edit__, __viewsource__,
+__zip__, __dumpserial__, __loadserial__,
+__remove__, __lock__, __unlock__,
+__login__, __logout__, __setprefs__ or __save__.
+The default action is __browse__.
+
+Some of the actions accept other parameters.
+
+__FullTextSearch__, __TitleSearch__:
+
+  Accepts __s__=search term, and __size__=input size.
+
+__edit__:
+
+  Accepts __version__.
+
+__remove__:
+
+  Accepts __verify__.
+
+__save__:
+
+  Accepts __editversion__, __minor_edit__, and  __content__.
+
+__setprefs__:
+
+  Accepts __edit_area_width__, __edit_area_height__.
+
+!! Writing Magic Links in Wiki Pages
+
+A magic link looks like:
+
+<pre>
+__~[__ ''text'' __|__ ''phpwiki-url'' __]__
+</pre>
+
+The "''text'' *|*" is optional but usually recommended.  If given it
+will provide the label for the link.
+
+The _phpwiki-url_ is a *phpwiki:* URL as described above.
+
+!Some examples
+
+<verbatim>
+[ Edit the SandBox | phpwiki:SandBox?action=edit ]
+</verbatim>
+will generate a link which will take you directly to editing the
+SandBox, like so: [Edit the SandBox | phpwiki:SandBox?action=edit].
+
+Other possibilites:
+* [ Diff the SandBox | phpwiki:SandBox?action=diff ],
+* [ Lock the HomePage | phpwiki:HomePage?action=lock ],
+* [ Get a Full Zip Dump | phpwiki:?action=zip&include=all ],
+* Search for [ Page titles containing 'wiki' | phpwiki:?action=TitleSearch&s=wiki ]
+
+!! Writing Magic Forms in Wiki Pages
+
+''__Note__: The old syntax for Magic forms is no longer supported.
+They are superseded by =<?plugin-form>=.''
+
+If the plugin is called using *<?plugin-form* instead of *<?plugin*
+and the plugin supports searching, then it will be rendered as a form.
+
+''size'':
+
+  If given, specifies the size of the input area.
+
+''s'':
+
+  Specifies the default value for the input.
+
+!Examples:
+
+A search plugin invoked with *<?plugin* instead of *<?plugin-form*
+simply inserts the search results of the plugin:
+
+<verbatim>
+<?plugin TitleSearch s=wiki noheader=true ?>
+</verbatim>
+
+Search results for Page titles containing 'wiki':
+
+<?plugin TitleSearch s=wiki noheader=true ?>
+
+<verbatim>
+<?plugin-form FullTextSearch ?>
+</verbatim>
+
+gives
+
+<?plugin-form FullTextSearch ?>
+
+While
+
+<verbatim>
+<?plugin-form TitleSearch formsize=12 ?>
+</verbatim>
+
+yields
+
+<?plugin-form TitleSearch formsize=12 ?>
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/ModeratedPage--1 12p3/tests/unit/.testbox/ver_data/ModeratedPage--1
--- 11p1/tests/unit/.testbox/ver_data/ModeratedPage--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/ModeratedPage--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,66 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625918;s:8:"%content";s:2891:"<?plugin ModeratedPage ?>
+
+----
+
+!!! What is a ModeratedPage?
+
+A ModeratedPage is a page-internal setting, which restricts certain actions on certain pages.
+The requested action and page is stored internally and an email is sent to the moderators
+described in the linked and locked ModeratedPage action page.
+Any moderator may approve or reject the action by simply clicking an url.
+When approving the action, the requested action (edit, rename, ...) is performed.
+
+In both cases the author is notified, so it's recommended for the
+moderator to click on either the approve or reject links in the moderation email.
+In case of multiple moderators: first comes, first serves.
+
+!!! How to enable ModeratedPage on a single page?
+
+* Check the status of this action page, esp. the moderators in the
+  plugin line, if they had their emails stored in their
+  UserPreferences, and if the action page is locked.
+* Add a link to this action page in the page(s) in question.
+* Save the page.
+* Lock the page to actually change the moderation status. You may want to unlock it then.
+
+!!! How to disable ModeratedPage on a single page?
+
+* Remove the link to this action page in the page(s) in question.
+* Save the page.
+* Lock the page to actually change the moderation status. You may want to unlock it then.
+
+!!! Plugin Arguments
+
+* moderators: comma seperated list of registered usernames or groups.
+  Each user should have his email defined in his prefs. Default: "Administrators" or
+  <?plugin SystemInfo ADMIN_USER ?>
+* requirelevel: one of 0, 1, 2 or 10 on which moderation is used. Default: false (use requireaccess instead)
+* requireaccess: comma separated list of access perms, on which the moderation is used
+  "view,edit,create,list,remove,change"
+  Default: edit,remove,change
+
+!!! How does it work internally?
+
+You need to lock the page additionally, so that the link parser performs
+some magic whether the ModeratedPage link is present or not, for efficiency
+reasons. It can be unlocked again, and even the ModeratedPage link may be removed.
+The status will only be changed on the *lock* action, whether the ModeratedPage
+link is present or not.
+
+The moderation status is stored in each page in question.
+Each moderated action is stored in the page also, together with a randomly
+created permission key to allow Grant by a simple external unauthorized request.
+There's no timeout on moderated actions, so the actions may stack up.
+The delayed actions may be performed in any order, there's no strict ordering to
+follow for the moderator.
+
+!!! How to enable ModeratedPage on multiple/all pages?
+
+If you enable the config option ENABLE_MODERATEDPAGE_ALL, the page moderation status on
+every page is automatically set to check this action page ModeratedPage.
+
+There may come another administrative plugin to change the moderation
+status on selected pages.
+
+-----
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/MoreAboutMechanics--1 12p3/tests/unit/.testbox/ver_data/MoreAboutMechanics--1
--- 11p1/tests/unit/.testbox/ver_data/MoreAboutMechanics--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/MoreAboutMechanics--1	2006-06-18 06:20:01.000000000 -0500
@@ -0,0 +1,33 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625918;s:8:"%content";s:1339:"PhpWiki is written in the server-side scripting language PHP,
+available from http://www.php.net/. PHP resembles C and Perl in its
+syntax, and functions much like ASP, ~EmbPerl or JSP.
+
+PhpWiki consists of a dozen or so files of mixed PHP and HTML. The web
+pages that make up a WikiWikiWeb based on PHP live in a database with
+backup copies of previous versions of pages stored as well. (For the
+database, PhpWiki works with DBM, MySQL, PostgreSQL or text files.)
+
+Every time a user hits the site, the page requested is pulled from the
+database and rendered on the fly. The user only really ever requests
+the file =index.php=, which then decides which other php files to
+include.
+
+Links to pages in the Wiki are automatically linked: AddingPages.
+This might be the single most compelling aspect of a Wiki, the ability
+to add pages simply by linking to them. The next most compelling thing
+is how easily external URLs link, like this:
+
+# http://www.wcsb.org/
+# ftp://ftp.redhat.com/
+# news://news.mozilla.org/
+# http://slashdot.org/
+# http://theregister.co.uk/
+
+Combined with one namespace and a simple markup, a Wiki exhibits many
+of the characteristics of WabiSabi.
+
+PhpWiki is licensed under the GNU General Public license, which you
+should be able to see here: http://www.gnu.org/copyleft/gpl.txt.
+
+----
+PhpWikiDocumentation CategoryWiki";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/MostPopular--1 12p3/tests/unit/.testbox/ver_data/MostPopular--1
--- 11p1/tests/unit/.testbox/ver_data/MostPopular--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/MostPopular--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625918;s:8:"%content";s:34:"<?plugin MostPopular limit||=20 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/NewMarkupTestPage--1 12p3/tests/unit/.testbox/ver_data/NewMarkupTestPage--1
--- 11p1/tests/unit/.testbox/ver_data/NewMarkupTestPage--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/NewMarkupTestPage--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,145 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625918;s:8:"%content";s:2767:"New lists: asterisks, hash marks, and ";text:def" (wrong...)
+* bullet
+* l1
+  * l2
+  * l2
+     * l3
+ # one
+ #two
+ #three
+Term1:
+  definition1.1
+
+  definition1.2
+Term2 :
+    definition2
+
+    Term3:
+      definition3
+      Term4:
+          definition4
+
+          definition4.2
+      Term5 :
+        definition5
+
+Mixed -
+ * ul1
+   # ul1-ol1
+   # ul1-ol2
+     * ul1-ol2-ul1
+     * ul1-ol2-ul2
+        * ul1-ol2-ul2-ul1
+        * ul1-ol2-ul2-ul2
+
+*  l1
+   <pre>
+      preformatted text
+   </pre>
+   * l2
+----
+ old lists, oddly enough, work fine
+	* level 1
+	* l1
+		*l2
+		*l2
+			*l3
+			*l3
+				*l4
+			*l3
+					*l5
+			*l3
+	#one
+	#two
+		#one
+		#two
+	*l1
+		#three
+		#four
+	*l1
+		*l2
+		# one
+		# two
+
+<pre>
+ preformatted text
+ some more text
+</pre>
+
+	*l1
+				*l2
+	# number
+	# number
+this is a plain paragraph
+	* bullet
+this is a plain paragraph again
+	# number
+----
+__Link tests__
+# normal: HomePage
+# in brackets: [HomePage] -- named: [the front page|HomePage]
+# Link in brackets: [http://phpwiki.sourceforge.net/]
+# Link outside brackets: http://phpwiki.sourceforge.net/
+# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
+# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
+# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
+# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
+# Javascript: [boo! | javascript:alert('oops') ]  (is now: named internal link)
+# A [[Link] produces a [Link]
+# A [Link] looks like this: [[Link]
+# This is a [%%%] line break link
+# Also this page is [[not linked to], and this one is !NotLinkedTo and this one neither !http://not.linked.to/.
+  * WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
+  * !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
+  * WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
+  * !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
+
+----
+Markup tests:
+
+__underscores for bold__
+
+'''quotes for bold'''
+
+''quotes for italic''
+
+__''underscores bold italic''__
+
+'''''five quotes bold italic'''''
+
+''''''six quotes''''''
+
+'''''Bold italic''' and italic'' (buggy)
+
+'''Bold and ''bold-italic''''' (also buggy)
+
+!!! h1
+
+!! h2
+
+! h3
+
+this is plain text with <br>%%%
+a line break
+
+look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
+
+you cannot use &, < or >
+
+----
+Usage in preformatted text:
+<pre>
+ __underscores for bold__
+ '''quotes for bold'''
+ ''quotes for italic''
+ __''underscores bold italic''__
+ '''''five quotes bold italic'''''
+ ''''''six quotes''''''
+ !!! h1
+ !! h2
+ ! h3
+ this is plain text with <br>%%%
+ a line break
+ look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
+ you cannot use &, < or >
+</pre>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/OldMarkupTestPage--1 12p3/tests/unit/.testbox/ver_data/OldMarkupTestPage--1
--- 11p1/tests/unit/.testbox/ver_data/OldMarkupTestPage--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/OldMarkupTestPage--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,132 @@
+a:5:{s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625918;s:8:"%content";s:2593:" New lists: asterisks, hash marks, and ";text:def"
+* bullet
+* l1
+** l2
+** l2
+*** l3
+# one
+#two
+#three
+;Term1:definition1.1
+;: defintion1.2
+;Term2 :defintion2
+;; Term3:defintion3
+;;;Term4: definition4
+;;; : defintion4.2
+;;; Term5 : defintion5
+
+Mixed:
+*ul1
+*#ul1-ol1
+*#ul1-ol2
+*#*ul1-ol2-ul1
+*#*ul1-ol2-ul2
+*#**ul1-ol2-ul2-ul1
+*#**ul1-ol2-ul2-ul1
+
+*l1
+ preformatted text
+**    l2
+----
+ old lists
+	* level 1
+	* l1
+		*l2
+		*l2
+			*l3
+			*l3
+				*l4
+			*l3
+					*l5
+			*l3
+	#one
+	#two
+		#one
+		#two
+	*l1
+		#three
+		#four
+	*l1
+		*l2
+		# one
+		# two
+
+ preformatted text
+ some more text
+
+	*l1
+				*l4
+	# number
+	# number
+this is a plain paragraph
+	* bullet
+this is a plain paragraph again
+	# number
+----
+__Link tests__
+# normal: HomePage
+# in brackets: [HomePage] -- named: [the front page|HomePage]
+# Link in brackets: [http://phpwiki.sourceforge.net/]
+# Link outside brackets: http://phpwiki.sourceforge.net/
+# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
+# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
+# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
+# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
+# Javascript: [boo! | javascript:alert('oops') ]  (is now: named internal link)
+# A [[Link] produces a [Link]
+# A [Link] looks like this: [[Link]
+# This is a [%%%] line break link
+# Also this page is [[not linked to], and this one is !NotLinkedTo and this one neither !http://not.linked.to/.
+#* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
+#* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
+#* WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
+#* !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
+
+----
+Markup tests:
+
+__underscores for bold__
+
+'''quotes for bold'''
+
+''quotes for italic''
+
+__''underscores bold italic''__
+
+'''''five quotes bold italic'''''
+
+''''''six quotes''''''
+
+'''''Bold italic''' and italic'' (buggy)
+
+'''Bold and ''bold-italic''''' (also buggy)
+
+!!! h1
+
+!! h2
+
+! h3
+
+this is plain text with <br>%%%
+a line break
+
+look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
+
+you cannot use &, < or >
+
+----
+Usage in preformatted text:
+
+ __underscores for bold__
+ '''quotes for bold'''
+ ''quotes for italic''
+ __''underscores bold italic''__
+ '''''five quotes bold italic'''''
+ ''''''six quotes''''''
+ !!! h1
+ !! h2
+ ! h3
+ this is plain text with <br>%%%
+ a line break
+ look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
+ you cannot use &, < or >";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/OldStyleTablePlugin--1 12p3/tests/unit/.testbox/ver_data/OldStyleTablePlugin--1
--- 11p1/tests/unit/.testbox/ver_data/OldStyleTablePlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/OldStyleTablePlugin--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,64 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625918;s:8:"%content";s:1450:"The OldStyleTablePlugin can be used to include tables within a wiki
+page using the old-style markup syntax for tables.
+
+!!Usage:
+
+<verbatim>
+<?plugin OldStyleTable caption="OldStyleTable" border||=2
+||^  *Name*                |v *Cost*   |v *Notes*
+| *First*     | *Last*
+|> Jeff       |< Dairiki   |^  Cheap   |< Not worth it
+|> Marco      |< Polo      | Cheaper   |< Not available
+?>
+</verbatim>
+
+will get you
+
+<?plugin OldStyleTable caption="OldStyleTable" border||=2
+||^  *Name*                |v *Cost*   |v *Notes*
+| *First*     | *Last*
+|> Jeff       |< Dairiki   |^  Cheap   |< Not worth it
+|> Marco      |< Polo      | Cheaper   |< Not available
+?>
+
+Note that multiple __|__s lead to spanned columns, and __v__s can be
+used to span rows.  A __>__ generates a right justified column, __<__
+a left justified column and __^__ a centered column (which is the
+default.)
+
+!! Plugin Arguments
+
+__caption__:
+
+  Any string. Default: ""
+
+__border__:
+
+  Any number. Default: 1
+
+__cellspacing__:
+
+  Any number. Default: 1
+
+__cellpadding__:
+
+  Any number. Default: 1
+
+__summary__:
+
+  Any string. Default: ""
+
+----
+
+Note that within each table cell, _new-style_ markup is used.  You can
+only use inline markup --- no block level markup is allowed within
+table cells.
+
+(Using old-style markup wouldn't make much sense, since one can't
+include multi-line plugin invocations using the old-style markup
+rules.)
+
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/OldTextFormattingRules--1 12p3/tests/unit/.testbox/ver_data/OldTextFormattingRules--1
--- 11p1/tests/unit/.testbox/ver_data/OldTextFormattingRules--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/OldTextFormattingRules--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,109 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:5655:"! Synopsis
+OldTextFormattingRules%%%
+<strong>Emphasis:</strong> '<strong></strong>' for <em>italics</em>, _<em></em>~_ for <strong>bold</strong>, '<strong></strong>'_<em></em>~_ for <em><strong>both</strong></em>.%%%
+<strong>Lists:</strong> * for bullet lists, # for numbered lists, <em><strong>;</strong> term <strong>:</strong> definition</em> for definition lists.%%%
+<strong>References:</strong> ~JoinCapitalizedWords or use square brackets for a ~[page link] or URL ~[~http://cool.wiki.int/].%%%
+<strong>Footnotes:</strong> Use ~[1],~[2],~[3],...%%%
+<strong>Preventing linking:</strong> Prefix with "~!": ~!~DoNotHyperlink, name links like ~[~[text | URL] (double up on the "[").%%%
+<strong>Misc:</strong> "~!", "~!~!", "~!~!~!" make headings, "%%<em></em>%" makes a linebreak, "-<em></em>-<em></em>-<em></em>-" makes a horizontal rule.%%%
+<strong>Tables:</strong> | as first char, | for more columns, |> align right, |< align left, |^ centered (default), || span columns, |v span rows
+
+----
+! Paragraphs
+
+* Don't indent paragraphs
+* Words wrap and fill as needed
+* Use blank lines as separators
+* Four or more minus signs make a horizontal rule
+* %%<em></em>% makes a linebreak (in headings and lists too)
+
+
+! Lists
+
+* asterisk for first level
+     * asterisk-asterisk for second level, etc.
+* Use * for bullet lists, # for numbered lists (mix at will)
+* semicolon-term-colon-definition for definition lists:
+;term here:definition here, as in the <DL><DT><DD> list
+* One line for each item
+* Other leading whitespace signals preformatted text, changes font.
+
+! Headings
+
+* '~!' at the start of a line makes a small heading
+* '~!~!' at the start of a line makes a medium heading
+* '~!~!~!' at the start of a line makes a large heading
+
+! Fonts
+
+* Indent with one or more spaces to use a monospace font:
+
+<pre>
+ This is in monospace
+</pre>
+This is not
+
+!Indented Paragraphs
+
+* semicolon-colon -- works like <BLOCKQUOTE>
+
+;:this is an indented block of text
+
+! Emphasis
+
+* Use doubled single-quotes ('<strong></strong>') for emphasis (usually <em>italics</em>)
+* Use doubled underscores (_<em></em>_) for strong emphasis (usually <strong>bold</strong>)
+* Mix them at will: <strong><em>bold italics</em></strong>
+* <em>Emphasis</em> can be used <em>multiple</em> times within a line, but <em>cannot</em> cross line boundaries:
+
+''this
+will not work''
+
+! References
+* Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred)
+* Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
+* You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/]  - [the front page | HomePage]
+* You can suppress linking to old-style references and URIs by preceding the word with a '~!', e.g. ~NotLinkedAsWikiName, ~http://not.linked.to/
+* You can create footnotes by using ~[1], ~[2], ~[3], ... like this here #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart.  (If the ~[ is in the first column, it is a footnote <em>definition</em> rather than a footnote <em>reference</em> #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>.)
+* Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
+* URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png]
+
+! Tables
+
+* Simple tables are available.  A table row is introduced by a <strong>|</strong> in the first column.  It is best described by example:
+<pre>
+      ||  _<em></em>_Name_<em></em>~_               |v _<em></em>_Cost_<em></em>~_   |v _<em></em>_Notes_<em></em>~_
+      | _<em></em>_First_<em></em>~_   | _<em></em>_Last_<em></em>~_
+      |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
+      |> Marco      |< Polo      | Cheaper     |< Not available
+</pre>
+;:will generate
+<?plugin OldStyleTable
+||  <strong>Name</strong>               |v <strong>Cost</strong>   |v <strong>Notes</strong>
+| <strong>First</strong>   | <strong>Last</strong>
+|> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
+|> Marco      |< Polo      | Cheaper     |< Not available
+?>
+
+;:Note that multiple <strong>|</strong>'s lead to spanned columns, and <strong>v</strong>'s can be used to span rows.  A <strong>></strong> generates a right justified column, <strong><</strong> a left justified column and <strong>^</strong> a centered column (which is the default.)
+;:With the new TextFormatingsRules tables are only supported with the OldStyleTablePlugin.
+
+
+! HTML Mark-Up Language
+
+* Don't bother
+* < and > are themselves
+* The & characters will not work
+* If you really must use HTML, your system administrator can enable this feature. Start each line with a bar (|). Note that this feature is disabled by default.
+
+! More detail than you want to know
+
+See [MagicPhpWikiURLs] for gory details on how to write various kind of wiki maintainance links. (<em>deprecated</em>)
+
+-----
+
+! Footnotes:
+
+#[|ftnt_1]~[[1|#ftnt_ref_1]~]  By using ~[1] a second time (in the first column) the footnote itself is <em>defined</em>.  You may refer to a footnote as many times as you want, but you may only define it once on the page.  Note the the ~[1] in the footnote links back to the first reference, if there are multiple references there will be +'s after the ~[1] which will link to the other references.  (References which come <em>after</em> the footnote <em>definition</em> will not be linked to.)
+----
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/OrphanedPages--1 12p3/tests/unit/.testbox/ver_data/OrphanedPages--1
--- 11p1/tests/unit/.testbox/ver_data/OrphanedPages--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/OrphanedPages--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,5 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:124:"OrphanedPages are those pages which don't have any links to them.
+
+----
+
+<?plugin OrphanedPages info||=hits,pagename,mtime?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PageDump--1 12p3/tests/unit/.testbox/ver_data/PageDump--1
--- 11p1/tests/unit/.testbox/ver_data/PageDump--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PageDump--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,14 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:343:"View a wiki page in MIME format or download it as backup of a single
+page. _A complete dump of all pages can be produced in
+PhpWikiAdministration._
+
+<?plugin PageDump?>
+----
+Enter exact page name to dump:
+<?plugin-form PageDump?>
+
+TitleSearch:
+<?plugin-form TitleSearch?>
+
+----
+See also: [ViewSource|phpwiki:?action=viewsource], PluginManager.";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PageGroupTest--1 12p3/tests/unit/.testbox/ver_data/PageGroupTest--1
--- 11p1/tests/unit/.testbox/ver_data/PageGroupTest--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PageGroupTest--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,23 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:470:"PageGroupTest is a test of the ~PageGroup plugin.
+
+Click the first page to start the tour of this experimental plugin.
+
+!Table of Contents
+# [PageGroupTestOne]
+# [PageGroupTestTwo]
+# [PageGroupTestThree]
+# [PageGroupTestFour]
+
+! TODO
+
+* Support ~[ name | page ~] links
+* Support Previous, Next ... image buttons
+
+%%% %%% %%% %%%
+
+----
+
+For reference, here are all the pages that link to PageGroupTest
+(note that one is missing):
+
+<?plugin BackLinks page=PageGroupTest ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PageGroupTestFour--1 12p3/tests/unit/.testbox/ver_data/PageGroupTestFour--1
--- 11p1/tests/unit/.testbox/ver_data/PageGroupTestFour--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PageGroupTestFour--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,17 @@
+a:6:{s:6:"author";s:12:"CarstenKlapp";s:9:"author_id";s:12:"CarstenKlapp";s:6:"markup";s:1:"2";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:345:"So, this is the last page in this page group.
+
+Note that looping of off on this page, so __Next:__ shouldn't show up
+here but it does because of the bug described in PageGroupTestOne.
+
+%%% %%% %%% %%% %%% %%% %%%
+----
+
+<?plugin PageGroup
+        parent=PageGroupTest
+        section="Table of Contents"
+        loop=false
+?>
+
+----
+
+PageGroupTest";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PageGroupTestOne--1 12p3/tests/unit/.testbox/ver_data/PageGroupTestOne--1
--- 11p1/tests/unit/.testbox/ver_data/PageGroupTestOne--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PageGroupTestOne--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,21 @@
+a:6:{s:6:"author";s:12:"CarstenKlapp";s:9:"author_id";s:12:"CarstenKlapp";s:6:"markup";s:1:"2";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:600:"Ok, this is page one in this page group.
+
+There is a bug. When looping is true (and it is, but only for this
+first page--another possible flaw) and if the Contents title is not
+the first item on the Table of Contents page, and if there are other
+things on the TOC page after the actual list, then things get screwed
+up. Note that the __Previous:__ link below should point to the last
+page. Click Next.
+
+%%% %%% %%% %%% %%% %%% %%%
+
+<?plugin PageGroup
+         label="Other pages in this group"
+         loop=1
+         parent=PageGroupTest
+         section="Table of Contents"
+?>
+
+----
+
+PageGroupTest";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PageGroupTestThree--1 12p3/tests/unit/.testbox/ver_data/PageGroupTestThree--1
--- 11p1/tests/unit/.testbox/ver_data/PageGroupTestThree--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PageGroupTestThree--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,13 @@
+a:6:{s:6:"author";s:12:"CarstenKlapp";s:9:"author_id";s:12:"CarstenKlapp";s:6:"markup";s:1:"2";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:352:"You're almost there!
+
+%%% %%% %%% %%% %%% %%% %%%
+
+<?plugin PageGroup
+         label="Go!"
+         parent=PageGroupTest
+         section="Table of Contents"
+?>
+
+Note that the navigation bar can be anywhere, it doesn't have to be at
+the bottom or even consistent from page to page. The label can also
+vary--not sure if this is a good thing. Click Next.";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PageGroupTestTwo--1 12p3/tests/unit/.testbox/ver_data/PageGroupTestTwo--1
--- 11p1/tests/unit/.testbox/ver_data/PageGroupTestTwo--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PageGroupTestTwo--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"author";s:12:"CarstenKlapp";s:9:"author_id";s:12:"CarstenKlapp";s:6:"markup";s:1:"2";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:368:"<?plugin PageGroup
+         parent=PageGroupTest
+         section="Table of Contents"
+?>
+
+----
+
+%%% %%% %%% %%% %%% %%% %%%
+
+Welcome to page two.
+
+It would be nice if this plugin would work together with BackLinks, so
+that it's presence on a page would be detected by the backlink plugin
+without having to actually add a link to the parent: PageGroupTest.
+
+Click Next.";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PageHistory--1 12p3/tests/unit/.testbox/ver_data/PageHistory--1
--- 11p1/tests/unit/.testbox/ver_data/PageHistory--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PageHistory--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:22:"<?plugin PageHistory?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PageInfo--1 12p3/tests/unit/.testbox/ver_data/PageInfo--1
--- 11p1/tests/unit/.testbox/ver_data/PageInfo--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PageInfo--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:19:"<?plugin PageInfo?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PagePermissions--1 12p3/tests/unit/.testbox/ver_data/PagePermissions--1
--- 11p1/tests/unit/.testbox/ver_data/PagePermissions--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PagePermissions--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,155 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:5507:"!!! Full recursive ACL page permissions supported (Solaris / Windows style)
+
+Boolean permissions per page and action (*granted* or *denied*) based on the current users
+group membership is implemented with ACL's (Access Control Lists).
+Opposed to the simplier unix like ugo:rwx system. <br>
+The previous system was only based on action and current user, independent of pages.
+
+A individual page permission may be inherited from its parent pages, and
+from an optional master page ("." or _dotpage'). <br>
+Use predefined default permissions, if a "." page does not exist. <br>
+Pagenames starting with "." have tighter default permissions. (edit, change, list disallowed)
+
+! Order of Evaluation (denial overrides granted, or vice versa?)
+
+The array of permissions is evaluated from top to bottom. <br>
+Access is granted if the next matching *group membership* returns true, denied if false. <br>
+If the group membership is false, the next group is tried. <br>
+If no group membership matches the upper permissions are tried recursively: <br>
+  current page => basepage => "." page => default perms. <br>
+If no group-perm pair grants access, access is denied.
+
+Consider the following perm:
+<verbatim>
+     'change' => array(ACL_ADMIN => false,
+                       ACL_OWNER => true));
+</verbatim>
+  => "Members of ADMIN may not change, the owner may change."
+
+-----
+
+For Authentication see ~WikiUserNew.php, ~WikiGroup.php and main.php
+Page Permissions are in PhpWiki since v1.3.9.
+I suspect ACL page permissions to degrade performance by 10%
+
+Enable/Disable it in config/config.ini:
+
+  ENABLE_PAGEPERM = true
+
+The defined (and extendable) main.php actions map to simplier access types:
+<verbatim>
+       browse => view
+       edit   => edit
+       create => edit or create
+       remove => remove
+       rename => change
+       store prefs => change
+       list in PageList => list
+</verbatim>
+
+For simplicity we also map the ACL to the posix-style _owner_, _group_ and _world_ groups
+and _read_, _write_, _execute_ perms, in cygwin fashion.
+
+!!! Groups - definition of group membership
+
+See WikiGroup how to enable and where to store user-specific group membership.
+Group methods: database, file, ldap, wikipage, none
+
+ToDo: _explain better._
+
+The following special groups are always predefined, even if no other group methods are provided:
+
+* _EVERY
+* _ANONYMOUS
+* _BOGOUSER
+* _HASHOMEPAGE
+* _SIGNED
+* _AUTHENTICATED
+* _ADMIN
+* _OWNER
+* _CREATOR
+
+Those special groups are stored in a page acl as locale-independent string.
+  *Todo*: See the available translations for these special groups.
+Other group names are safed as defined by the group methods. (e.g. "Other Users")
+
+!!! Perms - mapping of actions to permissions
+
+PhpWiki supports individual actions, the default is browse. To simplify ACL's these
+actions are mapped to some special permissions (vulgo _'perms'_).
+
+We currently support the following permissions which can be stored in every page, for every group.
+
+* 'list'     List this page and all subpages (for PageList)
+* 'view'     View this page and all subpages
+* 'edit'     Edit this page and all subpages
+* 'create'   Create a new (sub)page
+* 'dump'     Download the page contents
+* 'change'   Change page attributes
+* 'remove'   Remove this page
+
+There are no plans to support additional custom perms. The API can handle that, but there's no UI,
+and it would be only specific for certain plugins, which check permissions by their own.
+
+! Action <=> Perm mapping
+
+Those perms are mapped to those actions. ActionPages (plugins) check their access restrictions by themselves.
+
+list:
+  _none, 'list' is checked for every pagename listed in PageList, to prevent from being listed in AllPages._
+
+view:
+  browse, viewsource, diff, select, xmlrpc, search, pdf
+
+dump:
+  zip, ziphtml, dumpserial, dumphtml
+
+edit:
+  revert, edit
+
+create:
+  _edit or create, if the page doesn't exist yet_
+
+change:
+  upload, loadfile, remove, lock, unlock, upgrade, chown, setacl, rename. %%%
+  all other actionpages which are not wikiwords.
+
+!! Default Permissions
+
+<verbatim>
+        $perm = array('view'   => array(ACL_EVERY => true),
+                      'edit'   => array(ACL_EVERY => true),
+                      'create' => array(ACL_EVERY => true),
+                      'list'   => array(ACL_EVERY => true),
+                      'remove' => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true),
+                      'change' => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true));
+        if (ZIPDUMP_AUTH)
+            $perm['dump'] = array(ACL_ADMIN => true,
+                                  ACL_OWNER => true);
+        else
+            $perm['dump'] = array(ACL_EVERY => true);
+        // view:
+        if (!ALLOW_ANON_USER) {
+            if (!ALLOW_USER_PASSWORDS)
+            	$perm['view'] = array(ACL_SIGNED => true);
+            else
+            	$perm['view'] = array(ACL_AUTHENTICATED => true);
+            $perm['view'][ACL_BOGOUSER] = ALLOW_BOGO_LOGIN ? true : false;
+        }
+        // edit:
+        if (!ALLOW_ANON_EDIT) {
+            if (!ALLOW_USER_PASSWORDS)
+            	$perm['edit'] = array(ACL_SIGNED => true);
+            else
+            	$perm['edit'] = array(ACL_AUTHENTICATED => true);
+            $perm['edit'][ACL_BOGOUSER] = ALLOW_BOGO_LOGIN ? true : false;
+            $perm['create'] = $perm['edit'];
+        }
+        return $perm;
+</verbatim>
+
+Source: [PhpWikiCvs:lib/PagePerm.php]
+-----
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,136 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625920;s:8:"%content";s:2913:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
+link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki and what languages they have been translated
+to. If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin ListSubpages ?>
+
+!! More important translations (static)
+
+''Automatically generated pages'' |
+ English (en) |
+  Deutsch (de) |
+   Espaol (es) |
+    Franais (fr) |
+     Italiano (it) |
+      Japanese (ja) |
+       Nederlands (nl) |
+        Svenska (sv)
+ Diff: |
+  Vergleich: |
+   Diferencia de: |
+    Diff : |
+     Differenza di: |
+      ʬ: |
+       Diff van: |
+        Diff av:
+ Edit: |
+  Bearbeite: |
+   Editar: |
+    diter : |
+     Modifica: |
+      Խ: |
+       Verander: |
+        Redigera:
+ Remove Page |
+  Seite Lschen |
+   Borrar Pgina |
+    Supprimer la Page |
+     Rimuovi la Pagina |
+      ڡ |
+       Verwijder Pagina |
+        Ta bort Sida
+ Sign In |
+  Anmelden |
+   _ |
+    S'inscrire |
+     _ |
+      󥤥 |
+       _ |
+        _
+ View Source: |
+  Quell Text: |
+   _ |
+    Afficher la Source : |
+     _ |
+      򸫤: |
+       _ |
+        Bron Tekst:
+
+Translator's page |
+ English (en) |
+  Deutsch (de) |
+   Espaol (es) |
+    Franais (fr) |
+     Italiano (it) |
+      Japanese (ja) |
+       Nederlands (nl) |
+        Svenska (sv)
+ n/a |
+  [ReiniUrban|PhpWiki:ReiniUrban] |
+   [KBrown|PhpWiki:KBrown] |
+    [RolandTrique|PhpWiki:RolandTrique] |
+     [MarcoMilanesi|PhpWiki:MarcoMilanesi] |
+      [TadashiJokagi|PhpWiki:TadashiJokagi] |
+       [JanNieuwenhuizen|PhpWiki:JanNieuwenhuizen] |
+        [Jonslund|PhpWiki:Jonslund]
+
+Obsolete Pages |
+ English (en) |
+  Deutsch (de) |
+   Espaol (es) |
+    Franais (fr) |
+     Italiano (it) |
+      Japanese (ja) |
+       Nederlands (nl) |
+        Svenska (sv)
+ ConvertTabsToSpaces |
+  KonvertiereLeerzeichenZuTabs |
+   ConvierteEspaciosEnTabs |
+    ConvertirTabEnEspaces |
+     ConvertiGliSpaziInTab |
+      _ |
+       VertaalSpatiesNaarTabs |
+        KonverteraMellanslagTillTabbar
+
+!! Notes
+! These pages do not automatically link as ~WikiWords:
+es:
+    [KBrown]
+en:
+    [MagicPhpWikiURLs]
+fr:
+    [BacASable]
+    [URLMagiquesPhpWiki]
+it:
+    [MagicPhpWikiURLs]
+nl:
+    [ToverPhpWikiURLs]
+
+! These pages have single word titles so ~[square brackets] are required to link.
+
+fr:
+    [Accueil]
+sv:
+    [Framsida]
+    [Gstboken]
+    [Sandldan]
+    [Textformateringsregler]
+
+! Problematic Single-Word Action Pages
+
+These action pages have single word titles, and must be renamed using two words before they will work in PhpWiki 1.3.5:
+
+fr:
+    [Historique]
+    [Info]
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation, PhpWikiDemo:de/PhpWikiDokumentation, PhpWikiDemo:fr/DocumentationDePhpWiki";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fde--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fde--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fde--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fde--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:543:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
+link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki translated into this special language.
+If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin _WikiTranslation languages=en,de ?>
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation, PhpWikiDemo:de/PhpWikiDokumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fes--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fes--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fes--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fes--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:506:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
+link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki translated into this special language.
+If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin _WikiTranslation languages=en,es ?>
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Ffr--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Ffr--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Ffr--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Ffr--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:506:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
+link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki translated into this special language.
+If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin _WikiTranslation languages=en,fr ?>
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fit--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fit--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fit--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fit--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:506:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
+link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki translated into this special language.
+If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin _WikiTranslation languages=en,it ?>
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fja--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fja--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fja--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fja--1	2006-06-18 06:20:02.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:507:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:ja/PgsrcTranslation], where the
+page names actually link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki translated into this special language.
+If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin _WikiTranslation languages=en,ja ?>
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fnl--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fnl--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fnl--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fnl--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:506:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
+link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki translated into this special language.
+If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin _WikiTranslation languages=en,nl ?>
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fzh--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fzh--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fzh--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation%2Fzh--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:507:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:zh/PgsrcTranslation], where the
+page names actually link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki translated into this special language.
+If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin _WikiTranslation languages=en,zh ?>
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation_sv--1 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation_sv--1
--- 11p1/tests/unit/.testbox/ver_data/PgsrcTranslation_sv--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PgsrcTranslation_sv--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,16 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:506:"__Note:__ This page is much more impressive on the
+[demo server|PhpWikiDemo:en/PgsrcTranslation] where the page names actually
+link.
+
+__What you are looking at:__ This table shows all the default pages
+that ship with PhpWiki translated into this special language.
+If you click on a "T" you can contribute a missing translation.
+
+!! Translated Page Name Matrix (dynamic)
+
+<?plugin _WikiTranslation languages=en,sv ?>
+
+----
+
+See also: PhpWiki:MultiLingualWiki, PhpWiki:LanguageSelection,
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhotoAlbumPlugin--1 12p3/tests/unit/.testbox/ver_data/PhotoAlbumPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/PhotoAlbumPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhotoAlbumPlugin--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,79 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:2061:"!!! Summary
+Makes an 'album' by displaying a set of photos listed in a text file
+with optional descriptions.
+
+!!! Usage
+<verbatim>
+<?plugin PhotoAlbum
+         src=http://server/textfile
+         mode=[column|row]
+         align=[center|left|right]
+         desc=true
+         sort=false
+         height=100%
+         width=100%
+         weblocation=>false
+?>
+</verbatim>
+
+!!! Arguments
+''Only the ='src'= parameter is mandatory.''
+
+__src__:
+  Url or local path to a CSV textfile which separates filename and
+  description of
+  each photo. Photos listed in the text file have to be in same
+  directory as the file. Descriptions are optional.
+  If the the local path points to a directory, is relative from PHPWIKI_DIR,
+  and the main script is in PHPWIKI_DIR, weblocation must not be given, and
+  all pictures from this directory are displayed.
+
+__weblocation__:
+  Optional path if the src points to a local dir, and the links on the
+  photos don't work.
+
+__mode__:
+  Specifies how the images are arranged, ='column'= means vertically,
+  ='row'= means horizontally. Default is ='row'=.
+
+__align__:
+  Only applicable to column mode. Default is ='center'=.
+
+__desc__:
+  Display any descriptions given in the text file. Default is true.
+
+__sort__:
+  Sort images by file name. By default the order in the text file is
+  followed.
+
+__height__, __width__:
+  Height and width are calculated compared to original metrics
+  retrieved by [php-function:getimagesize] and can be absolute or a
+  percentage (e.g. "50%").
+
+!!! Examples
+!! Text file
+Possible content of a valid text file:
+
+<verbatim>
+photo-01.jpg; My girlfriend and I
+photo-02.jpg
+christmas.gif; Merry Christmas!
+</verbatim>
+
+!! Sample Album
+local dir:
+<?plugin PhotoAlbum
+         src="themes/Hawaiian/images/pictures/"
+?>
+or via external url:
+<verbatim>
+<?plugin PhotoAlbum
+         src="http://phpwiki.sourceforge.net/demo/themes/Hawaiian/images/pictures/PhotoAlbum.csv"
+</verbatim>
+?>
+
+!!! Plugin Author
+[Ted Vinke|mailto:teddy@jouwfeestje.com] <teddy@jouwfeestje.com>
+----
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpHighlightPlugin--1 12p3/tests/unit/.testbox/ver_data/PhpHighlightPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/PhpHighlightPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpHighlightPlugin--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,104 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:2722:"The PhpHighlightPlugin pretty-prints PHP code using the
+php-function:highlight-string.
+
+See also SyntaxHighlighterPlugin for highlighting other languages.
+
+!!! Usage
+
+You specify options for the plugin on the same line as the =<?plugin=,
+and put the code on the following lines, until the final =?>=:
+
+<verbatim>
+<?plugin PhpHighlight [wrap?] [color options]
+code to be highlighted
+?>
+</verbatim>
+
+!!! Description
+
+Depending on the =wrap= option, then the plugin will take care of
+adding =<?php= and =?>= to the code before passing it to
+php-function:highlight-string. If the PHP delimiters were added, then
+the plugin removes them again from the highlighted string, before
+presenting it.
+
+!!! Options
+
+Automatic Wrapping:
+
+  If you don't want the plugin to automatically wrap the source code
+  in =<?php= and =?>=, then set =wrap= to =0=. The default value is =1=
+  which means that the plugin takes care of adding and removing
+  =<?php= and =?>= automatically.
+
+  If you set =wrap= to =0=, then you'll be able to mix PHP code with
+  HTML. The plugin will then translate '=< ?php=' into '=<?php=' and
+  '=? >=' into '=?>=' to allow you to start and stop PHP mode in your
+  code.
+
+Color Options:
+
+  The plugin accepts optional color arguments which correspond to the
+  highlight settings in *php.ini*. Specified colors must be a valid
+  hexadecimal color or
+  [HTML 4 color name|http://www.w3.org/TR/REC-html40/types.html#h-6.5]
+  in lowercase, such as ='#0f0344'= or =blue=. You can set the
+  following options:
+
+  =string=, =comment=, =keyword=, =bg=, =default=, and =html=
+
+!!! Examples
+
+!! PHP with default colors from =php.ini=:
+
+<?plugin PhpHighlight
+function hello() {
+    echo "Hello World<p>";
+}
+?>
+
+!! HTML with embedded PHP
+
+Here we have to use =wrap=0= to prevent automatic wrapping, and escape
+'=?>=' as '=? >=':
+
+<?plugin PhpHighlight wrap=0 html='#000000' bg='#dddddd'
+<html>
+  <head>
+    <title>PHP Test</title>
+  </head>
+  <body>
+    < ?php echo "<p>Hello World</p>\n"; ? >
+  </body>
+</html>
+?>
+
+!! C Source
+
+Although =highlight_string()= was designed with PHP code in mind it is
+suitable for basic syntax-highlighting of most C code because the two
+syntax are similar.
+
+<?plugin PhpHighlight default=black string=blue comment=gray keyword=purple
+#include <stdio.h>
+/* Get load */
+int
+getload(void)
+{
+    if ((fp = fopen("/proc/loadavg", "r")) == NULL) {
+        syslog(LOG_ERR, _("%s %s: unable to open %s: %s"), _("FATAL ERROR:"),
+              "getload()", "/proc/loadavg", strerror(errno));
+        exit(EX_OSFILE);
+    }
+    fclose(fp);
+}
+?>
+
+!!! Authors
+
+Martin Geisler mailto:gimpster@gimpster.com and Carsten Klapp
+mailto:carstenklapp@users.sourceforge.net.
+
+-----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWeatherPlugin--1 12p3/tests/unit/.testbox/ver_data/PhpWeatherPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWeatherPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWeatherPlugin--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,62 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:2176:"!!! Synopsis
+
+The ~PhpWeatherPlugin is a WikiPlugin that uses PhpWeather to display
+a block of text with the current weather for some airport in the
+world. It looks like this:
+
+<?plugin PhpWeather menu=true ?>
+
+!!! Plugin Arguments
+
+__menu__:
+  Set this to =true= to have the plugin generate a menu after the
+  report. The user will able to select a country from this menu, and
+  after that, an airport and a language. The default value is
+  <tt>false</tt>.
+
+__icao__:
+  Use this to pre-select a specific airport instead of using the
+  default one which is <tt>EKAH</tt>. If you want the user to be able
+  to change the station using the menu, then you have to use this as
+  <verbatim>
+  <?plugin PhpWeather menu=true icao||=EKYT ?>
+  </verbatim>
+  so that the value can be overwritten when the user submits the
+  form. If you just use
+  <verbatim>
+  <?plugin PhpWeather menu=true icao=EKYT ?>
+  </verbatim>
+  then nothing will happen when the user selects another station from
+  the list.
+
+__cc__:
+  Specify the country code. You can use this if you want pre-select a
+  different country than the one specified in the ICAO. So using
+  <verbatim>
+  <?plugin PhpWeather menu=true cc||=GB icao||=KTTS ?>
+  </verbatim>
+  will show the current weather at the NASA Shuttle Facility, United
+  States (<tt>KTTS</tt>) and at the same time give the user a list of
+  stations in the United Kingdom. As the example shows, then you
+  should use <tt>cc||=XX</tt> when combining it with __menu__ set to
+  <tt>true</tt>.
+
+__language__:
+  The default language. When combining __language__ with __menu__ set
+  to <tt>true</tt> then remember to use the <code>language||=xx</code>
+  form.
+
+__units__:
+  You can specify the way the units are printed. The choice is between
+  having both metric and imperial units printed, or just one of
+  them. Setting __units__ to =both_metric= will print the metric value
+  first and then the imperial value in parenthesis. Using
+  =both_imperial= instead will do the opposite.
+
+  If you only need the metric or imperial units to be shown, then
+  setting __units__ to =only_metric= or =only_imperial= will do just
+  that.
+
+----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWiki--1 12p3/tests/unit/.testbox/ver_data/PhpWiki--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWiki--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWiki--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,9 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:247:"You are using PhpWiki at this very moment. Incredible, ain't it?
+
+Visit our home page at http://phpwiki.sourceforge.net/ and see PhpWiki
+in action at http://phpwiki.sourceforge.net/phpwiki/ (and of course
+here too :-)).
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration--1 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,222 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:6687:"_*Note:*_  _Most of the actions on this page require administrative
+privileges. They will not work unless you have set an admin username and
+password in the PhpWiki config file._
+
+<?plugin CreateToc jshide||=1 with_toclink||=1 ?>
+
+----
+!!! Page Explorer
+
+First select pages and then define the action:
+
+<?plugin-form WikiAdminSelect s="*" ?>
+
+or call the available ~WikiAdmin actions directly:
+
+[/Remove] |
+  [/Rename] |
+    [/Replace] |
+      [/SetAcl] |
+        [/Chmod] |
+          [/Chown]
+
+----
+!!! User Management
+
+PhpWiki:EmailVerification is currently non-strict, leaving some possible holes, which can be
+administrated below.
+
+  This button will show a list of all users with registered emails and buttons to set the
+  verification status manually.
+
+  <?plugin WikiAdminUtils
+           action=email-verification
+           label="Email Verification"
+   ?>
+
+To prevent from robots eating all possible ressources in a short time, blocking from certain IPs
+or not-well-behaving user agents can be defined below. See PhpWiki:HowToBlockRobots and
+MeatBall:SurgeProtector. _Note: Not yet enabled._
+
+  <?plugin WikiAdminUtils
+           action=access-restrictions
+           label="Access Restrictions"
+   ?>
+
+----
+!!! Cleanup
+
+A Wiki SandBox is very easy to clean. Here you can restore it to
+pristine condition by loading the default from pgsrc.
+
+  [Rake the SandBox|phpwiki:?action=loadfile&source=pgsrc/SandBox].
+
+----------
+
+!!! Making Snapshots or Backups
+
+!! ZIP files of database
+
+These links lead to zip files, generated on the fly, which contain all
+the pages in your Wiki. The zip file will be downloaded to your local
+computer.
+
+  This *[ZIP Snapshot | phpwiki:?action=zip]* contains only the
+  latest versions of each page, while this *[ZIP Dump |
+  phpwiki:?action=zip&include=all]* contains all archived versions.
+
+  (If the PhpWiki is configured to allow it, anyone can download a zip
+  file.)
+
+If your php has _zlib_ support, the files in the archive will be
+compressed, otherwise they will just be stored.
+
+!! Dump to directory
+
+Here you can dump pages of your Wiki into a directory of your choice.
+
+  <?plugin WikiForm action=dumpserial?>
+
+The most recent version of each page will written out to the
+directory, one page per file. Your server must have write permissions
+to the directory!
+
+-----------
+!!! Restoring
+
+If you have dumped a set of pages from PhpWiki, you can reload them
+here. Note that pages in your database will be overwritten; thus, if
+you dumped your HomePage when you load it from this form it will
+overwrite the one in your database now. If you want to be selective
+just delete the pages from the directory (or zip file) which you don't
+want to load.
+
+!! Upload File
+
+Here you can upload ZIP archives, or individual files from your
+(client) machine.
+
+  <?plugin WikiForm action=upload?>
+
+!! Load File
+
+Here you can load ZIP archives, individual files or entire
+directories. The file or directory must be local to the http
+server. You can also use this form to load from an http: or ftp: URL.
+
+  <?plugin WikiForm action=loadfile?>
+  <?plugin WikiForm action=loadfile buttontext="Load & Overwrite" overwrite=1?>
+
+!! Upgrade
+
+Do some verification checks and upgrade changes automatically, after having installed a
+new phpwiki engine update:
+* Upgrade new or changed page revisions from pgsrc,
+* Upgrade the database schema (mysql _page.id auto_increment_, ADD _session.sess_ip_),
+
+;:[ Upgrade | phpwiki:HomePage?action=upgrade ]
+
+-----------
+
+!!! Format of the files
+
+Currently the pages are stored, one per file, as MIME (RFC:2045)
+e-mail (RFC:822) messages. The content-type _application/x-phpwiki_
+is used, and page meta-data is encoded in the content-type
+parameters. (If the file contains several versions of a page, it will
+have type _multipart/mixed_, and contain several sub-parts, each
+with type _application/x-phpwiki_.)  The message body contains the
+page text.
+
+!! Old Formats
+
+*Serialized Files*
+
+  The dump to directory command used to dump the pages as PHP
+  _serialized()_ strings. For humans, this made the files very hard
+  to read, and nearly impossible to edit.
+
+*Plain Files*
+
+  Before that the page text was just dumped to a file--this means that
+  all page meta-data was lost. Note that when loading _plain files_,
+  the page name is deduced from the file name.
+
+The upload and load functions will automatically recognize each of
+these three types of files, and handle them accordingly.
+
+----
+
+!!! Dump pages as XHTML
+
+  <?plugin WikiForm action=dumphtml?>
+
+This will generate a directory of static pages suitable for
+distribution on disk where no web server is available. The various
+links for page editing functions and navigation are removed from the
+pages.
+
+  The XHTML file collection can also be downloaded as an
+  *[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]*.
+
+----
+
+!!! Phpwiki Internals
+
+These are here mostly for debugging purposes (at least, that is the
+hope.)
+
+In normal use, you should not need to use these, though, then again,
+they should not really do any harm.
+
+!! Purge Markup Cache
+
+(If your wiki is so configured,) the transformed (almost-HTML) content
+of the most recent version of each page is cached. This speeds up page
+rendering since parsing of the wiki-text takes a fair amount of juice.
+
+  Hitting this button will delete all cached transformed
+  content. (Each pages content will be transformed and re-cached next
+  time someone views it.)
+
+  <?plugin WikiAdminUtils
+           action=purge-cache
+           label="Purge Cache"
+   ?>
+
+!! Clean WikiDB of Illegal Filenames
+
+Page names beginning with the subpage-separator, usually a slash
+(=/=), are not allowed. Sometimes though an errant plugin or something
+might create one....
+
+  This button will delete any pages with illegal page names, without possibility to restore.
+
+  <?plugin WikiAdminUtils
+           action=purge-bad-pagenames
+           label="Purge bad pagenames"
+   ?>
+
+!! Clean WikiDB of empty and unreferenced pages
+
+  *Warning!* This button will delete every empty and unreferenced page, without any possibility to restore them again.
+  This will disable the possibility to revert or get back any deleted page.
+
+  <?plugin WikiAdminUtils
+           action=purge-empty-pages
+           label="Purge all empty unreferenced pages"
+   ?>
+
+!! Convert cached_html to new SQL column
+
+  This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the
+  new page.cached_html field seperately, and now you want to move this data from
+  page.pagedata over to page.cached_html.
+
+  <?plugin WikiAdminUtils
+           action=convert-cached-html
+           label="Convert cached_html"
+   ?>
+
+----
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FChmod--1 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FChmod--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FChmod--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FChmod--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625921;s:8:"%content";s:26:"<?plugin WikiAdminChmod ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FChown--1 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FChown--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FChown--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FChown--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:26:"<?plugin WikiAdminChown ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FRemove--1 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FRemove--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FRemove--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FRemove--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:27:"<?plugin WikiAdminRemove ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FRename--1 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FRename--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FRename--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FRename--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:27:"<?plugin WikiAdminRename ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FReplace--1 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FReplace--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FReplace--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FReplace--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:34:"<?plugin WikiAdminSearchReplace ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FSetAcl--1 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FSetAcl--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FSetAcl--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiAdministration%2FSetAcl--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:27:"<?plugin WikiAdminSetAcl ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiDocumentation--1 12p3/tests/unit/.testbox/ver_data/PhpWikiDocumentation--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiDocumentation--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiDocumentation--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,19 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:348:"!! Contents
+
+<?plugin SiteMap
+         noheader=true
+         exclude=HomePage,PgsrcTranslation
+         reclimit=1
+         direction=forward
+         firstreversed=1
+?>
+
+! Pages in this category:
+
+<?plugin BackLinks
+         exclude||=''
+         include_self||=1
+         noheader||=0
+         page||=[pagename]
+         info||=pagename,mtime
+?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiPoll--1 12p3/tests/unit/.testbox/ver_data/PhpWikiPoll--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiPoll--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiPoll--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,15 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:836:"<?plugin WikiPoll require_all=0 require_least=2
+           question[1]="Do you like PhpWiki?"
+             answer[1][1]="Yes" answer[1][2]="Do not know" answer[1][3]="No"
+           question[2]="Do you have PhpWiki installed by your own?"
+             answer[2][1]="Yes" answer[2][2]="No"
+           question[3]="Did you install any other wiki engine?"
+             answer[3][1]="Yes" answer[3][2]="No"
+           question[4]="What wiki engine do you like most?"
+             answer[4][1]="c2Wiki" answer[4][2]="MoinMoin" answer[4][3]="PhpWiki"
+             answer[4][4]="usemod" answer[4][5]="Twiki" answer[4][5]="guiki"
+             answer[4][6]="Other"
+           question[5]="Which PhpWiki version do you use?"
+             answer[5][1]="1.2.x" answer[5][2]="1.3. 1-2" answer[5][3]="1.3. 3-4"
+             answer[5][4]="1.3. 5-8"
+?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PhpWikiRecentChanges--1 12p3/tests/unit/.testbox/ver_data/PhpWikiRecentChanges--1
--- 11p1/tests/unit/.testbox/ver_data/PhpWikiRecentChanges--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PhpWikiRecentChanges--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,5 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:186:"<?plugin RssFeed feed=PhpWikiRecentChanges description="PhpWiki:RecentChanges"
+	         url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss ?>
+
+----
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PloticusPlugin--1 12p3/tests/unit/.testbox/ver_data/PloticusPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/PloticusPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PloticusPlugin--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,105 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:2281:"The Ploticus WikiPlugin passes all its arguments to the ploticus
+binary and displays the result as PNG, GIF, EPS, SVG, SVGZ or SWF.
+Ploticus is a free, GPL, non-interactive software package
+for producing plots, charts, and graphics from data.
+See http://ploticus.sourceforge.net/doc/welcome.html
+
+!! Usage
+<verbatim>
+  <?plugin Ploticus device||=png [ploticus options...]
+     multiline ploticus script ...
+  ?>
+</verbatim>
+
+!! Plugin Arguments
+__device__: |
+  gif, png, jpeg or svg. Soon also PS or SWG. Default: png
+__data__:  |
+  optionally add data by <!plugin-list !> pagelist plugins.
+__alt__:  |
+  alt text for the image
+__-prefab__:  |
+  use the given prefab script (may need $_ENV~['PLOTICUS_PREFABS'~])
+__-csmap__:  |
+  If a clickable map should be produced (not yet tested)
+__help__:  |
+  Show a help screen (not yet)
+
+!! Known Problems
+
+# For windows you need either a gd library with GIF support or
+  a ploticus with PNG support. This comes only with the cygwin
+  build so far.
+# We support only images supported by GD (PNG most likely) and now
+  also SVG. MAP support not yet tested. No EPS, PS or SWG support yet.
+
+!! Examples
+
+<?plugin Ploticus device||=png
+#proc page
+#if @DEVICE in gif,png
+  scale: 0.7
+#endif
+
+//  specify data using {proc getdata}
+#proc getdata
+data:	Brazil 22
+	Columbia 17
+	"Costa Rica" 22
+	Guatemala 3
+	Honduras 12
+	Mexico 14
+	Nicaragua 28
+	Belize 9
+ 	United\nStates 21
+	Canada 8
+
+//  render the pie graph using {proc pie}
+#proc pie
+firstslice: 90
+explode: .2 0 0 0 0  .2 0
+datafield: 2
+labelfield: 1
+labelmode: line+label
+center: 4 4
+radius: 2
+colors: yellow pink pink pink pink yellow pink
+labelfarout: 1.05
+?>
+
+The pie chart above was produced by this code from the ploticus
+testsuite:
+
+<verbatim>
+<?plugin Ploticus device||=png alt="Sample Pie Chart"
+#proc page
+#if @DEVICE in gif,png
+  scale: 0.7
+#endif
+
+//  specify data using {proc getdata}
+#proc getdata
+data:	Brazil 22
+	Columbia 17
+	"Costa Rica" 22
+	Guatemala 3
+	Honduras 12
+	Mexico 14
+	Nicaragua 28
+	Belize 9
+ 	United\nStates 21
+	Canada 8
+
+//  render the pie graph using {proc pie}
+#proc pie
+firstslice: 90
+explode: .2 0 0 0 0  .2 0
+datafield: 2
+labelfield: 1
+labelmode: line+label
+center: 4 4
+radius: 2
+colors: yellow pink pink pink pink yellow pink
+labelfarout: 1.05
+?>
+</verbatim>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/PluginManager--1 12p3/tests/unit/.testbox/ver_data/PluginManager--1
--- 11p1/tests/unit/.testbox/ver_data/PluginManager--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/PluginManager--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,35 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:2122:"PhpWiki lets you extend it with new functionality via a plugin
+mechanism. In short, you extend a PHP class we provide and customize
+it to print out the content you want. For more information see
+WikiPlugin, HelloWorldPlugin, and view the source of the files in
+<tt>lib/plugin</tt>.
+
+If there is no example page for the plugin, or you need more
+information, the best place to go is the source of the plugin. Under
+your wiki's root directory, the folder <tt>lib/plugin</tt> contains all the PHP
+files for the plugins.
+
+! External Requirements
+Some plugins require correctly configured PLUGIN_CACHED and external libraries
+not provided with PhpWiki or PHP, such as
+* [PHP with GD support | php-function:ref.image] for the text2png plugin,
+* [LaTeX2HTML | ftp://ftp.dante.de/tex-archive/support/latex2html ] for the TexToPngPlugin and TeX2pngPlugin,
+* [graphviz | http://graphviz.org/] for the GraphVizPlugin and VisualWikiPlugin,
+* [ploticus | http://ploticus.sourceforge.net/] for the PloticusPlugin,
+* [phpweather | http://phpweather.sf.net] for the PhpWeatherPlugin,
+* [highlight | http://www.andre-simon.de/] for the SyntaxHighlighterPlugin,
+* a browser with [<iframe> support|http://www.cs.tut.fi/~jkorpela/html/iframe.html] for the TranscludePlugin,
+* USE_DB_SESSION = true (default for the peardb, adodb or dba backends) for the WhoIsOnline plugin,
+* --with-xml support (with expat or libxml2) for the ~RssFeed plugin (ProjectSummary, RecentReleases) and
+  HtmlParser support (ImportHtml, HtmlAreaEditing),
+* PHP Mail functionality (php.ini: SMTP + sendmail_from on Windows or sendmail_path) for email
+  PageChangeNotifications and ModeratedPage's,
+* a [Google license key | http://www.google.com/apis/] for the GooglePlugin,
+* optionally an external recommender engine (none yet, php only so far) and the wikilens theme for the RateIt plugin,
+* optionally apache/mod_log_{my}sql for fast, external log analysis if ACCESS_LOG_SQL=1 (Referer, Abuse Prevention).
+  See <tt>lib/Request.php</tt> and http://www.outoforder.cc/projects/apache/mod_log_sql/
+
+-----
+<?plugin PluginManager?>
+----
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/ProjectSummary--1 12p3/tests/unit/.testbox/ver_data/ProjectSummary--1
--- 11p1/tests/unit/.testbox/ver_data/ProjectSummary--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/ProjectSummary--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:88:"<?plugin RssFeed url=http://sourceforge.net/export/rss2_projsummary.php?group_id=6121 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RandomPage--1 12p3/tests/unit/.testbox/ver_data/RandomPage--1
--- 11p1/tests/unit/.testbox/ver_data/RandomPage--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RandomPage--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:35:"<?plugin RandomPage numpages||=20?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RateIt--1 12p3/tests/unit/.testbox/ver_data/RateIt--1
--- 11p1/tests/unit/.testbox/ver_data/RateIt--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RateIt--1	2006-06-18 06:20:03.000000000 -0500
@@ -0,0 +1,4 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:80:"<?plugin RateIt show=ratings ?>
+
+%%%
+<?plugin AllPages info=rating limit||=25 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RawHtmlPlugin--1 12p3/tests/unit/.testbox/ver_data/RawHtmlPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/RawHtmlPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RawHtmlPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,46 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:1796:"<b>With this plugin you can embed raw unfiltered HTML in the page source; say, for example, you want to put in a complicated set of nested tables to display data. By default, raw HTML is not allowed in most Wikis due to security problems (because malicious users can insert redirects, Javascript, etc.)</b>
+
+<b>For this plugin to work, the page must be locked by the administrator. If you are seeing the raw HTML being displayed below, instead of rendered, try locking the page (log in as the administrator first).</b>
+
+<?plugin RawHtml
+
+<!-- Keep link lines at 72 characters or lynx will break them poorly. -->
+<!-- Obviously, we list ONLY the most useful/important URLs here. -->
+<!-- Keep it short and sweet: 3 lines and 2 columns is already enough -->
+
+<table border="1" cellpadding="10">
+<tr><td>Sample HTML from www.gnu.org</td>
+<td>
+
+<!-- Keep link lines at 72 characters or lynx will break them poorly. -->
+<!-- Obviously, we list ONLY the most useful/important URLs here. -->
+<!-- Keep it short and sweet: 3 lines and 2 columns is already enough -->
+
+<table>
+  <tr>
+    <td align="left">
+    <ul>
+      <li><a href="http://www.gnu.org//provide.html">What we provide</a></li>
+      <li><a href="http://www.gnu.org//philosophy/philosophy.html">Why we exist</a></li>
+
+      <li><a href="http://www.gnu.org//gnu/gnu-history.html">Where we are going</a></li>
+    </ul>
+    </td>
+    <td>
+    <ul>
+      <li><a href="http://www.gnu.org//help/help.html">How you can help us get there</a></li>
+      <li><a href="http://www.gnu.org//people/people.html">Who we are</a></li>
+
+      <li><a href="http://www.gnu.org//testimonials/testimonials.html">What users think of GNU software</a></li>
+    </ul>
+    </td>
+  </tr>
+</table>
+</td>
+</tr>
+</table>
+?>
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RecentChanges--1 12p3/tests/unit/.testbox/ver_data/RecentChanges--1
--- 11p1/tests/unit/.testbox/ver_data/RecentChanges--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RecentChanges--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,5 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625922;s:8:"%content";s:195:"Here's a list of recently changed pages on this wiki. (See RecentEdits
+for all recent minor edits and changes).
+
+--------
+<?plugin RecentChanges days||=7 daylist=1,3,7,30,90,0 show_deleted||=1 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RecentComments--1 12p3/tests/unit/.testbox/ver_data/RecentComments--1
--- 11p1/tests/unit/.testbox/ver_data/RecentComments--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RecentComments--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625923;s:8:"%content";s:57:"<?plugin RecentComments days||=7 daylist=1,3,7,30,90,0 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RecentEdits--1 12p3/tests/unit/.testbox/ver_data/RecentEdits--1
--- 11p1/tests/unit/.testbox/ver_data/RecentEdits--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RecentEdits--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,6 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625923;s:8:"%content";s:269:"Here's a list of recently edited pages on this wiki. All minor changes
+are shown also, not just the most recent ones. (See RecentChanges for the
+most recent non-minor changes).
+
+--------
+<?plugin RecentChanges days||=3 show_all||=1 show_minor=1 daylist=1,3,7,30,90,0 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RecentReleases--1 12p3/tests/unit/.testbox/ver_data/RecentReleases--1
--- 11p1/tests/unit/.testbox/ver_data/RecentReleases--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RecentReleases--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625923;s:8:"%content";s:111:"<?plugin RssFeed url=http://sourceforge.net/export/rss2_projnews.php?group_id=6121&rss_fulltext=1 maxitem=10 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RecentVisitors--1 12p3/tests/unit/.testbox/ver_data/RecentVisitors--1
--- 11p1/tests/unit/.testbox/ver_data/RecentVisitors--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RecentVisitors--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,4 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625923;s:8:"%content";s:179:"Sign and date your name below!
+
+Arno Hollosi, Aredridel Stauck, Jeff Dairiki, Steve Wainstead, Carsten Klapp,
+Reini Urban, the [PhpWiki authors|PhpWiki:ThePhpWikiProgrammingTeam].";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RedirectToPlugin--1 12p3/tests/unit/.testbox/ver_data/RedirectToPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/RedirectToPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RedirectToPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,29 @@
+a:6:{s:5:"mtime";s:10:"1045352818";s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:8:"%content";s:818:"The RedirectToPlugin can be used to redirect a user to another page.
+In other words it makes a page an _alias_ for another page.
+
+! Arguments
+
+Use only one of these arguments at a time.
+
+page |
+  The page to redirect to (a wiki page name).
+href |
+  An external URL to redirect to.  Redirection to external URLs will only work
+  on locked pages.  (If the URL contains funny characters, you'll probably have
+  to put quotes around the URL.)
+
+! Caveats
+
+The RedirectToPlugin invocation must be the first thing on a page.
+For most purposes it makes any other content on the page inaccessible.
+
+! Example
+
+A page may be made a alias for the HomePage by placing this code at the top:
+<verbatim>
+<?plugin RedirectTo page="HomePage" ?>
+</verbatim>
+
+To see the example in action, visit HomePageAlias.
+-----
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RelatedChanges--1 12p3/tests/unit/.testbox/ver_data/RelatedChanges--1
--- 11p1/tests/unit/.testbox/ver_data/RelatedChanges--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RelatedChanges--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625923;s:8:"%content";s:72:"<?plugin RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/ReleaseNotes--1 12p3/tests/unit/.testbox/ver_data/ReleaseNotes--1
--- 11p1/tests/unit/.testbox/ver_data/ReleaseNotes--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/ReleaseNotes--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,711 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:32399:"1.3.12p3 Jun, 18 2006, Reini Urban:
+
+* fix [/Subpage] links
+* fix pref storing of already crypted passwords. bug #1327470 (Tom Harding)
+* fix cache headers on errors (@ob_end_flush issue). (matt brown)
+* fix BogoLogin when ENABLE_PAGEPERM=false. patch #1438392 by Matt Brown
+* unique WIKI_ID cookies per WIKI_NAME. patch #1333957 by Matt Brown
+* added DATABASE_OPTIMISE_FREQUENCY feature. patch #1377011 by Matt Brown
+* don't check lock_table priv on action=upgrade
+* fix _accesslog->logtable and _is_buffering_output warnings (uckelman)
+* do not print wrong length header on url-rewriting. bug #1376007
+* fix pref->set: Error generated when login out. bug #1355533 (Thierry Nabeth)
+* fix default preferences for editheight maxrows, by Manuel Vacelet.
+* fix DBAUTH arguments to be position independent, bug #1358973
+* add PdoDbPassUser user
+* fix output of Homepage prefs update
+* update config-dist.ini format from CVS
+* update configurator.php from CVS
+* print optimize wikidb only when DEBUG
+* simplify messages for translators
+* added ImageTile.php
+* added tsearch2 to doc/INSTALL.pgsql
+* added basepage to Cached_WikiLink::asXML for subpages within CreateTOC
+* print filename on dba access error
+* use bind_textdomain_codeset. bug #1480077 (Kai Krakow)
+* make TextSearchQuery->_stoplist localizable and overridable within config.ini
+* fixes for mysql 5.x wantedpages join
+* add rel=nofollow to more actions. patch by Matt Brown
+* add verify to RevertPage, display reverted page as template
+* update plugin/CalendarList: patches by mpullen and banjo
+* update plugin/GraphViz
+* added plugin/PasswordReset
+* fixed hash() in plugin/RateIt
+* plugin/_AuthInfo: protect File passwords
+* added Captcha to Crao edit template
+* added MacOSX Pdf button
+* fixed Portland and Wordpress editpage template
+* removed Wordpress buttons, transparent default buttons should be used.
+* disabled RelatedChanges button
+
+1.3.12p2 Mar, 7 2006, Reini Urban:
+
+* fix change prefs for File WikiUser
+* fix HomepagePrefs update message
+* remove plugin/Imdb
+* apply PluginToolbarButton fix from cvs
+
+1.3.12p1 Mar, 4 2006, Reini Urban:
+
+* fix "Call-time pass-by-reference" in CreateBib
+* fix parse error in SiteMap.php
+
+1.3.12 Mar, 4 2006, Reini Urban:
+
+Rename function hash() and method final() for php-5.1 compatibility.
+Add various backports from cvs:
+
+fixes:
+* fix ZipReader
+* Fix "Call-time pass-by-reference has been deprecated" errors,
+  allow_call_time_pass_reference = Off
+* fix broken locale update for php-5.1.1
+* default locale fix by Thomas Harding
+* fix Bug #1381464 "Duplicate functions" with php-5.1.1
+* InterWikiMap: allow spaces in paths, even implicitly. fixes bug #1218733
+* fix 'VOID' in TextSearchQuery
+* remove LIMIT 1 in ADODB
+* fix SQL WantedPages
+* fix fulltext search for stoplists
+* fix bug #1327912 numeric pagenames can break plugins (Joachim Lous)
+* fix xmlrpc and tests/unit for !register_long_arrays
+* ensure absolute uploads path
+* fix GoogleMaps syntax error
+* fix ListPages for non-SQL backends. Add top3recs as default only if
+  ratings are available
+* plugin/PageTrail improved empty cookie
+* plugin/_WikiTranslation: protect against 2x define
+* remove mysql specific ISNULL()
+* fix signout pref error
+* don't log on ACCESS_LOG_SQL < 2
+
+changes:
+* cache EditToolbars
+* beautify SCRIPT lines
+* added cfg-able markups only for default TextTransformation, not
+  for links and others
+* add a proper Content-Encoding: gzip if compressed, and omit Content-Length then.
+  Trick to send the correct gzipped Content-Length
+* set dsn after SQL/ADODB switches in WikiDB backends for easier unit testing
+* email notifications: better From: header
+* add DBAUTH_PREF_INSERT: self-creating users. by John Stevens
+* improved WikiUser/Ldap error description
+* cache SystemInfo methods
+* VisualWiki: remove INCLUDED from EXCLUDED, includes override excludes.
+* improve postgresql schemas (tsearch2 and stored procedures not yet)
+
+new:
+* added NUM_SPAM_LINKS as config.ini option
+* new ENABLE_SPAMBLOCKLIST, lib/SpamBlocklist.php:
+  check external links against surbl.org and bl.spamcop.net
+* added Captcha class and better spiral
+* added get_captcha_random_word() contributed by Dan Frankowski
+* dumphtml when not at admin page: dump the current or given page
+* added plugin FileInfo
+* major PhotoAlbum feature enhancements by Thomas Harding:
+  slides mode, real thumbnails
+* add more backends to the testsuite (PearDB_pgsql, ...)
+
+1.3.11p1 Sep, 18 2005, Reini Urban:
+
+fixes:
+* added missing pgsrc/OldStyleTablesPlugin
+* fixed OldStyleTables plugin with args
+* protect against Content-Length if headers_sent()
+* fixed ENABLE_MARKUP_TEMPLATE warning if undefined
+* fixed writing unwanted accesslog sql entries
+* fixed WikiAdminSelect preselection
+* fixed passencrypt.php for PHP5 !register_long_arrays
+* fixed configurator for DATABASE_DSN, USER_AUTH_ORDER
+
+changes:
+* optimized explodePageList to use SQL when available
+  (titleSearch instead of getAllPages)
+* added optimization for a new ALL textsearch token
+  (* => pcre: .*, sql: %)
+* configurator takes default description from config-dist.ini
+* added some missing configurator constants
+
+1.3.11 Sep, 11 2005, Reini Urban, Joel Uckelman:
+
+Lots of bugfixes, and some feature and performance enhancements.
+A new EDIT_TOOLBAR from mediawiki, more page permission enhancements,
+reduced memory usage for pagelists which need no page content,
+related improvement for OldMarkup crashes because of PCRE memory exhaustion.%%%
+New <!plugin-list !> syntax and PhpWiki:PageListLibrary args.%%%
+Because of SQL changes you'd need to ?action=upgrade to update for SQL.
+
+fixes:
+* fixed crash after login, by eliminating endless recursion in
+  group isAdmin() checks
+* fixed syntax errors in signin.tmpl
+* fixed missing DEBUG warnings (Support #954260)
+* PhpWiki is now allow_call_time_pass_reference = Off safe (php.ini)
+  Some external libraries are not (Pear_DB odbc, adodb oracle)
+* fixed sql statements for pagedata where it is not needed, fixing the
+  typical PageList memory exhaustion on simple page lists.
+  cached_html is handled complete seperate now.
+* fixed and improved WikiDB pageid caching.
+* fixed some WikiGroup errors for WIKIPAGE and DB
+* fixed JS_SEARCHREPLACE
+* fixed rename with dba
+* fixed Today link in all templates if USE_PATH_INFO = false
+* fixed PluginManager fatal error line 222
+* utf-8 pagenames fixed (typed foreign names from IE)
+* CGI: no PATH_INFO fix
+* fix some too loose PhpWiki:PagePermissions for signed, but not authenticated users
+  (admin, owner, creator), and edit and view for Bogo and Password users
+* security fix for create ACL: action=edit is now checked for create
+* fixed important WikiDB bug with DEBUG > 0: wrong assertion
+  around line 172 (#954648)
+* fixed flatfile ArchiveCleaner assertion
+* RssFeedPlugin stability fix for empty feeds or broken connections
+* fixed Sidebar theme CSS, added existing dates to jscalendar
+* fixed PhpWiki:ImageLinks, broken since 1.3.10 (Bug #956068)
+* fixed lib/pear/File_Passwd loading
+* TranslateText: verbatim needed a pagebreak
+* fixed duplicate session_id warning with adodb
+* fixed adodb ~DbPassUser login
+* fixed external ~DbPassUser login
+* fixed adodb action=upgrade
+* fixed ~FilePassUser locking problems and session handling
+* fixed a lot of LDAP auth and group issues
+* fixed LDAP options handling (by John Cole)
+* fixed possible security problems: allowing only posixly strict usernames,
+  and an actual LDAP Injection problem, detected by Steve Christey, MITRE.
+* honor s=wildcard arguments for ~WikiAdmin plugins
+* fixed flatfile assertion (#963268) - check existing previous version
+* fixed all msg references from index.php to config/config.ini
+* fixed immediate LANG and THEME in-session updates if not stored in prefs
+* fixed USER_AUTH_POLICY=old, use only USER_AUTH_ORDER methods (besides ~HttpAuth)
+  and removed LDAP, POP3, IMAP default configs.
+* RelatedChanges: fixed days links
+* fix Rename: Change pagename in all linked pages
+* fixed PhpWiki:PageChangeNotification for not-current users
+* fixed UpLoadPlugin for filenames with space (Bug #969532)
+* fixed label support for CreateTocPlugin (Bug #969495)
+* fixed Apache2 crashing with old markup and the CreateTocPlugin.
+* catch fatals and request->args changes on dumping
+* fixed unneeded UserPreferences plugin login screen on dumphtml
+* catch SOAP fatal on GooglePlugin without GOOGLE_LICENSE_KEY
+* silently ignore jshide argument on MacIE for AddCommentPlugin and CreateTocPlugin
+* fixed xmlrpc to be able to use the native xmlrpc extension.
+* fixed xmlrpc wiki.listLinks method: "name" => "page" param
+* fixed xmlrpc security not using eval on usercode anymore
+* fixed WikiAdminUtils behaviour on POST
+* fixed strict login on "Db" (by Mikhail Vladimirov)
+* more /tmp warnings on flatfile (by Joel Uckelman)
+
+changes:
+* ~WikiAdminSetAcl functional
+* enabled PhpWiki:PagePermissions for all admin plugins (no admin required):
+  Remove, Rename, Replace, ~SetAcl, Chown
+* renamed DB_Session.php to ~DbSession.php and moved libs to a subdir
+* new Error-style with collapsed output of repeated messages
+* whitespace trim pagenames to avoid abuse
+* no double login page header, better login msg.
+* improved ~FileFinder include_path logic (~NormalizeLocalFileName, ...)
+** init global FileFinder to add proper include paths at startup
+   adds PHPWIKI_DIR to the front if started from another dir, lib/pear to the end.
+** fix slashify for Windows
+* check more config-default and predefined constants
+* ~AutoSplit pagenames at subpage seperators, esp for Sidebar theme
+* improve Pagelist layout by equal pagename width for limited lists
+* added CPAN, OsFaq2, WikiLens to interwiki.map
+* ExternalSearchPlugin useimage arg (RFE #952323)
+* simplified some strings for easier translation
+* added hash and object support for ~SessionPassUser userid session variable
+* auth page=>DB ~PassUser upgrade: delete existing Page prefs, if Db prefs are saved.
+* vastly improved french locale support, which is now complete (by Pierrick Meignen).
+  english, german and french are now completely translated. The others partially.
+* improved ~SetupWiki (virgin setup) loading all required action pages in english,
+  if no foreign translation found (by Pierrick Meignen)
+* show RelatedChanges only if minimum two links on the current page.
+* PageDump: ViewSource link, better actionpage usage, MessageID TZ
+* brought ~WikiUser (old) uptodate
+* added owner and acl fields to dumps
+* import GOOGLE_LICENSE_KEY and FORTUNE_DIR from config.ini
+* renamed global $Theme to $~WikiTheme (gforge nameclash)
+* aggressive WikiDB and cache memory optimization: don't cache %content
+  and _cached_html if not needed.
+* PageDump added format=backup: dump all revisions.
+* force mysql to use auto_increment page.id for performance reasons.
+  call ?action=upgrade
+* extended all plugins which take "pages" and "exclude" params to accept
+  <!plugin-list !> pagelists
+* enabled limit, exclude and sortby PageList options for almost all db backends natively
+* improved SqlResult: templates and variable expansion.
+  automatic paging not yet.
+* use latest Pear DB features, which will break on older PearDB libs.
+  (escapeSimple). Use INCLUDE_PATH to override.
+* INCLUDE_PATH is now prepended, not appended. PHPWIKI_DIR is forced to be first.
+* rewrote OldTextFormattingRules, AnciennesR%E8glesDeFormatage
+  for proper importing (PCRE+memory related crashes on older php's)
+* added extra page.cached_html column. ?action=upgrade or PhpWikiAdministration
+  "Convert cached_html" is needed to convert your old pagedata "_cached_html".
+* page deletion is now undoable and being seen in RecentChanges. Purge pages
+  by new admin button.
+* zipdump and dumphtml contains now images, buttons and css
+* improved _WikiTranslation performance with gettext extension
+* moved DbSession methods to extra files as with WikiUser files.
+* changed config.ini options:
+  KEYWORDS: "Category:Topic" => "Category* OR Topic*",
+  KEYWORD_LINK_REGEXP removed,
+* action=dumphtml dumps only the current page unless done from PhpWikiAdministration
+
+new:
+* new ENABLE_EDIT_TOOLBAR (from mediawiki), JS_SEARCHREPLACE,
+  AddCategory, AddPlugin buttons
+* new other config options:
+** ENABLE_PAGEPERM to turn off ACL (no owner at the statusline if off)
+** FORTUNE_DIR to enable random quotes for new pages
+** GOOGLE_LINKS_NOFOLLOW, ACCESS_LOG_SQL, BABYCART_PATH, BLOG_DEFAULT_EMPTY_PREFIX,
+   CATEGORY_GROUP_PAGE, DATABASE_PERSISTENT, DBADMIN_PASSWD, DBADMIN_USER,
+   DEFAULT_DUMP_DIR, DISABLE_GETIMAGESIZE, ENABLE_DOUBLECLICKEDIT,
+   ENABLE_LIVESEARCH, ENABLE_MODERATEDPAGE_ALL, ENABLE_RAW_HTML_LOCKEDONLY,
+   ENABLE_RAW_HTML_SAFE, ENABLE_SPAMASSASSIN, ENABLE_XHTML_XML,
+   GOOGLE_LICENSE_KEY, HTML_DUMP_DIR, LDAP_OU_GROUP, LDAP_OU_USERS
+   PLUGIN_CACHED_CACHE_DIR, PLUGIN_CACHED_DATABASE, PLUGIN_CACHED_FILENAME_PREFIX,
+   PLUGIN_CACHED_FORCE_SYNCMAP, PLUGIN_CACHED_HIGHWATER,
+   PLUGIN_CACHED_IMGTYPES, PLUGIN_CACHED_LOWWATER, PLUGIN_CACHED_MAXARGLEN,
+   PLUGIN_CACHED_MAXLIFETIME, PLUGIN_CACHED_USECACHE, TEMP_DIR, USECACHE,
+   USE_EXTERNAL_HTML2PDF, ENABLE_MARKUP_COLOR, ENABLE_MARKUP_TEMPLATE
+* implemented WikiDB page creator and ownership
+* added paging support for simple one-column pagelists
+* added new PageList options: cols, azhead, comma, commasep, ordered
+  and enabled the new args on most plugins.
+* new pagename utf8 detection logic (from mediawiki)
+* added action revert, with button from action=diff
+* added new <!plugin-list PluginName args!> syntax within plugin args
+* new plugin IncludePages, esp. for <!plugin-list !>
+* added template variable expansion support to the CreatePagePlugin
+* added new <!plugin-list PluginName args!> syntax within plugin args
+* new plugin IncludePages, esp. for <!plugin-list !>
+* added template variable expansion support to the CreatePagePlugin
+* WikiSpam prevention:
+  ** On GOOGLE_LINKS_NOFOLLOW add rel=nowfollow to all external
+     links, unless the author was authenticated.
+  ** max 20 new links hardcoded
+  ** new babycart module interfacing SpamAssassin
+* added WikiPluginCached support for image maps, static cache in uploads/ and SVG
+* added case-sensitive/insensitive and regex searching, replace also
+* added action=pdf: only page formatter missing, use USE_EXTERNAL_HTML2PDF instead
+* new ~XmlParser, ~HtmlParser: new libs for HTML->wiki import and htmlarea3 support
+* new action=chown|setacl|rename|dump action shortcuts pointing to the plugin
+* new SyntaxHighlighter plugin (based on work by alecthomas),
+  needs highlight from http://www.andre-simon.de/
+* new PloticusPlugin. Full application/xhtml+xml support not yet
+  (javascript document.write() not supported with ENABLE_XHTML_XML)
+* new ListPages plugin (by Dan Frankowski)
+* new TeX2pngPlugin (by Pierrick Meignen)
+* added support for ?force_unlock=1 parameter for stale File_Passwd locks
+  (should not be needed anymore, we lock only when we actually change the passwd)
+* added mysql-4.1 fix at action=upgrade,
+  added CACHE_CONTROL NONE => NO_CACHE config.ini fix to action=upgrade
+* author, owner, creator support for WikiAdmin* and AllPages plugins:
+** AllPagesCreatedByMe, AllPagesLastEditedByMe, AllPagesOwnedByMe
+* added option regex to ~WikiAdminSearchReplace and ~WikiAdminRename
+* added oracle PearDB backend (by Philippe Vanhaesendonck)
+* added experimental SearchHighlight feature (not for HTML yet)
+* added experimental LiveSearch feature
+* added [OverWrite All] button to loadfile action on the first page.
+* added [Load & OverWrite] button to PhpWikiAdministration
+* performance: use cached static config/config.php, if it's writable by
+  the webserver. (experimental)
+* added ACCESS_LOG_SQL &1: read, &2 write. new accesslog sql table.
+  for various log analysis: abuse prevention, recent referrers.
+* added more PageChangeNotification on other actions: rename, remove.
+  changed subject on create. Collapse mult. emails to one.
+* added new PhpWiki:WikiFormRich plugin
+* added new AppendTextPlugin (by Pascal Giard)
+* added RSS2 link (format=rss2)  in RecentChanges. (no cloud channel yet)
+* added PhpWikiAdministration WikiDB buttons:
+  [Purge all empty unreferenced pages], [Convert cached_html]
+* (nyi) new experimental ModeratedPage feature. (i.e. delayed POST actions)
+* new edit "[] old markup [Convert]" button to convert and save to new markup.
+* new LinkDatabase plugin and actionpage for the http://touchgraph.sourceforge.net/ ~WikiBrowser
+* new hyperwiki applet in the Sidebar theme. See http://hypergraph.sourceforge.net/
+* new xmlrpc methods: putPage, mailPasswordToUser
+* new xmlrpc test framework
+* action=upgrade performs now a mysql LOCK TABLE privileges check and fix
+* action=upgrade asks now for the admin's user and password if not defined
+* added lib/ASCIIMathPHP and AsciiMath plugin
+* new AnalyseAccessLogSqlPlugin (by Charles Corrigan)
+* new TemplatePlugin, optionally mediawiki-style {{Template}} syntax
+* new ENABLE_ACDROPDOWN moacdropdown library. fast xmlrpc communication nyi
+
+PhpWiki 1.2.11:
+* support remove for $WhichDatabase = file
+
+PhpWiki 1.2.10:
+* support php5 with register_long_arrays = off
+
+PhpWiki 1.2.9 bugfix:
+* Jose Vina fixed MostPopular sorting for dba and dbm,
+  which was broken since 1.2.3
+
+1.2.8 (the old-stable branch) Jan, 30 2005, Reini Urban:
+* register_globals=off fix:
+  fix and centralize broken register_globals=off logic.
+* update message catalog
+* replace mysql_pconnect by mysql_connect
+
+1.2.7 (the old-stable branch) Jan, 6 2005, Reini Urban:
+PhpWiki 1.2.7 backport cvs release-1_2-branch enhancements never released with 1.2.3-1.2.6:
+* full xhtml conformity
+* split_pagename in title and header to help google
+* "INSTALL.Mac OS X" added from cvs
+* lib/zipfile.php: Content-Disposition: attachment
+* lib/config.php, lib/stdlib.php: support new USE_LINK_ICONS and AUTOSPLIT_WIKIWORDS,
+  better i18n $!WikiNameRegexp
+* re-added images/* LINK_ICONS, pre-calculate DATA_PATH
+* locale/*: fix and update strings and templates esp. for german,
+* index.php: urlparser extended to omit &start_debug=1 and other args
+* added minor_edit checkbox
+* print more meta tags: robots, favicon, language and PHPWIKI_VERSION
+
+1.2.6 (the old-stable branch) Dec, 19 2004, Reini Urban:
+;: flatfile fixes and enhancement:
+* fixed !TitleSearch and Backlinks for flatfile.
+* enable MostPopular (hitcount storage) for flatfile
+
+1.2.5 (the old-stable branch) Nov, 28 2004, Reini Urban:
+* works with register_globals=off
+* adds user/password to pgsql,
+* fix zip and dumpserial on dba, dbm, msql and file,
+* and fixes a minor (un)lock issue, displaying the (un)locked page afterwards
+  and not the FrontPage.
+
+1.3.10 May, 13 2004, Reini Urban, Joby Walker:
+
+;: In short: paging support, adodb rewrite, permission problem fixed.
+
+fixes:
+* fixed severe permission problem:
+  Default permissions not honored. Everybody was able to edit.
+* set UserPreferences for bool and int fixed
+* POP3 auth
+* dba open problems improved, but not generally fixed
+* fixed dba session reading, but still broken
+* support wikiword links and image links in RichTable content,
+  backlinks still not working.
+* fixed navbar links in theme smaller, and made them default
+* fixed loading of localized pagenames on action=upgrade
+* fixed interwiki.map loading on certain PrettyWiki setups
+* re-enabled php-4.0.6 support (broken since 1.3.8: superglobals, array_key_exists),
+  4.0.4-pl1 and 4.0.5 do work, but not stable enough.
+* fix running phpwiki in "http://server/" (empty DATA_PATH)
+* fix PhpWiki:PrettyWiki detection: starter script includes index.php,
+  and include main.php by its own to override certain config values.
+* fix WikiAdminRemove arguments passed from WikiAdminSelect,
+  WikiAdminRemove deleted too many args if passed from WikiAdminSelect
+* session transportation improved, no db objects stored
+* PageGroup support for [links] and subpages
+* HttpClient fixes for older php's
+* RssFeed for allow_url_fopen=false, IMAGE support, empty ITEM list
+* Theme buttons are now also searched in the default theme
+* numerous other minor bugfixes.
+
+changes:
+* ADODB update from ancient mysql-only, to 4.21 with all supported databases.
+  transaction support, with mysql locking-workarounds
+* pear not in our include_path anymore: either use your pear or our pear,
+  by adding it to your include_path or not. use now 1:1 copies of pear libs.
+* CreateToc parses now headers with links and formatting optionally, if
+  TOC_FULL_SYNTAX is defined
+* PageChangeNotification: userids, not emails are printed
+* default theme navbar consistency: linkButtons instead of action buttons
+* _~WikiTranslation what=buttons, noT=1, nolinks=1
+* ~SetupWiki (virgin setup) also loads all mandatory pages now
+  and overwrites ReleaseNotes
+* PageChangeNotification changed subject to "[WikiName] Page change %s",
+  update your filters accordingly
+* action=upgrade now linked in PhpWikiAdministration,
+  db: fix page.id auto_increment and ADD session.sess_ip
+* some internal InlineParser optimization
+* DBAuthParam statement syntax change: variables now like '$userid'
+
+new:
+* new ini-style config instead of old index.php, by Joby Walker
+* paging support for pagelists longer than limit
+* PopularNearby plugin: same as the classic most popular footer
+* formatted single-line plugins supported
+* RelatedChanges plugin: only those which are links at the current page
+* new GoogleLink pref: add "[G]" lookup on unknown links
+* added chinese language support, by Yan-ren Tsai (druryl)
+* added missing MacOSX buttons, by Carsten Klapp.
+* new Crao theme from http://wiki.crao.net, by Arnaud Fontaine and Laurent Lunati
+* extended PhpWiki:InlineImages markup (size, border, ...)
+
+
+1.3.9-p1 May,5 2004, Reini Urban:
+
+Bugfix patch for the following 1.3.9 problems:
+* Default permissions not honored. Everybody was able to edit.
+* set UserPreferences for bool and int fixed
+* dba open problems improved
+* session transportation improved, no db objects stored
+* php-4.0.6 support re-enabled (superglobals, array_key_exists)
+* WikiAdminRemove deleted too many if args passed from WikiAdminSelect
+* PageGroup support for [links] and subpages
+* disabled default dba sessions, broken!
+* HttpClient fixes for older php's
+* RssFeed for allow_url_fopen=false, IMAGE support, empty ITEM list
+
+
+1.2.4 (the old-stable version) May, 4 2004, Reini Urban:
+* improves possible deadlocks in DBA,
+* fixes problems with DBA open failures.
+
+
+1.2.3 (the old-stable version) Apr, 29 2004, Reini Urban:
+* added the most popular footer for dba
+* added remove for dba
+* fixed a warning on info page
+
+
+1.3.9 Apr, 12 2004, Reini Urban:
+
+Bugfix release for the following 1.3.8 problems:
+* syntax errors in lib/plugin/UpLoad.php
+* syntax errors in lib/plugin/WikiAdminRemove.php
+* syntax error in schemas/mysql.sql
+* several path issues (cannot findfile...), which were caused
+  by a chdir for bindtextdomain in lib/config.php.
+    Failed opening required 'lib/stdlib.php',
+    templates/html.tmpl: not found, and more
+* added self-registration for DbPassUser
+* added GoTo plugin, RateIt action page
+
+1.3.8 Jan-Apr 2004, Reini Urban:
+
+External plugable authentification, DB prefs and sessions,
+some more fixes, docs, themes and plugins.
+
+* new WikiUserNew class (started by Carsten Klapp),
+* new Preferences (optionally from DB, no cookies anymore)
+* improved DB_Session (added ADODB + dba support,
+  WhoIsOnline support)
+* enabled WikiGroup (Joby Walker and Reini Urban)
+* new individual PagePermissions (enabled, but not yet enforced)
+* new WikiAdminRename, WikiAdminSearchReplace, WikiAdminSetAcl
+* several other new plugins: WikiPoll, WhoIsOnline,
+  CreateToc (experimental), AddComment,
+  _WikiTranslation and TranslateText, NoCache,
+  UpLoad (by NathanGass, qubit and Reini Urban),
+  IncludeSiteMap (by cuthbertcat and Reini Urban),
+  RichTable (by Sameer D. Sahasrabuddhe),
+  CreatePage and RateIt (by Dan Frankowski),
+  RssFeed (by Arnaud Fontaine)
+* added InterWiki image button support
+* added Japanese language support (by Tadashi Jokagi)
+* added sqlite support (thanks to Matthew Palmer)
+* added theme and plugin-specific PageList column types and theme-specific UserPreferences
+* added EmailVerification and PageChangeNotification (experimental)
+* added new sess_ip column (DB_Session) for ip-based robot throttling
+
+* Pear DB update, minor performance improvement for PearDB
+* PageList: enhanced sortby + limit support, sortable gridbuttons enforced, cleanup.
+* minor theme/default overhaul, new theme/smaller, new experimental theme/wikilens
+* new theme/Wordpress by Mike Pickering
+* updated theme/Sidebar: box methods, fast jscalendar and easier to customize
+* more OldStyleTable arguments, PhotoAlbum local fs support
+* preliminary action=upgrade (To import new pgsrc pages only yet. not for DB)
+* preliminary SOAP support
+* added PdfOutput libraries
+* experimental javascript Search&Replace edit buttons
+* experimental old-browser compatibility code.
+
+* fixed WikiAdminSelect, WikiAdminRemove
+* fixed and improved XHTML dumps (css, images, unlinked pages, \r\r\n issue)
+* fixed ADODB limit problem, fixed dba on Windows PHP 4.3.x
+* fixed BlockParser problem with "0" as text
+* fixed UnfoldSubpages sortby
+* fixes for PHP5 compatibility started
+* fixed gettext, setlocale and update_locale problems
+
+1.3.4 until 1.3.7, 2002-2003 Jeff, Carsten and Steve Wainstead:
+
+* several stable releases with better documentation (most plugins) and various bugfixes.
+* EditMetaData (by MichaelVanDam) for example. (forgot what else was new)
+* Jochen Kalmbach's new UserFileManagement and UserRegistration didn't went upstream.
+  (personal uploads, ...)
+
+1.3.3 early 2002, Jeff strikes back, with the help of Carsten Klapp:
+
+* major feature enhancements:
+* Cache all output and use a clever page cache. Get rid of plugin-head.
+* new PageType class. Formatter and Search engine rewrite.
+* Validator
+* broke several older plugins: InterWikiSearch, WikiAdminSelect. broke image buttons
+* Carsten Klapp's beloved MACOSX theme, button factory and CSS wizardry in general.
+* XHTML dumps, WikiBlog as page type.
+* PluginManager and several more plugins.
+
+1.3.2 early 2002, Reini Urban strikes:
+
+* Start of external authorisation in the config, but not in code.
+* Store Preferences in the users PersonalPage (Jeff)
+* Sessions in DB, pear DB update
+* concept of Subpages, UnfoldSubpages, SiteMap, AllPages, AllUsers, ...
+* PageList (Jeff and Reini)
+* Several new plugins: RedirectTo, plugin-head architecture.
+  Normalize template names. WikiAdminSelect architecture: WikiAdminRemove
+* VisualWiki, TexToPng, text2png + several cached plugins (by Johannes Groe)
+* PhpWeather (?), PrevNext, image buttons,
+* IncludePage (Joe Edelman), FrameInclude (Reini), Transclude (Jeff)
+* Calendar (contributed by ?), CalendarList, WikiBlog, ...
+
+.... a small hole here .... (three years no detailed HISTORY. see the outline above)
+
+Jeffs Hacks.
+
+* New database API.  See =lib/WikiDB.php= and =lib/WikiDB/backend.php=
+  for the bulk of the documentation on this.  The new database can
+  save multiple archived versions of each page.  A mechanism for
+  purging archived revisions is now in place as well.  See the
+  $~ExpireParams setting in =index.php=, and =lib/~ArchiveCleaner.php=
+  for details.  At this point, the DBA, MySQL and Postgres backends
+  are functional.  The DBA backend could use some performance
+  optimization.  The whole API is still subject to some change as I
+  figure out a clean way to provide for a variety of (not all forseen)
+  methods of indexing and searching the wiki.
+
+* New WikiPlugin architecture.
+
+* New template engine.  This needs to be documented further, but, for
+  now, see =lib/Template.php=.  On second thought, don't
+  (=lib/Template.php= desperately needs refactoring, still.)  The
+  basic advance is that PHP4's =ob_*()= functions can be used to
+  capture output from code that is run through =eval().  This allows
+  the templates to be PHP code...
+
+* Edit preview button on the edit page.  Now you can see what your
+  edits look like before committing them.
+
+* Reworked the style-sheets.  I still need to clean this up some more.
+  I would appreciate comments and bug reports on it.  So far I've only
+  tested the new style sheets with Netscape 4.77 and Mozilla 0.9.3
+  (both running under Linux.)
+
+* Expanded syntax for text search, Searches like "wiki or web -page"
+  (or "(wiki or web) and not page") will now do more-or-less what they
+  look like they'll do.
+
+* Security Issues: PhpWiki will now work with PHP's =register_globals=
+  set to off.
+
+PhpWiki 1.3.x development branch.
+
+* Pagenames in =PATH_INFO=.
+
+* File uploads: see PhpWikiAdministration.
+
+* UserPreferences.
+
+* Ugly [MagicPhpWikiURLs] for administrative links.
+
+PhpWiki 1.2 is a huge advance over version 1.0:
+
+* Database support for MySQL, Postgresql, mSQL, flat file and the new
+  dba_ library in PHP4 is included.
+
+* Internationalization: support for different languages, down to the
+  source level, is included. German, Spanish, Swedish and Dutch are
+  currently shipped with PhpWiki. An architecture is in place to
+  easily add more languages.
+
+* New linking schemes using square brackets in addition to the old
+  style ~BumpyText.
+
+* Administration features include page locking, dumping the Wiki to a
+  zip file, and deleting pages.
+
+* A MostPopular page showing the most frequently hit pages.
+
+* Full HTML compliance.
+
+* Links at the bottom of pages describing relationships like incoming
+  links from other pages and their hits, outgoing and their hits, and
+  the most popular nearby pages.
+
+* Color page diffs between the current and previous version.
+
+* An info page to view page metadata.
+
+* Far more customization capability for the admin.
+
+* A templating system to separate the page HTML from the PHP code.
+
+* New markup constructs for =<B>=, =<I>=, =<DD>=, =<BR>= and more.
+
+* Tabless markup to supercede the older markup (both still supported).
+
+
+----
+
+PhpWiki 1.1.9 includes Spanish language pages, a full implementation
+for Postgresql, numerous bug fixes and more. See the =HISTORY= file
+for more info: http://phpwiki.sourceforge.net/phpwiki/HISTORY
+
+----
+
+PhpWiki 1.1.6 is a major revision of PhpWiki. The ability to have
+themes (via an easy-to-edit template system) has been added; the
+schema for MySQL has been completely overhauled, breaking the page
+details into columns (for efficiency we agreed not to put references
+in a separate table, so it's not completely normalized. "Don't let the
+best be the enemy of the good.")
+
+Postgresql support has been added and the markup language is evolving, now allowing
+
+!!!<h2>
+!!<h3>
+!<h4>
+
+tags and __a new way to make text bold__, and of course the
+[new linking scheme].
+
+There is a new feature on all pages called ''more info'' that gives
+you a low level detailed view of a page, which is probably more useful
+for debugging than anything.
+
+As we move towards a 1.2 release we will be adding logging, top ten
+most active pages and other new features with the new database schema
+(and yes, these features will make it into the DBM version too). I
+also want to add mSQL support and test it under Zend, the new PHP4.
+
+Below are the release notes for version 1.03, the last release of the
+1.0 PhpWiki series. --Steve Wainstead, mailto:swain@panix.com
+
+----
+
+PhpWiki was written because I am so interested in WikiWikiWeb~s, and I
+haven't used PHP since version 2.0. I wanted to see how it had
+advanced.
+
+Version 1.0 is a near-perfect clone of the Portland Pattern
+Repository, http://c2.com/cgi-bin/wiki?WikiWikiWeb. In truth, I was
+using the Wiki script you can download from there as a model; that
+Wiki lacks a number of features the PPR has, like EditCopy. So in
+truth PhpWiki is a kind of hybrid of the PPR and the generic Wiki you
+can get from there (which is written in Perl).
+
+The one caveat of PhpWiki is the allowance of HTML if the line is
+preceded by a bar (or pipe, which is how I usually say it). (That's a
+'=|='). It was very simple to add, and the idea came from a posting
+somewhere on the PPR about how AT&T had an internal Wiki clone and
+used the same technique. The ability to embed HTML is disabled by
+default for security reasons.
+
+Version 1.01 includes a patch that fixes a small error with rendering
+<hr> lines. Thanks to Gerry Barksdale.
+
+See the =HISTORY= file for a rundown on the whole development process
+if that sort of thing really interests you :-)
+
+--SteveWainstead
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RichTablePlugin--1 12p3/tests/unit/.testbox/ver_data/RichTablePlugin--1
--- 11p1/tests/unit/.testbox/ver_data/RichTablePlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RichTablePlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,100 @@
+a:6:{s:6:"author";s:10:"ReiniUrban";s:5:"mtime";s:10:"1075205974";s:9:"author_id";s:10:"ReiniUrban";s:6:"markup";s:1:"2";s:8:"pagetype";s:8:"wikitext";s:8:"%content";s:3347:"RichTablePlugin is a plugin that takes off from the OldStyleTablePlugin. It allows a user to specify arbitrary properties of <tt><table></tt>, <tt><tr></tt> and <tt><td></tt> with a very simple markup.
+
+NEW: The plugin is now fixed so that the contents of each cell are individually processed by the ~BlockParser. This means that if everything works correctly,  you can do interesting things like put *invoke plugins*, use *enumerated lists* etc within each cell!
+
+*A <tt>"-"</tt> (dash) at the start of a new line represents a new row in the table.
+*A <tt>"|"</tt> (vertical bar or pipe) at the start of a new line represents a cell.
+*Attributes for the tags
+  *A line that starts with a <tt>"*"</tt> (star or asterisk) after a <tt>"|"</tt> is parsed for attributes for the corresponding cell.
+  *Attributes for the table are given on line that starts with a <tt>"*"</tt>, only if the line appears before any other line except whitespace.
+  *A line that starts with a <tt>-</tt> is always parsed for attributes since it can't have any content, unlike a cell.
+*Cell contents
+  *Cell contents are processed by the ~BlockParser.
+  *Any line that starts with a <tt>"*"</tt> anywhere other than the table attribute line is treated as normal content.
+  *Any line that starts with whitespace is also treated as content.
+  *Any cell line that does not have a <tt>"*"</tt> after the <tt>"|"</tt> is treated as normal content.
+  *All content lines that follow a cell line are added to that cell. They can contain arbitrary text except the above cases.
+  *If there is no cell in the current row, content lines are dropped silently.
+*The two special characters <tt>"~~"</tt> and <tt>"?>"</tt> should be escaped as <tt>"\~~"</tt> and <tt>"?\>"</tt>. I havn't discovered any other characters yet that might need to be escaped. This is required for the block parser to work.
+
+Bugs:
+* The source code sucks
+* The plugin can't nest itself yet. Thus nested tables are currently not possible.
+
+Example:
+
+<?plugin RichTable
+
+*border=1, cellpadding=5, bgcolor=#f0f8f8, width=75%, align=center
+-
+|* colspan=3, align=center
+HomePage
+-
+|* colspan=2
+[http://phpwiki.sourceforge.net/demo/themes/default/images/png.png]
+|* rowspan=2
+This cell actually has a plugin invocation inside it!
+<?plugin
+BackLinks
+?\>
+- bgcolor=white
+|
+#One
+#Two
+|
+*Foo
+*Bar
+- bgcolor=cyan
+This line gets dropped ... no cell to contain it!
+|* bgcolor=#f0f0ff, align=center
+One paragraph
+
+Another paragraph?
+|* align=left
+This cell uses the row color
+| I wish this cell had a nested table inside it! :(
+?>
+
+The above table is rendered from:
+
+<verbatim>
+<?plugin RichTable
+
+*border=1, cellpadding=5, bgcolor=#f0f8f8, width=75%, align=center
+-
+|* colspan=3, align=center
+HomePage
+-
+|* colspan=2
+[http://phpwiki.sourceforge.net/demo/themes/default/images/png.png]
+|* rowspan=2
+This cell actually has a plugin invocation inside it!
+<?plugin
+BackLinks
+?\>
+- bgcolor=white
+|
+#One
+#Two
+|
+*Foo
+*Bar
+- bgcolor=cyan
+This line gets dropped ... no cell to contain it!
+|* bgcolor=#f0f0ff, align=center
+One paragraph.
+
+Another paragraph?
+|* align=left
+This cell uses the row color
+| I wish this cell had a nested table inside it! :(
+?>
+</verbatim>
+
+;__Author__: Sameer D. Sahasrabuddhe
+;__Url__: http://www.it.iitb.ac.in/~sameerds/phpwiki/index.php/RichTablePlugin
+
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/RssFeedPlugin--1 12p3/tests/unit/.testbox/ver_data/RssFeedPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/RssFeedPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/RssFeedPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,47 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:891:"!! Synopsis
+
+A WikiPlugin to display external RSS feeds.
+
+!!  Usage
+<verbatim>
+  <?plugin RssFeed?>
+  <?plugin RssFeed url=http://somesite.tld/linktofeed.rss ?>
+</verbatim>
+
+!! Plugin Arguments
+Argument|
+  Default Value|
+    Description
+
+url|
+  (empty)|
+    RSS Feed URL
+
+feed|
+  (empty)|
+    RSS Feed Name
+
+description|
+  (empty)|
+    Description of the RSS Feed
+
+maxitem|
+  0|
+    Max. number of entries (0 = unlimited)
+
+!! Sourcecode (since v1.3.8):
+* [PhpWikiCvs:lib/plugin/RssFeed.php]
+* [PhpWikiCvs:lib/RssParser.php] _fixed for allow_url_fopen=Off_
+
+!! Examples
+
+* PhpWikiRss _feed for PhpWiki:RecentChanges_
+<verbatim>
+  <?plugin RssFeed feed=PhpWikiRss description="PhpWiki:RecentChanges"
+	           url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss ?>
+</verbatim>
+
+* [PhpWikiDemo:sidebar/]  _Example as sidebar box_
+
+-------------
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/SandBox--1 12p3/tests/unit/.testbox/ver_data/SandBox--1
--- 11p1/tests/unit/.testbox/ver_data/SandBox--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/SandBox--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,3 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:43:"You can try out Wiki in here.
+
+Have fun :-)";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/SearchHighlight--1 12p3/tests/unit/.testbox/ver_data/SearchHighlight--1
--- 11p1/tests/unit/.testbox/ver_data/SearchHighlight--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/SearchHighlight--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:0:"";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/SearchHighlightPlugin--1 12p3/tests/unit/.testbox/ver_data/SearchHighlightPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/SearchHighlightPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/SearchHighlightPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,14 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:398:"The SearchHighLight WikiPlugin is an internal actionpage plugin,
+which is only used internally.
+
+When someone is referred from a search engine like Google, Yahoo
+or our own fulltextsearch, the terms the user searched for are highlighted.
+See also http://wordpress.org/about/shots/1.2/plugins.png
+
+!! Plugin Arguments
+__s__: |
+  The search term
+__case_exact__:  |
+  boolean.
+__regex__:  |
+  boolean.";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/SteveWainstead--1 12p3/tests/unit/.testbox/ver_data/SteveWainstead--1
--- 11p1/tests/unit/.testbox/ver_data/SteveWainstead--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/SteveWainstead--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,4 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:170:"Hi. I started building this WikiWikiWeb but many others help me
+now. I'm at http://www.panix.com/~swain/.
+
+Please report bugs to mailto:phpwiki-talk@lists.sourceforge.net";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/SyntaxHighlighterPlugin--1 12p3/tests/unit/.testbox/ver_data/SyntaxHighlighterPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/SyntaxHighlighterPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/SyntaxHighlighterPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,50 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:1055:"The ~SyntaxHighlighter plugin passes all its arguments through a C++
+highlighter called "highlight" (available at http://www.andre-simon.de/).
+
+Author: alecthomas
+
+! Arguments
+syntax |
+  (required), See http://www.andre-simon.de/doku/highlight/highlight.html
+style |
+  ~[ "ansi", "gnu", "kr", "java", "linux" ~] (required)
+color |
+  null (optional), see =highlight/themes=
+number |
+  0  (optional)
+wrap |
+  0  (optional)
+
+
+! Example
+
+<verbatim>
+<?plugin SyntaxHighlighter syntax=c style=kr color=emacs
+ #include <stdio.h>
+
+ int main() {
+ printf("Lalala\n");
+ }
+?>
+</verbatim>
+
+=>
+
+<?plugin SyntaxHighlighter syntax=c style=kr color=emacs
+ #include <stdio.h>
+
+ int main() {
+ printf("Lalala\n");
+ }
+?>
+
+I did not use beautifier, because it used up more than 8M of memory on
+my system and PHP killed it. I'm not sure whether this is a problem
+with my integration, or with beautifier itself.
+
+Fixes by Reini Urban:
+* support options: syntax, style, color.
+* php version switch
+* HIGHLIGHT_DATA_DIR, HIGHLIGHT_EXE constants
+----
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/SystemInfoPlugin--1 12p3/tests/unit/.testbox/ver_data/SystemInfoPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/SystemInfoPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/SystemInfoPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,18 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:461:"The SystemInfoPlugin provides access to lower level system information for the platform PhpWiki is installed on.
+
+<verbatim>
+ Usage:  <?plugin SystemInfo all ?>
+      or <?plugin SystemInfo pagestats cachestats discspace hitstats ?>
+      or <?plugin SystemInfo version ?>
+      or <?plugin SystemInfo current_theme ?>
+      or <?plugin SystemInfo PHPWIKI_DIR ?>
+</verbatim>
+
+Example:
+
+<?plugin SystemInfo all ?>
+
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/TemplateExample--1 12p3/tests/unit/.testbox/ver_data/TemplateExample--1
--- 11p1/tests/unit/.testbox/ver_data/TemplateExample--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/TemplateExample--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,25 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:653:"<noinclude>
+The following predefined variables are automatically expanded if existing:
+  pagename
+  mtime     - last modified date + time
+  ctime     - creation date + time
+  author    - last author
+  owner
+  creator   - first author
+  SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
+</noinclude>
+
+Title: %%title%%   Year: %%year%%
+---
+* Pagename: %%pagename%%
+* Author: %%author%%
+* Last modified time: %%mtime%%
+* Created time: %%ctime%%
+* Owner: %%owner%%
+* Creator: %%creator%%
+
+* SERVER_URL: %%SERVER_URL%%
+* DATA_PATH: %%DATA_PATH%%
+* SCRIPT_NAME: %%SCRIPT_NAME%%
+* PHPWIKI_BASE_URL: %%PHPWIKI_BASE_URL%%
+* BASE_URL: %%BASE_URL%%";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/TemplatePlugin--1 12p3/tests/unit/.testbox/ver_data/TemplatePlugin--1
--- 11p1/tests/unit/.testbox/ver_data/TemplatePlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/TemplatePlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,72 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:1816:"!! Synopsis
+
+Template = Parametrized blocks.
+
+Include text from a wiki page and replace certain placeholders by parameters.
+Similiar to CreatePage with the template argument, but at run-time.
+Similiar to the mediawiki templates but not with the "|" parameter seperator.
+
+!!  Usage
+<verbatim>
+  <?plugin Template page=Templates/Footer?>
+  <?plugin Template page=Templates/Film vars="title=SomeFilm&year=1999" ?>
+  {{Templates/Film|title=SomeFilm|year=1999}}
+</verbatim>
+
+!! Plugin Arguments
+Argument|
+  Default Value|
+    Description
+
+page|
+  (empty)|
+    pagename to be included as template
+
+vars|
+  (empty)|
+    optional parameters to be expanded inside the template
+
+! Parameter expansion:
+  vars="var1=value1&var2=value2"
+
+We only support named parameters, not numbered ones as in mediawiki, and
+the placeholder is %%var%% and not {{~{var~}}} as in mediawiki.
+
+The following predefined variables are automatically expanded if existing:
+<verbatim>
+  pagename
+  mtime     - last modified date + time
+  ctime     - creation date + time
+  author    - last author
+  owner
+  creator   - first author
+  SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
+</verbatim>
+
+<noinclude> .. </noinclude> is stripped
+
+! In work:
+* ENABLE_MARKUP_TEMPLATE = true: (lib/InlineParser.php)
+  Support a mediawiki-style syntax extension which maps
+<verbatim>
+    {{TemplateFilm|title=Some Good Film|year=1999}}
+</verbatim>
+  to
+<verbatim>
+    <?plugin Template page=TemplateFilm vars="title=Some Good Film&year=1999" ?>
+</verbatim>
+
+!! Examples
+
+<verbatim>
+  <?plugin Template page=TemplateExample vars="title=TestTitle" ?>
+</verbatim>
+
+Standard syntax:
+  <?plugin Template page=TemplateExample vars="title=TestTitle" ?>
+
+Shorter syntax:
+  {{TemplateExample|title=TestTitle}}
+
+-------------
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/TeX2pngPlugin--1 12p3/tests/unit/.testbox/ver_data/TeX2pngPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/TeX2pngPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/TeX2pngPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,58 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625924;s:8:"%content";s:2172:"!!Synopsis
+
+WikiPlugin to display mathematical formulae in a Wiki page.
+
+!!Usage
+
+<verbatim>
+<?plugin TeX2png text="$$(a+b)^n=\sum_{k=0}^n{n\choose k}a^k b^{n-k}$$" ?>
+</verbatim>
+
+gives
+
+<?plugin TeX2png text="$$(a+b)^n=\sum_{k=0}^n{n\choose k}a^k b^{n-k}$$" ?>
+
+!!Arguments
+There is only one argument which is the text of the mathematical
+expression. This text *must be* enclosed by a dollar $ within a
+paragraph or two dollars $$ on a separate line. In the last case,
+all is centered.
+
+To write mathematical formulae, the syntax is the one
+of [LaTeX | http://www.latex-project.org].
+
+!!Caveats
+
+This plugin is only to produce readable mathematical formulae. Any
+other text is not allowed : so if an expression is not enclosed by
+dollars then it will be displayed by a red text. It is all the same
+possible to display raw text as <?plugin TeX2png text="$\textrm{\LaTeX}$" ?> by using :
+
+<verbatim>
+<?plugin TeX2png text="$\textrm{\LaTeX}$" ?>
+</verbatim>
+
+This plugin is not able to produce sophisticated mathematicals texts
+with links, cross references... For that, you can use for example
+LaTeX2html.
+
+!!Examples
+
+Some Greeks letters : <?plugin TeX2png text="$\alpha$" ?>, <?plugin TeX2png text="$\beta$" ?>, ... and a formula <?plugin TeX2png text="$\sum_{i=1}^n \frac1{i^2}=\frac{\pi^2}{6}$" ?> to test display in a paragraph.
+
+*Exercise 1* Consider the function <?plugin TeX2png text="$$f(x)=(x^2-4x+3)^{1/2}$$" ?>
+
+#Give the largest real domain for which f(x) is well defined.
+#Give a domain on which the function is one-to-one. Using this domain derive a formula for the inverse function <?plugin TeX2png text="$f^{-1}(x)$" ?>.
+#Calculate the derivative f'(x).
+
+*Exercise 2* Consider the function :
+
+<?plugin TeX2png text="$$f(x) = \int_0^x e^{-t^2}\,dt, x\in\mathbb R$$" ?>
+
+#Show that for all r > 0 :<?plugin TeX2png text="$$\frac{\pi}{2}\int_0^r t  e^{-t^2}\,dt \leq \int_0^r e^{-x^2}\,dx \int_0^r e^{-y^2}\,dy \leq \frac{\pi}{2} \int_0^{\sqrt{2} r} t e^{-t^2}\,dt$$" ?> *Help* : you can use polar coordinates.
+#Hence find the limit of <?plugin TeX2png text="$f(x)$" ?> as x tends <?plugin TeX2png text="to $\infty$" ?>.
+
+-----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/TextFormattingRules--1 12p3/tests/unit/.testbox/ver_data/TextFormattingRules--1
--- 11p1/tests/unit/.testbox/ver_data/TextFormattingRules--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/TextFormattingRules--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,232 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:7689:"<?plugin CreateToc jshide||=1 with_toclink||=1 ?>
+----
+! Synopsis
+TextFormattingRules%%%
+*Emphasis:* <tt>~_</tt> for _italics_, <tt>~*</tt> for *bold*,
+<tt>~_~*</tt> for _*both*_, <tt>~=</tt> for =fixed width=.%%%
+*Lists:* <tt>~*</tt> for bullet lists, <tt>#</tt> for numbered lists,
+_Term<b>:</b>~<new-line> definition_ for definition lists.%%%
+*Preformatted text:* Enclose text in <tt>~<pre>~</pre></tt> or
+<tt>~<verbatim>~</verbatim></tt>.%%%
+*Indented text:* Indent the paragraph with whitespaces.%%%
+*References:* ~JoinCapitalizedWords or use square brackets for a
+<tt>~[page link]</tt> or URL <tt>~[~http://cool.wiki.int/]</tt>.%%%
+*Preventing linking:* Prefix with "<tt>~~</tt>":
+<tt>~~~DoNotHyperlink</tt>, name links like <tt>~[text | URL]</tt>.%%%
+*Misc:* "<tt>!</tt>", "<tt>!!</tt>", "<tt>!!!</tt>" make headings,
+"<tt>~%%%</tt>" or "<tt>~<br></tt>" makes a linebreak,
+"<tt>~----</tt>" makes a horizontal rule.%%%
+*Allowed HTML tags:* <b>b</b> <big>big</big> <i>i</i>
+<small>small</small> <tt>tt</tt> <em>em</em> <strong>strong</strong>
+<abbr>abbr</abbr> <acronym>acronym</acronym> <cite>cite</cite>
+<code>code</code> <dfn>dfn</dfn> <kbd>kbd</kbd> <samp>samp</samp>
+<var>var</var> <sup>sup</sup> <sub>sub</sub>
+
+----
+
+!!! Character Formatting
+
+* All special non-whitespace HTML characters are displayed as-is. Exceptions below.
+* See [Emphasis|TextFormattingRules#Emphasis].
+* There's no syntax for font tags or color attributes.
+* The tilde '~~' is the _Escape Character_:
+** A single tilde '~~' followed by nothing gets rendered as a single tilde. => ~
+** Two tilde '~~~~' get rendered as a single tilde. => ~~
+** A single tilde before a link ('~~http~:~/~/foo.bar') prevents linking.
+   => ~http://foo.bar
+** Two tildes before a link ('~~~~http~:~/~/foo.bar') produce a tilde
+   followed by the hyperlinked URL.
+   => ~~http://foo.bar
+** A tilde inside an URL gets removed, unless it's formatted inside
+   ~[ ~] brackets.
+   Two tildes inside an URL (without brackets) become a single tilde.
+   => [http://foo.bar/~user] or http://foo.bar/~~user
+* Special non-ascii or non-latin characters are printed as-is only if supported
+  by the native wiki CHARSET. Add such characters on a non-supported CHARSET with the RawHtmlPlugin if it is enabled by the Admin and e.g. the &#num; syntax. %%%
+  E.g. These japanese euc-jp chars '&#12363;&#12425; &#26032;&#35215;&#12506;&#12540;&#12472;' on this =<?plugin SystemInfo CHARSET?>= wiki.
+  And with the plugin: <?plugin RawHtml &#12363;&#12425; &#26032;&#35215;&#12506;&#12540;&#12472; ?> %%%
+  And this is how it should like: [http://phpwiki.sourceforge.net/demo/images/chars-releasenotes-japanese.png]
+
+!!! Paragraphs
+
+* Don't indent paragraphs
+* Words wrap and fill as needed
+* Use blank lines as separators
+* Four or more minus signs make a horizontal rule
+* =~%%%= or =~<br>= makes a linebreak (in headings and lists too)
+
+
+!!! Lists
+
+* asterisk for first level
+  * indented asterisk (indent at least two spaces) for second level, etc.
+* Use <tt>~*</tt>, <tt>-</tt>, <tt>+</tt> or <tt>o</tt> for bullet
+  lists, <tt>#</tt> for numbered lists (mix at will)
+* Definition lists:
+  <pre>
+  Term:
+    definition
+  </pre>
+  gives
+  Term:
+    definition
+  as in the =<DL><DT><DD>= list
+* Items may contain multiple paragraphs and other multi-lined content,
+  just indent the items
+
+
+!!! Headings
+
+* '=!=' at the start of a line makes a small heading
+* '=!!=' at the start of a line makes a medium heading
+* '=!!!=' at the start of a line makes a large heading
+
+
+!!! Preformatted text
+
+* Place preformatted lines inside =~<pre>=:
+  <verbatim>
+  <pre>
+  Preformatted text. WikiLinks still work.
+  </pre>
+  </verbatim>
+  gives
+  <pre>
+  Preformatted text. WikiLinks still work.
+  </pre>
+* If you want text with no Wiki interaction, use the =~<verbatim>= tag:
+  <pre>
+  <verbatim>
+  Preformatted text. ~WikiLinks do not work.
+  </verbatim>
+  </pre>
+  gives
+  <verbatim>
+  Preformatted text. WikiLinks do not work.
+  </verbatim>
+
+
+!!!Indented Paragraphs
+
+* Two or more whitespaces signal indented text. Indents may be nested.
+
+    This is an indented block of text.
+
+      This block is even more indented.
+
+* E-mail style block-quoting is supported as well:
+  <pre>
+  > This is block-quoted text.
+  </pre>
+  renders as
+
+  > This is block-quoted text.
+
+
+!!! Emphasis
+
+* Use an underscore (<tt>~_</tt>) for emphasis (usually _italics_)
+* Use an asterisk (<tt>~*</tt>) for strong emphasis (usually *bold*)
+* Mix them at will: *_bold italics_*
+* _Emphasis_ can be used _multiple_ times within a paragraph, but
+  _cannot_ cross paragraph boundaries:
+
+  _this
+
+  will not work_
+
+!!! References
+
+* Hyperlinks to other pages within the Wiki are made by placing the
+  page name in square brackets: [this is a page link] or
+  UsingWikiWords (preferred)
+* Hyperlinks to external pages are done like this:
+  [http://www.wcsb.org/]
+* You can name the links by providing a name, a bar (|) and then the
+  hyperlink or pagename:
+  [PhpWiki home page | http://phpwiki.sourceforge.net/] ---
+  [the front page | HomePage]
+* You can suppress linking to old-style references and URIs by
+  preceding the word with a '<tt>~~</tt>', e.g. ~NotLinkedAsWikiName,
+  ~http://not.linked.to/
+* Also, the old way of linking URL's is still supported: precede URLs
+  with "<tt>http:</tt>", "<tt>ftp:</tt>" or "<tt>mailto:</tt>" to
+  create links automatically as in: http://c2.com/
+* URLs ending with =.png=, =.gif=, or =.jpg= are inlined if in square
+  brackets, by themselves:
+  [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png]
+* In-page #[hyperlinks] are made by placing a named anchor and
+  referring to the anchor in a hyperlink:
+  * Named anchors:
+    * <tt>~#~[foo]</tt>: An anchor around the text "foo" with id
+      "foo".
+    * <tt>~#~[|foo]</tt>: An empty anchor with id "foo".
+    * <tt>~#~[howdy|foo]</tt>: An anchor around the text "howdy" with
+      id "foo".
+  * References to name anchors are made thusly:%%%
+    <tt>~[~#[#hyperlinks]]</tt>, <tt>~[~OtherPage#foo]</tt>,
+    <tt>~[named|~OtherPage#foo]</tt>.
+
+
+!!! Tables
+
+* Definition list style tables are written just like definition lists,
+  except that you replace the trailing colon on the term with a "pipe"
+  (<tt>|</tt>).
+
+  <pre>
+  Term 1 |
+     Definition 1 begins here.
+     Term 1.1 |
+        Definition 1.1
+     Term 1.2 |
+        Definition 1.2
+     This is part of definition 1.
+  Term 2 |
+     Here's definition 2.
+  </pre>
+
+  Term 1 |
+     Definition 1 begins here.
+     Term 1.1 |
+        Definition 1.1
+     Term 1.2 |
+        Definition 1.2
+     This is part of definition 1.
+  Term 2 |
+     Here's definition 2.
+
+* Old-style tables are supported through the OldStyleTablePlugin:
+
+!!! HTML Mark-Up Language
+
+* Some in-line markup is allowed through the use of HTML tags:
+  <b>b</b>, <big>big</big>, <i>i</i>, <small>small</small>,
+  <tt>tt</tt>, <em>em</em>, <strong>strong</strong>,
+  <abbr>abbr</abbr>, <acronym>acronym</acronym>, <cite>cite</cite>,
+  <code>code</code>, <dfn>dfn</dfn>, <kbd>kbd</kbd>,
+  <samp>samp</samp>, <var>var</var>, <sup>sup</sup> and <sub>sub</sub>
+* < and > are themselves
+* The & characters will not work
+
+!!! Creating various kinds of special links
+
+* See [MagicPhpWikiURLs] for gory details on how to write various kind
+  of wiki maintenance and other special links.
+
+!!! Inserting plugins
+
+* Several plugins permit embedding additional functionality to Wiki
+  pages. For example,
+  <verbatim>
+  <?plugin BackLinks page=HomePage info=hits ?>
+  </verbatim>
+  gives
+  <?plugin BackLinks page=HomePage info=hits ?>
+
+* For more information on plugins see WikiPlugin, and PluginManager for a list of all
+  plugins.
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/TitleSearch--1 12p3/tests/unit/.testbox/ver_data/TitleSearch--1
--- 11p1/tests/unit/.testbox/ver_data/TitleSearch--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/TitleSearch--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,25 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:697:"<?plugin TitleSearch ?>
+
+----
+
+Additional Searches:
+<?plugin WikiFormRich action=TitleSearch method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+  checkbox[] name=case_exact
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql" ?>
+
+<?plugin WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+  checkbox[] name=case_exact
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql" ?>
+
+<?plugin WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+  checkbox[] name=case_exact ?>
+
+----
+
+<?plugin IncludePage page=FindPage quiet=1 section=Tips sectionhead=1 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/TranscludePlugin--1 12p3/tests/unit/.testbox/ver_data/TranscludePlugin--1
--- 11p1/tests/unit/.testbox/ver_data/TranscludePlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/TranscludePlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,38 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:1253:"The TranscludePlugin can be used to embed include whole (external) web
+pages within a wiki page.
+
+! Plugin Arguments
+
+=src= |
+  The URL of the page to transclude
+=height= |
+  The (initial) height of the transclusion frame.
+  If, possible, after the transcluded page is loaded,
+  the frame is resized via javascript so that it
+  fits the entire transcluded page.  (See below for more.)
+
+! Bugs / Caveats
+
+o Pages are transcluded using =<iframe>= tags.  Older browsers do not
+  support ''iframe''s.  In that case the user will be presented with a
+  link to the trancluded material.
+
+o When possible, JavaScript code is used to adjust the height of the
+  _iframe_ so that it fits the entire transcluded page.
+  Unfortunately, this seems possible only when the transcluded page
+  comes from the same server as the wiki page.  (This restriction is
+  due to security checks built in to the JavaScript language.)
+
+o The recursion detection code does not currently work.  Be careful to
+  avoid recursive transclusions, or you'll be sorry (or at least
+  amused.)
+
+! Example
+
+<verbatim>
+<?plugin Transclude src="http://phpwiki.sourceforge.net/demo/ChangeLog" ?>
+</verbatim>
+
+will get you
+
+<?plugin Transclude src="http://phpwiki.sourceforge.net/demo/ChangeLog" ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/TranslateText--1 12p3/tests/unit/.testbox/ver_data/TranslateText--1
--- 11p1/tests/unit/.testbox/ver_data/TranslateText--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/TranslateText--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:25:"<?plugin TranslateText ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/UnfoldSubpagesPlugin--1 12p3/tests/unit/.testbox/ver_data/UnfoldSubpagesPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/UnfoldSubpagesPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/UnfoldSubpagesPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,60 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:2189:"The ~UnfoldSubpages WikiPlugin is used to display all or some subpages
+of the current or a given page.  This gives a overview for a
+WikiBlogPlugin, CalendarPlugin or similar subpages.
+
+Warning: Don't use it with subpages with non-existant sections!
+The section extractor is currently quite unstable.
+
+! Usage:
+<verbatim>
+     <?plugin UnfoldSubpages ?>
+  or <?plugin UnfoldSubpages sortby=-mtime words=50 maxpages=5 ?>
+  or <?plugin UnfoldSubpages quiet=1 smalltitle=1 ?>
+  or <?plugin UnfoldSubpages sections=2 words=100 ?>
+  or <?plugin UnfoldSubpages lines=3 ?>
+  or <?plugin UnfoldSubpages pagename="PhpWikiAdministration"
+              section="Plugin Arguments" sectionhead=1 ?>
+</verbatim>
+
+!! Plugin Arguments:
+<strong>pagename</strong>:
+  Any pagename or if empty the current page. Default: ""
+<strong>quiet</strong>:
+  Print no header.  Default: false
+<strong>sortby</strong>:
+  Sort by + (ASC) or - (DESC) and one column.
+  Multiple columns like sortby="-hits,-mtime" not yet supported.
+  Supported columns: ~[+|-]pagename, ~[+|-]mtime, ~[+|-]hits.
+  Default: "pagename"
+<strong>maxpages</strong>:
+  Maximum number of pages to include or all if not defined.
+  Default: false
+<strong>sections</strong>:
+  Maximum number of sections per page to include or all if not defined.
+  Default: false
+<strong>section</strong>:
+  Include this named section per page only if defined. Default: ""
+<strong>sectionhead</strong>:
+  When including a named section show the heading. Default: false
+<strong>smalltitle</strong>:
+  If set, hide transclusion-title, just have a small link at the start of
+  the page. Default: false
+<strong>words</strong>:
+  Maximum number of words per page to include. Default: false
+<strong>lines</strong>:
+  Maximum number of lines per page to include. Default: false
+<strong>bytes</strong>:
+  Maximum number of bytes per page to include. Default: false
+
+! Deprecated Arguments:
+<strong>pages</strong>:
+  deprecated. renamed to maxpages.
+<strong>sort</strong>:
+  'asc' or 'desc'. deprecated: use "+" or "-" before the column name with sortby.
+
+! Example:
+<?plugin UnfoldSubpages pagename=PgsrcTranslation limit=20 ?>
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/UpLoad--1 12p3/tests/unit/.testbox/ver_data/UpLoad--1
--- 11p1/tests/unit/.testbox/ver_data/UpLoad--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/UpLoad--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,4 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:114:"__Upload a file which will be accessible by prefixing the filename with "Upload~:".__
+----
+<?plugin UpLoad ?>
+----";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/UpLoadPlugin--1 12p3/tests/unit/.testbox/ver_data/UpLoadPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/UpLoadPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/UpLoadPlugin--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,41 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:1453:"The UpLoad WikiPlugin displays an editbox and two buttons.
+The first button let's you choose the file to be uploaded at your local filesystem.
+The textvalue of this button is localised from your browser.
+The second "Upload" button actually uploads the given filename to the upload directory.
+This directory is not browsable, any file there may be accessed by using the "Upload~:"
+InterWikiMap prefix to the given filename. This way you can easily inline uploaded images.
+See PhpWiki:InlineUploadedImages
+
+! Usage:
+<verbatim>
+     <?plugin UpLoad ?>
+</verbatim>
+
+!! Plugin Arguments:
+__logfile__:
+  local path. Default: "phpwiki-upload.log"
+  The format is currently HTML - a new <tr> row per entry - and not log file syntax.
+__autolink__:
+  Add the uploaded filename to the list of uploaded files at the page.
+  Default: true
+__page__:
+  The page where the uploaded files are publicly listed, if autolink is true.
+  Default: current page.
+
+! Conflicts:
+
+# The user must be authenticated to be able to upload.
+# The filename may not end with certain disallowed extensions, to prevent from abuse.
+# MAX_FILE_SITE is configured by the config.ini option MAX_UPLOAD_SIZE, which defaults to 16MB.
+  Your webserver and php may add another limit.
+# Already existing uploaded files are NOT overwritten.
+# Certain internal php problems for Windows and MacOSX have been fixed with 1.3.9.
+
+----
+
+! Example:
+<?plugin UpLoad ?>
+
+-----
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/UserPreferences--1 12p3/tests/unit/.testbox/ver_data/UserPreferences--1
--- 11p1/tests/unit/.testbox/ver_data/UserPreferences--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/UserPreferences--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:26:"<?plugin UserPreferences?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/WabiSabi--1 12p3/tests/unit/.testbox/ver_data/WabiSabi--1
--- 11p1/tests/unit/.testbox/ver_data/WabiSabi--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/WabiSabi--1	2006-06-18 06:20:04.000000000 -0500
@@ -0,0 +1,49 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625927;s:8:"%content";s:1782:"Since wabi-sabi represents a comprehensive Japanese world view or
+aesthetic system, it is difficult to explain precisely in western
+terms.  According to Leonard Koren, wabi-sabi is the most conspicuous
+and characteristic feature of what we think of as traditional Japanese
+beauty and it ''"occupies roughly the same position in the Japanese
+pantheon of aesthetic values as do the Greek ideals of beauty and
+perfection in the West."''
+
+_"Wabi-sabi is a beauty of things imperfect, impermanent, and_
+_incomplete._
+
+_"It is the beauty of things modest and humble._
+
+_"It is the beauty of things unconventional."_
+
+(quoted from "[WABI-SABI: FOR ARTISTS,DESIGNERS, POETS & PHILOSOPHERS | http://www.amazon.com/exec/obidos/tg/detail/-/1880656124/qid=1054098290/sr=1-1/ref=sr_1_1/104-9834820-5562358?v=glance&s=books]," 1994, Leonard Koren)
+
+The concepts of wabi-sabi correlate with the concepts of Zen Buddhism,
+as the first Japanese involved with wabi-sabi were tea masters,
+priests, and monks who practiced Zen. Zen Buddhism originated in
+India, traveled to China in the 6th century, and was first introduced
+in Japan around the 12th century. Zen emphasizes ''"direct, intuitive
+insight into transcendental truth beyond all intellectual
+conception."'' At the core of wabi- sabi is the importance of
+transcending ways of looking and thinking about things/existence.
+
+* All things are impermanent
+* All things are imperfect
+* All things are incomplete
+
+
+(also taken from WABI-SABI: FOR ARTISTS,DESIGNERS, POETS & PHILOSOPHERS, 1994, Leonard Koren):
+
+_Material characteristics of wabi-sabi:_
+
+* _suggestion of natural process_
+* _irregular_
+* _intimate_
+* _unpretentious_
+* _earthy_
+* _simple_
+
+
+
+For more about wabi-sabi, see [http://c2.com/cgi/wiki?WabiSabi].
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/WantedPages--1 12p3/tests/unit/.testbox/ver_data/WantedPages--1
--- 11p1/tests/unit/.testbox/ver_data/WantedPages--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/WantedPages--1	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1,12 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625928;s:8:"%content";s:481:"Here is a list of pages that have been cited on this wiki but are not
+yet written. Although they appear to be wanted, they may be
+misspellings of existing pages or pages too trivial to merit creation.
+
+The best course of action for these pages isn't necessarily to create
+a page. Often, it is better to change the references so they are no
+longer ~WikiNames. Where applicable, you can just change the case, add
+spaces or insert an escape character ~~.
+
+----
+
+<?plugin WantedPages?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/WhoIsOnline--1 12p3/tests/unit/.testbox/ver_data/WhoIsOnline--1
--- 11p1/tests/unit/.testbox/ver_data/WhoIsOnline--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/WhoIsOnline--1	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625928;s:8:"%content";s:38:"<?plugin WhoIsOnline allow_detail=1 ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/WikiAdminSelect--1 12p3/tests/unit/.testbox/ver_data/WikiAdminSelect--1
--- 11p1/tests/unit/.testbox/ver_data/WikiAdminSelect--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/WikiAdminSelect--1	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625928;s:8:"%content";s:35:"<?plugin WikiAdminSelect s||="*" ?>";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/WikiBlogPlugin--1 12p3/tests/unit/.testbox/ver_data/WikiBlogPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/WikiBlogPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/WikiBlogPlugin--1	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1,8 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625928;s:8:"%content";s:218:"This simple plugin allows blog-style entries on a page. Try making a few entries, and then look at RecentChanges to get an idea of how things work.
+
+<?plugin WikiBlog ?>
+
+
+-------------
+
+PhpWikiDocumentation WikiPlugin";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/WikiPlugin--1 12p3/tests/unit/.testbox/ver_data/WikiPlugin--1
--- 11p1/tests/unit/.testbox/ver_data/WikiPlugin--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/WikiPlugin--1	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1,173 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625928;s:8:"%content";s:6252:"Since PhpWiki-1.3.3 support for ~WikiPlugins is included.
+
+A plugin is some PHP code that
+
+* lives in =phpwiki/lib/plugin/<pluginname>.php=
+* implements the ~WikiPlugin interface by extending that class.
+
+There are many plugins already distributed with PhpWiki. Simply look in the =lib/plugin=
+directory or see the PluginManager list.
+
+To write your own, look at the HelloWorldPlugin (~HelloWorld.php in that directory),
+which is a minimal example of a plugin.
+Publish your self-written plugin at a new PhpWiki page with ~PluginName + *Plugin* appended
+and add a link to [CategoryContributedPlugin | PhpWiki:CategoryContributedPlugin].
+
+A WikiPlugin allows one to easily add new types of dynamic content
+(as well as other functionality) to wiki pages within PhpWiki.
+In this very wiki all actions which are not entirely lowercased
+are implemented using plugins, and some lowercased convenience actions also. (rename, revert, setacl, diff, ...)
+
+(The old-style [MagicPhpWikiURLs] have been replaced by plugins entirely.)
+
+!!!Example
+
+Currently, one invokes a plugin by putting something like:
+
+<verbatim>
+<?plugin AllPages limit=5?>
+</verbatim>
+
+into a regular wiki-page.  That particular example produces a list of
+the first 5 existing pages (via the ~PageList library).
+
+<?plugin AllPages limit=5 ?>
+
+!!!Details
+
+Plugins can take certain named arguments (most do).  The values of
+these arguments can be determined four different ways.  In order of
+precedence:
+
+# The plugin invocation can specify the value for an argument, like so:
+  <verbatim>
+  <?plugin BackLinks page=OtherPage ?>
+  </verbatim>
+
+# The argument can be specified via an HTTP query argument.  This
+  doesn't happen (is not allowed) unless the argument is mentioned in
+  the plugin invocation:
+
+  <verbatim>
+  <?plugin BackLinks page ?>
+  </verbatim>
+
+# Default values specified in the plugin invocation:
+
+  <verbatim>
+  <?plugin BackLinks page||=OtherPage ?>
+  </verbatim>
+
+# The plugin must supply default values for each argument it uses.
+  Such default args may be overriden by URL arguments like so:
+  <verbatim>
+    BackLinks?page=ThisPage&sortby=-mtime
+  </verbatim>
+  (The BackLinks plugin uses the current page as the default value for
+  the ''page'' argument.)
+
+  Most plugins using the ~PageListLibrary inherit their default arguments
+  from the PhpWiki:PageListLibrary.
+
+!! Standard Arguments
+
+Most plugins display a list of pages, via the ~PageListLibrary.
+~PageList provides automatic support for those arguments.
+
+  info, exclude, author, owner, creator, sortby, limit, paging, cols, azhead,
+  comma, commasep, ordered
+
+  For details see the PhpWiki:PageListLibrary documentation.
+
+*exclude* and *pages* accept a list of pages. Either as comma-seperated list,
+supporting glob-style wildcards, or via the <tt><!plugin-list pluginname ~[args~] !></tt>
+invocation syntax, where pluginname might be any plugin returning a pagelist.
+See PhpWiki:PluginList.
+
+!! Basic Plugin Types
+
+All these plugins derive from the WikiPlugin class extending the run method,
+which returns a object tree of HTML objects, and may react on any
+provided arguments from the ~WikiPage (see the args below) or
+optionally overridden by arguments from the url (GET or POST args),
+if defined via '||='.
+
+A basic plugin just needs the run() method, and optionally getName,
+getDescription, getVersion, getDefaultArguments. See the HelloWorldPlugin for a short introduction.
+
+  *plugin* reacts on its arguments and the request and displays arbitrary HTML.
+
+  *plugin-form* is used to display a input type=text box for the default argument *s*.
+
+  *plugin-list* is used as argument to provide a dynamic list of pagenames.
+
+  <verbatim>
+    <?plugin PluginName [args...] ?>
+  </verbatim>
+
+  <verbatim>
+    <?plugin-form PluginName [args...] ?>
+  </verbatim>
+
+  <verbatim>
+    <?plugin PluginName args=<!plugin-list pluginname [args] !> ?>
+  </verbatim>
+
+! The box Method
+
+Themes based on the "sidebar" theme may use the box method of any plugin, which displays a *title*
+and a condensed *content* in a box.
+
+! ~WikiPluginCached
+
+Plugins deriving from the class ~WikiPluginCached must also define the methods getPluginType(),
+optionally getExpire(), managesValidators(), and dependent of the getPluginType the methods
+to display the *possibly cached* result.
+
+  getImage(), getMap() or getHtml(),
+
+optionally also
+
+  getAlt(), getImageType(), embedMap(), embedImg(), embedObject()
+
+See the config.ini PLUGIN_CACHED_* settings and PhpWiki:WikiPluginCached
+
+!! Action Pages
+
+The term *~ActionPage* refers to a page containing a plugin invocation.
+An *action* is together with the *pagename* argument the a basic PhpWiki argument.
+It can both be GET or POST actions. Actions are untranslated, always english.
+Basic (and old) actions are all lowercase, like edit, browse, remove, ...
+Newer actions in PhpWiki:CamelCase are invoked via plugins on their specific action page.
+
+We decoupled actions from plugins via action pages for the following reasons:
+
+# support translated action buttons and customizable action descriptions.
+# customize standard actions by tuning the plugin invocation arguments. override or add plugin defaults.
+# split simple plugins into multiple actions, like RecentChanges/RecentEdits, MostPopular/LeastPopular,
+  AllPages/AllPagesCreatedByMe/AllPagesLastEditedByMe/AllPagesOwnedByMe which differ only in one argument.
+
+* Those actions which have buttons or links in the theme or are referenced in the standard pgsrc
+  pageset require their (possibly localized) actionpages, otherwise the actions will not work.
+* If the localized actionpage is not found the english version is used.
+* If no actionpage is found, it is recommended to do action=upgrade, which imports all missing
+  and required action pages into the database.
+
+So for a hypothetical new ~MyActionPage plugin ~MyActionPage will invoke the plugin and
+~MyActionPagePlugin is the the description.
+
+!!! Existing Plugins
+
+See PluginManager for a detailed list. Most plugins should have their own description page with the name
+*Plugin* appended.
+
+<?plugin BackLinks noheader=1 ?>
+
+!!! Contributed Plugins
+
+See PhpWiki:CategoryContributedPlugin.
+
+<?plugin Backlinks page=CategoryContributedPlugin ?>
+
+-----
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/.testbox/ver_data/WikiWikiWeb--1 12p3/tests/unit/.testbox/ver_data/WikiWikiWeb--1
--- 11p1/tests/unit/.testbox/ver_data/WikiWikiWeb--1	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/tests/unit/.testbox/ver_data/WikiWikiWeb--1	2006-06-18 06:20:05.000000000 -0500
@@ -0,0 +1,24 @@
+a:6:{s:6:"markup";s:1:"2";s:6:"author";s:6:"a_user";s:9:"author_id";s:6:"a_user";s:8:"pagetype";s:8:"wikitext";s:5:"mtime";i:1150625928;s:8:"%content";s:823:"A WikiWikiWeb is a site where everyone can collaborate on the
+content. The most well-known and widely used Wiki is the Portland
+Pattern Repository at http://c2.com/cgi-bin/wiki?WikiWikiWeb.
+
+You and I will find these statements there particularly relevant:
+
+''The point is to make the EditText form simple and the FindPage
+search fast.''
+
+''In addition to being quick, this site also aspires to Zen ideals
+generally labeled WabiSabi. Zen finds beauty in the imperfect and
+ephemeral. When it comes down to it, that's all you need.''
+
+''The Universe tends toward chaos. The Universe tends toward Wiki.''
+
+You can say hello on RecentVisitors, or read about HowToUseWiki and
+AddingPages. Currently this Wiki has no theme for discussion, so go
+ahead and play with it and have fun!!
+
+--SteveWainstead.
+
+----
+
+PhpWikiDocumentation";}
\ No newline at end of file
diff -ruN 11p1/tests/unit/test.php 12p3/tests/unit/test.php
--- 11p1/tests/unit/test.php	2005-09-11 07:29:12.000000000 -0500
+++ 12p3/tests/unit/test.php	2006-06-18 06:20:06.000000000 -0500
@@ -1,6 +1,6 @@
 <?php // #!/usr/local/bin/php -Cq
 /* Copyright (C) 2004 Dan Frankowski <dfrankow@cs.umn.edu>
- * Copyright (C) 2004 Reini Urban <rurban@x-ray.at>
+ * Copyright (C) 2004,2005,2006 Reini Urban <rurban@x-ray.at>
  *
  * This file is part of PhpWiki.
  * 
@@ -49,21 +49,28 @@
 // web: Mem29424 => Mem35400  (without USECACHE) (6MB)
 //define('USECACHE', false);
 
-####################################################################
-#
-# Preamble needed to get the tests to run.
-#
-####################################################################
+//##################################################################
+//
+// Preamble needed to get the tests to run.
+//
+//##################################################################
 
 $cur_dir = getcwd();
-# Add root dir to the path
+// Add root dir to the path
 if (substr(PHP_OS,0,3) == 'WIN')
     $cur_dir = str_replace("\\","/", $cur_dir);
 $rootdir = $cur_dir . '/../../';
 $ini_sep = substr(PHP_OS,0,3) == 'WIN' ? ';' : ':';
-$include_path = ini_get('include_path') . $ini_sep . $rootdir . $ini_sep . $rootdir . "lib/pear";
+$include_path = ini_get('include_path') . $ini_sep 
+              . $rootdir . $ini_sep . $rootdir . "lib/pear";
 ini_set('include_path', $include_path);
 define('DEFAULT_LANGUAGE','en'); // don't use browser detection
+$LANG='en';
+if (!isset($HTTP_SERVER_VARS)) {
+   $HTTP_SERVER_VARS =& $_SERVER;
+   $HTTP_GET_VARS    =& $_GET;
+   $HTTP_POST_VARS   =& $_POST;
+}
 
 if (!empty($HTTP_SERVER_VARS) and $HTTP_SERVER_VARS["SERVER_NAME"] == 'phpwiki.sourceforge.net') {
     ini_set('include_path', ini_get('include_path') . ":/usr/share/pear");
@@ -76,10 +83,21 @@
 $database_backends = array(
                            'file',
                            'dba',
-                           'SQL',
-                           'ADODB',
+                           'SQL',   // default backend defined in the config.ini DSN
+                           'ADODB', // same backend as defined in the config.ini DSN
+			   // specific backends (need to be setup as db=test_phpwiki)
+			   'PearDB_pgsql', 'PearDB_sqlite', 'PearDB_mysql',
+			   //'PearDB_oci8','PearDB_mssql', 
+			   'ADODB_postgres7', 'ADODB_sqlite', 'ADODB_mysql', 
+			   //'ADODB_oci8', 'ADODB_mssql', 
+                           // 'cvs'
                            );
+if ((int)substr(phpversion(), 1) >= 5)
+    array_push($database_backends, 'PDO_pqsql', 'PDO_sqlite', 'PDO_mysql');
+                                   //'PDO_oci', 'PDO_odbc'
+
 //TODO: convert cvs test                           
+// For "cvs" see the seperate tests/unit_test_backend_cvs.php (cvs is experimental)
 //TODO: read some database values from config.ini, just use the "test_" prefix
 // "flatfile" testing occurs in "tests/unit/.testbox/"
 // "dba" needs the DATABASE_DBA_HANDLER, also in the .textbox directory
@@ -88,9 +106,8 @@
 //  You have to create that database beforehand with our schema
 //$database_dsn = "mysql://wikiuser:@localhost/phpwiki";
 $database_prefix = "test_";
-// For "cvs" see the seperate tests/unit_test_backend_cvs.php (cvs is experimental)
 
-# Quiet warnings in IniConfig.php
+// Quiet warnings in IniConfig.php
 $HTTP_SERVER_VARS['REMOTE_ADDR'] = '127.0.0.1';
 $HTTP_SERVER_VARS['HTTP_USER_AGENT'] = "PHPUnit";
 
@@ -123,7 +140,7 @@
     }
 }
 */
-# Show lots of detail when an assert() in the code fails
+// Show lots of detail when an assert() in the code fails
 function assert_callback( $script, $line, $message ) {
    echo "assert failed: script ", $script," line ", $line," :";
    echo "$message";
@@ -135,9 +152,9 @@
 }
 $foo = assert_options( ASSERT_CALLBACK, 'assert_callback');
 
-#
-# Get error reporting to call back, too
-#
+//
+// Get error reporting to call back, too
+//
 // set the error reporting level for this script
 if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
     error_reporting(E_ALL & ~E_STRICT); 	// exclude E_STRICT
@@ -194,6 +211,7 @@
         break;
     case 'SQL':
     case 'ADODB':
+    case 'PDO':
         foreach ($dbi->_backend->_table_names as $table) {
             $dbi->genericSqlQuery("DELETE FROM $table");
         }
@@ -278,8 +296,11 @@
    }
 }");
     $option = HTML::div(array('class' => 'option'),
-                        HTML::span(array('style'=>'font-weight: bold','onDblClick'=>'flipAll(\'_debug[\')'), 'debug: '),
-                        HTML::input(array('name'=>'debug','id'=>'debug','value'=>$debug_level,'size'=>5)),
+                        HTML::span(array('style'=>'font-weight: bold',
+                                         'onDblClick'=>'flipAll(\'_debug[\')'), 
+                                   'debug: '),
+                        HTML::input(array('name'=>'debug','id'=>'debug',
+                                          'value'=>$debug_level,'size'=>5)),
                         HTML::br());
     foreach (array('VERBOSE' 	=> 1,
                    'PAGELINKS' 	=> 2,
@@ -299,7 +320,8 @@
 
     $option = HTML::div(array('class' => 'option'), 
                         HTML::span(array('style'=>'font-weight: bold'), "level: "),
-                        HTML::input(array('name'=>'level','id'=>'level','value'=>$user_level,'size'=>5)),
+                        HTML::input(array('name'=>'level','id'=>'level',
+                                          'value'=>$user_level,'size'=>5)),
                         HTML::br());
     foreach (array('FORBIDDEN' 	=> -1,
                    'ANON' 	=> 0,
@@ -338,11 +360,11 @@
     return $table->printXml();
 }
 
-####################################################################
-#
-# End of preamble, run the test suite ..
-#
-####################################################################
+//####################################################################
+//
+// End of preamble, run the test suite ..
+//
+//####################################################################
 
 ob_start();
 
@@ -362,7 +384,9 @@
 $alltests = array('InlineParserTest','HtmlParserTest',
                   'PageListTest','ListPagesTest',
                   'SetupWiki',
-                  'AllPagesTest','AllUsersTest','OrphanedPagesTest','WantedPagesTest','TextSearchTest',
+                  'AllPagesTest','AllUsersTest','OrphanedPagesTest',
+                  'WantedPagesTest',
+                  'TextSearchTest','IncludePageTest',
                   'DumpHtml');
 // support db=file db=dba test=SetupWiki test=DumpHtml debug=num -dconstant=value
 // or  db=file,dba test=SetupWiki,DumpHtml debug=num -dconstant=value
@@ -383,6 +407,7 @@
     $runtests = array();
     $define = array();
     $run_database_backends = array();
+    $m = array();
     foreach ($argv as $arg) {
         if (preg_match("/^test=(.+)$/",$arg,$m) and in_array($m[1], $alltests))
             $runtests[] = $m[1];
@@ -442,7 +467,7 @@
     printMemoryUsage("beforePhpWiki");
 
 define('PHPWIKI_NOMAIN', true);
-# Other needed files
+// Other needed files
 require_once $rootdir.'index.php';
 require_once $rootdir.'lib/main.php';
 
@@ -455,10 +480,12 @@
 
 if ($debug_level & 1) {
     //echo "\n";
-    echo "PHPWIKI_VERSION=",PHPWIKI_VERSION, strstr(PHPWIKI_VERSION,"pre") ? strftime(" / %Y%m%d") : "","\n";
+    echo "PHPWIKI_VERSION=",PHPWIKI_VERSION, 
+        strstr(PHPWIKI_VERSION,"pre") ? strftime(" / %Y%m%d") : "","\n";
     if ($debug_level & 9) {
         // which constants affect memory?
-        foreach (explode(",","USECACHE,WIKIDB_NOCACHE_MARKUP,ENABLE_USER_NEW,ENABLE_PAGEPERM") as $v) {
+        foreach (explode(",","USECACHE,WIKIDB_NOCACHE_MARKUP,"
+                            ."ENABLE_USER_NEW,ENABLE_PAGEPERM") as $v) {
             printConstant($v);
         }
     }
@@ -467,9 +494,9 @@
 
 global $ErrorManager;
 $ErrorManager->setPostponedErrorMask(EM_FATAL_ERRORS|EM_WARNING_ERRORS|EM_NOTICE_ERRORS);
-//FIXME: ignore cached requests (if-modified-since) from cli
+// FIXME: ignore cached requests (if-modified-since) from cli
 class MockRequest extends WikiRequest {
-    function MockRequest(&$dbparams) {
+    function MockRequest($dbparams) {
         $this->_dbi = WikiDB::open($dbparams);
         $this->_user = new MockUser("a_user", $GLOBALS['user_level']);
         $this->_group = new GroupNone();
@@ -516,19 +543,20 @@
     $request->_prefs = $request->_user->getPreferences();
 }
 */
-include_once("themes/" . THEME . "/themeinfo.php");
 if (DEBUG & _DEBUG_TRACE)
     printMemoryUsage("PhpWikiLoaded");
 
 // provide a nice input form for all options
 if (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {
     echo html_option_form();
+    flush();
 }
 
 // save and restore all args for each test.
 class phpwiki_TestCase extends PHPUnit_TestCase {
     function setUp() { 
-        global $request;
+        global $request, $WikiTheme;
+	include_once("themes/" . THEME . "/themeinfo.php");
         $this->_savedargs = $request->_args;
         $request->_args = array();
         if (DEBUG & 1) {
@@ -544,19 +572,34 @@
     }
 }
 
-# Test all db backends.
+// Test all db backends.
 foreach ($run_database_backends as $dbtype) {
+    global $request, $DBParams;
     //    if (DEBUG & _DEBUG_TRACE)
     //        printMemoryUsage("PHPUnitInitialized");
-
-    $DBParams['dbtype']               = $dbtype;
+    $DBParams['dbtype'] = $dbtype;
+    if (string_starts_with($dbtype, 'PearDB_')) {
+	$DBParams['dbtype'] = 'SQL';
+	$DBParams['dsn'] = preg_replace("/^([^:]+):/", substr($dbtype, 7).":", $DBParams['dsn']);
+        echo "dsn: ",$DBParams['dsn'],"\n";
+    }
+    if (string_starts_with($dbtype, 'ADODB_')) {
+	$DBParams['dbtype'] = 'ADODB';
+	$DBParams['dsn'] = preg_replace("/^([^:]+):/", substr($dbtype, 6).":", $DBParams['dsn']);
+        echo "dsn: ",$DBParams['dsn'],"\n";
+    }
+    if (string_starts_with($dbtype, 'PDO_')) {
+	$DBParams['dbtype'] = 'PDO';
+	$DBParams['dsn'] = preg_replace("/^([^:]+):/", substr($dbtype, 4).":", $DBParams['dsn']);
+        echo "dsn: ",$DBParams['dsn'],"\n";
+    }
     $DBParams['directory']            = $cur_dir . '/.testbox';
     $DBParams['prefix']               = $database_prefix;
     // from config.ini
-    //$DBParams['dsn']                  = $database_dsn;
     //$DBParams['dba_handler']          = $database_dba_handler;
 
     echo "Testing DB Backend \"$dbtype\" ...\n";
+    flush();
     $request = new MockRequest($DBParams);
     if ( ! ENABLE_USER_NEW ) {
         $request->_user->_request =& $request;
diff -ruN 11p1/tests/xmlrpc/xmlrpc-client.php 12p3/tests/xmlrpc/xmlrpc-client.php
--- 11p1/tests/xmlrpc/xmlrpc-client.php	2005-01-21 05:12:55.000000000 -0600
+++ 12p3/tests/xmlrpc/xmlrpc-client.php	2006-06-18 06:20:06.000000000 -0500
@@ -171,11 +171,11 @@
 
     //global $wiki_dmap;
 
-    run_test($server, $debug, $output, "wiki.getRPCVersionSupported", '', 1);
+    run_test($server, $debug, $output, "wiki.getRPCVersionSupported", '', 2);
     
     // getRecentChanges of the last day:
-    // Note: may crash with dba on index.php, not on RPC2.php
-    run_test($server, $debug, $output, "wiki.getRecentChanges", iso8601_encode(time()-86400));
+    // Note: crashes with dba on index.php, not on RPC2.php
+    //run_test($server, $debug, $output, "wiki.getRecentChanges", iso8601_encode(time()-86400));
     
     run_test($server, $debug, $output, "wiki.getPage", "HomePage", "* What is a WikiWikiWeb? A description of this application. * Learn HowToUseWiki and learn about AddingPages. * Use the SandBox page to experiment with Wiki pages. * Please sign your name in RecentVisitors. * See RecentChanges for the latest page additions and changes. * Find out which pages are MostPopular. * Read the ReleaseNotes and RecentReleases. * Administer this wiki via PhpWikiAdministration. * See more PhpWikiDocumentation.");
     run_test($server, $debug, $output, "wiki.getPageVersion", array("HomePage", 1));
@@ -198,7 +198,8 @@
 
     run_test($server, $debug, $output, "wiki.rssPleaseNotify", "HomePage", 0);
     run_test($server, $debug, $output, "wiki.mailPasswordToUser", ADMIN_USER);
-    
+
+    run_test($server, $debug, $output, "wiki.titleSearch", "Hom");
 }
 
 function run_stress_tests($server, $debug=0, $output=null) {
@@ -229,7 +230,7 @@
    $output['version'] = $GLOBALS['HTTP_GET_VARS']['version'];
    if ($server) {
       $title = $server['title'];
-      echo "<h2><CENTER>Results for $title</CENTER></H2>";
+      echo "<h2><center>Results for $title</center></h2>";
       
       if($GLOBALS['HTTP_GET_VARS']['stress'] == 1) {
          run_stress_tests($server, $debug, $output);
diff -ruN 11p1/themes/Crao/templates/editpage.tmpl 12p3/themes/Crao/templates/editpage.tmpl
--- 11p1/themes/Crao/templates/editpage.tmpl	2005-02-27 12:34:32.000000000 -0600
+++ 12p3/themes/Crao/templates/editpage.tmpl	2006-06-18 06:20:09.000000000 -0500
@@ -44,13 +44,22 @@
   <a name="editarea"></a><?=$EDIT_TEXTAREA?>
 </fieldset>
 <!-- FIXME: fix layout, move CSS to CSS -->
- <fieldset class="editarea">
-<legend><?=_("Summary").':'?></legend>
-<br /> <?=$SUMMARY_INPUT?>
-</fieldset>
+  <fieldset class="editarea">
+    <legend><?=_("Summary").':'?></legend><br />
+    <?=$SUMMARY_INPUT?>
+  </fieldset>
+<?php if (ENABLE_CAPTCHA) { ?>
+  <fieldset class="toolbar" style="text-align: center;">
+    <?php echo $CAPTCHA_IMAGE ?><br/>
+    <?php echo $CAPTCHA_LABEL ?><?= $CAPTCHA_INPUT ?>
+  </fieldset> 
+  <?php } ?>
   <fieldset class="toolbar"> 
     <?=$MINOR_EDIT_CB ?> <label for="edit[minor_edit]"><?=_("This is a minor change.")?></label>&nbsp;&nbsp;
     <?=$OLD_MARKUP_CB?>  <label for="useOldMarkup"><?=_("Use old markup")?></label> <?=$OLD_MARKUP_CONVERT?>
+<?php if ($user->isAdmin()) { ?>
+    <?= $LOCKED_CB ?> <label for="edit:lock"><?=_("Locked")?></label>
+<?php } ?>
   </fieldset>
   <fieldset class="toolbar">
     <?= $PREVIEW_B ?>
@@ -62,11 +71,6 @@
     <?=$AUTHOR_MESSAGE?>
     <label><?= Template('signin', array('FORMNAME' => 'editpage')) ?></label>
   </fieldset>
-<?php if ($user->isAdmin()) { ?>
-  <fieldset class="toolbar">
-    <?= $LOCKED_CB ?> <label for="edit[lock]"><?=_("Locked")?></label>
-  </fieldset>
-<?php } ?>
 <hr noshade="noshade" />
 <script language="JavaScript1.3" type="text/javascript">
 <!--
diff -ruN 11p1/themes/Crao/templates/signin.tmpl 12p3/themes/Crao/templates/signin.tmpl
--- 11p1/themes/Crao/templates/signin.tmpl	2004-06-18 03:40:39.000000000 -0500
+++ 12p3/themes/Crao/templates/signin.tmpl	2006-06-18 06:20:09.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-html-*-
-     rcs_id('$Id: signin.tmpl,v 1.2 2004/06/18 08:40:39 rurban Exp $');
+     rcs_id('$Id: signin.tmpl,v 1.3 2005/10/30 14:27:53 rurban Exp $');
 
      if (empty($FORMNAME))
          $FORMNAME = 'signin';
@@ -51,7 +51,7 @@
     }
     //-->
     document.write('&nbsp;<?=
-    _("Sign in:")
+    _("Sign In")
     ?>');
   </script>
   <?= $SignInInput ?>
diff -ruN 11p1/themes/Crao/themeinfo.php 12p3/themes/Crao/themeinfo.php
--- 11p1/themes/Crao/themeinfo.php	2005-05-05 03:48:05.000000000 -0500
+++ 12p3/themes/Crao/themeinfo.php	2006-06-18 06:20:10.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: themeinfo.php,v 1.2 2004/06/14 11:26:45 rurban Exp $');
+rcs_id('$Id: themeinfo.php,v 1.3 2005/09/18 13:04:37 rurban Exp $');
 
 /*
  * This file defines the default appearance ("theme") of PhpWiki.
diff -ruN 11p1/themes/default/phpwiki.css 12p3/themes/default/phpwiki.css
--- 11p1/themes/default/phpwiki.css	2005-04-11 14:41:23.000000000 -0500
+++ 12p3/themes/default/phpwiki.css	2006-06-18 06:20:13.000000000 -0500
@@ -883,6 +883,14 @@
   vertical-align: middle; 
 }
 
+/**
+ * PhotoAlbum plugin
+ */
+.boldsmall {
+  font-weight: bold;
+  font-size: 11px;
+}
+
 /* For emacs users
  *
  * Local Variables:
diff -ruN 11p1/themes/default/templates/head.tmpl 12p3/themes/default/templates/head.tmpl
--- 11p1/themes/default/templates/head.tmpl	2005-02-27 12:20:20.000000000 -0600
+++ 12p3/themes/default/templates/head.tmpl	2006-06-18 06:20:14.000000000 -0500
@@ -8,6 +8,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?=$charset?>" />
 <?php } ?>
 <meta http-equiv="content-language" content="<?=$GLOBALS['LANG']?>" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?= $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>
diff -ruN 11p1/themes/default/templates/navbar.tmpl 12p3/themes/default/templates/navbar.tmpl
--- 11p1/themes/default/templates/navbar.tmpl	2005-04-06 01:41:05.000000000 -0500
+++ 12p3/themes/default/templates/navbar.tmpl	2006-06-18 06:20:14.000000000 -0500
@@ -32,9 +32,9 @@
 <?php if (!empty($revision)) { ?>
 <?=$SEP?><?= $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages")) 
 ?><?=$SEP?><?= $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks")) 
-?><?php
+?><?php /* RelatedChanges disabled
   $links = $page->getPageLinks();
-  if ($links->count() > 1) { ?><?=$SEP?><?= $WikiTheme->makeLinkButton($revision,_("RelatedChanges"),_("RelatedChanges")) ?><?php } ?>
+  if ($links->count() > 1) { ?><?=$SEP?><?= $WikiTheme->makeLinkButton($revision,_("RelatedChanges"),_("RelatedChanges")) ?><?php } */ ?>
 <?php } ?>
 <?php if (!empty($user) && $user->isSignedIn()) { ?>
 <?=$SEP?><?= WikiLink(_("UserPreferences"), 'button',_("Preferences")) ?>
diff -ruN 11p1/themes/default/templates/redirect.tmpl 12p3/themes/default/templates/redirect.tmpl
--- 11p1/themes/default/templates/redirect.tmpl	2005-01-22 06:09:05.000000000 -0600
+++ 12p3/themes/default/templates/redirect.tmpl	2006-06-18 06:20:14.000000000 -0500
@@ -1,15 +1,15 @@
 <?php
-rcs_id('$Id: redirect.tmpl,v 1.4 2005/01/22 12:09:05 rurban Exp $');
+rcs_id('$Id: redirect.tmpl,v 1.5 2006/02/22 19:39:37 rurban Exp $');
 /* 
  * Redirect output.
  */
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+if (browserVersion() >= 4.0)
+  echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n";
+?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<!-- $Id: redirect.tmpl,v 1.4 2005/01/22 12:09:05 rurban Exp $ -->
+<!-- $Id: redirect.tmpl,v 1.5 2006/02/22 19:39:37 rurban Exp $ -->
 <meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
 <meta name="robots" content="noindex, nofollow" />
 <meta name="generator" content="PhpWiki" />
diff -ruN 11p1/themes/default/templates/viewsource.tmpl 12p3/themes/default/templates/viewsource.tmpl
--- 11p1/themes/default/templates/viewsource.tmpl	2005-02-27 12:20:20.000000000 -0600
+++ 12p3/themes/default/templates/viewsource.tmpl	2006-06-18 06:20:14.000000000 -0500
@@ -1,5 +1,5 @@
 <?php // -*-html-*- ?>
-<!-- $Id: viewsource.tmpl,v 1.23 2005/01/25 07:16:44 rurban Exp $ -->
+<!-- $Id: viewsource.tmpl,v 1.24 2005/10/30 16:11:09 rurban Exp $ -->
 
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p><strong><?=_("Note:")?></strong>
@@ -22,10 +22,9 @@
 cols="<?=$request->getPref('editWidth')?>"
 readonly="readonly"
 wrap="virtual"><?= $PAGE_SOURCE ?></textarea>
+<?=$HIDDEN_INPUTS?>
 </form>
 
 <div id="footer"><!-- for top & bottom toolbars stylesheet -->
 <?=Template('browse-footer')?>
 </div>
-
-<?= HiddenInputs($request->getArgs()) ?>
diff -ruN 11p1/themes/default/themeinfo.php 12p3/themes/default/themeinfo.php
--- 11p1/themes/default/themeinfo.php	2005-07-18 13:39:28.000000000 -0500
+++ 12p3/themes/default/themeinfo.php	2006-06-18 06:20:14.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: themeinfo.php,v 1.34 2005/04/23 11:44:54 rurban Exp $');
+rcs_id('$Id: themeinfo.php,v 1.35 2005/09/18 13:04:37 rurban Exp $');
 
 /*
  * This file defines the default appearance ("theme") of PhpWiki.
diff -ruN 11p1/themes/default/toolbar.js 12p3/themes/default/toolbar.js
--- 11p1/themes/default/toolbar.js	2005-08-06 08:33:05.000000000 -0500
+++ 12p3/themes/default/toolbar.js	2006-06-18 06:20:14.000000000 -0500
@@ -1,5 +1,5 @@
 // Toolbar JavaScript support functions. Taken from mediawiki 
-// $Id: toolbar.js,v 1.10 2005/08/06 13:33:05 rurban Exp $ 
+// $Id: toolbar.js,v 1.12 2005/09/28 18:51:03 rurban Exp $
 
 // Un-trap us from framesets
 if( window.top != window ) window.top.location = window.location;
@@ -36,17 +36,19 @@
 //}
 // pages is either an array of strings or an array of array(name,value)
 function showPulldown(title, pages, okbutton, closebutton) {
-   pullwin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,height=270,width=180');
-   pullwin.window.document.write('<html><head><title>'+escapeQuotes(title)+'</title><style type=\"text/css\"><'+'!'+'-- body {font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:10pt;} input {font-weight:bold} option {font-size:9pt}  --'+'></style></head><body bgcolor=\"#dddddd\"><form><select name=\"select\" size=\"'+((pages.length>20)?'20':new String(pages.length))+'\" ondblclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value); return false;\">');
-   for (i=0; i<pages.length; i++){
-     if (pages[i][1])
-       pullwin.window.document.write('<option value="'+pages[i][1]+'">'+escapeQuotes(pages[i][0])+'</option>\n');
-     else
-       pullwin.window.document.write('<option value="'+pages[i]+'">'+escapeQuotes(pages[i])+'</option>\n');
-   }
-   pullwin.window.document.write('</select><br /><input type=\"button\" value=\"'+okbutton+'\" onclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value); return false;\"><input type=\"button\" value=\"'+closebutton+'\" onclick=\"self.close(); return false;\"></form></body></html>');
-   pullwin.window.document.close();
-   return false;
+  height = new String(Math.min(270, 70 + (pages.length * 12))); // 270 or smaller
+  pullwin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,height='+height+',width=180');
+  pullwin.window.document.write('<html><head><title>'+escapeQuotes(title)+'</title><style type=\"text/css\"><'+'!'+'-- body {font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:10pt;background-color:#dddddd;} input { font-weight:bold;margin-left:2px;margin-right:2px;} option {font-size:9pt} #buttons { background-color:#dddddd;padding-right:10px;width:180px;} --'+'></style></head>');
+  pullwin.window.document.write('\n<body bgcolor=\"#dddddd\"><form><div id=\"buttons\"><input type=\"button\" value=\"'+okbutton+'\" onclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value); return false;\"><input type=\"button\" value=\"'+closebutton+'\" onclick=\"self.close(); return false;\"></div>\n<select style=\"margin-top:10px;\" name=\"select\" size=\"'+((pages.length>20)?'20':new String(pages.length))+'\" ondblclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value); return false;\">');
+  for (i=0; i<pages.length; i++){
+    if (typeof pages[i] == 'string')
+      pullwin.window.document.write('<option value="'+pages[i]+'">'+escapeQuotes(pages[i])+'</option>\n');
+    else  // array=object
+      pullwin.window.document.write('<option value="'+pages[i][1]+'">'+escapeQuotes(pages[i][0])+'</option>\n');
+  }
+  pullwin.window.document.write('</select></form></body></html>');
+  pullwin.window.document.close();
+  return false;
 }
 function do_pulldown(value) {
   insertTags(value, '', '\n');
@@ -87,6 +89,23 @@
   // var txtarea = document.editpage.edit[content];
   
   // IE
+  var re=new RegExp('%0A',"g");
+  tagOpen = tagOpen.replace(re,'\n');
+  var re=new RegExp('%22',"g");
+  tagOpen = tagOpen.replace(re,'"');
+  var re=new RegExp('%27',"g");
+  tagOpen = tagOpen.replace(re,'\'');
+  var re=new RegExp('%09',"g");
+  tagOpen = tagOpen.replace(re,'    ');
+  var re=new RegExp('%7C',"g");
+  tagOpen = tagOpen.replace(re,'|');
+  var re=new RegExp('%5B',"g");
+  tagOpen = tagOpen.replace(re,'[');
+  var re=new RegExp('%5D',"g");
+  tagOpen = tagOpen.replace(re,']');
+  var re=new RegExp('%5C',"g");
+  tagOpen = tagOpen.replace(re,'\\');
+
   if(document.selection) {
     var theSelection = document.selection.createRange().text;
     if(!theSelection) { theSelection=sampleText;}
Files 11p1/themes/MacOSX/buttons/en/Pdf.png and 12p3/themes/MacOSX/buttons/en/Pdf.png differ
Files 11p1/themes/MacOSX/buttons/en/Sign+in+as%3A.png and 12p3/themes/MacOSX/buttons/en/Sign+in+as%3A.png differ
Files 11p1/themes/MacOSX/buttons/en/Sign+in+as%3A.png.lnk and 12p3/themes/MacOSX/buttons/en/Sign+in+as%3A.png.lnk differ
diff -ruN 11p1/themes/Portland/templates/editpage.tmpl 12p3/themes/Portland/templates/editpage.tmpl
--- 11p1/themes/Portland/templates/editpage.tmpl	2004-06-14 06:26:50.000000000 -0500
+++ 12p3/themes/Portland/templates/editpage.tmpl	2006-06-18 06:20:23.000000000 -0500
@@ -1,26 +1,5 @@
 <!-- -*-html-*- -->
-<!-- $Id: editpage.tmpl,v 1.21 2004/06/14 11:26:50 rurban Exp $ -->
-<?php
-
-$WidthI = HTML::input(array('type' => 'text',
-                            'size' => 3,
-                            'maxlength' => 4,
-                            'class' => "numeric",
-                            'name' => 'pref[editWidth]',
-                            'value' => $request->getPref('editWidth'),
-                            'onchange' => 'this.form.submit();'));
-
-$HeightI = HTML::input(array('type' => 'text',
-                             'size' => 3,
-                             'maxlength' => 4,
-                             'class' => "numeric",
-                             'name' => 'pref[editHeight]',
-                             'value' => $request->getPref('editHeight'),
-                             'onchange' => 'this.form.submit();'));
-
-$s = $WikiTheme->getButtonSeparator();
-?>
-
+<!-- $Id: editpage.tmpl,v 1.22 2005/09/28 19:00:24 rurban Exp $ -->
 <?php /*
  * FIXME: Hack!
  * The funky URL used for the form action parameter is bogus.
@@ -50,7 +29,7 @@
   <td align="right">
     <?= $PREVIEW_B ?>
     <?php if ($SAVE_B) { ?>
-      <?=$s?> <?= $SAVE_B ?>
+      <?=$SEP?> <?= $SAVE_B ?>
     <?php } ?>
   </td>
 </tr>
@@ -59,6 +38,10 @@
 <br />
 <?=_("Summary")?>: <?= $SUMMARY_INPUT ?>
 <br />
+<?php if (ENABLE_CAPTCHA) { ?>
+  <?php echo $CAPTCHA_IMAGE ?><br/>
+  <?php echo $CAPTCHA_LABEL ?><?= $CAPTCHA_INPUT ?><br/>
+<?php } ?>
 <?= fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
 <br />
 <?= $MINOR_EDIT_CB ?>
@@ -66,10 +49,8 @@
         WikiLink(_("RecentEdits"))) ?>
 <br />
 <p>
-  <?=_("Edit Area Size")?>: <b><?=_("H")?></b>
-  <?=$HeightI?>
-  <b><?=_("W")?></b>
-  <?=$WidthI?>
+  <?=_("Edit Area Size")?>: <b><?=_("H")?></b> <?=$HEIGHT_PREF?> 
+  <b><?=_("W")?></b> <?=$WIDTH_PREF?>
   <?=Button("submit:", _("Adjust"), 'wikiaction')?>
   <br />
   <?=$OLD_MARKUP_CB?>  <?=_("Use old markup")?>
diff -ruN 11p1/themes/smaller/phpwiki.css 12p3/themes/smaller/phpwiki.css
--- 11p1/themes/smaller/phpwiki.css	2005-06-22 00:20:47.000000000 -0500
+++ 12p3/themes/smaller/phpwiki.css	2006-06-18 06:20:25.000000000 -0500
@@ -29,23 +29,6 @@
 h1 { margin: 0; font-size: 140% }
 pre { font-size: 110% }
 
-/* IE5.0 */
-@media tty { 
-    i{content:"\";/*" "*/}}; @import 'IEFixes.css'; {;}/*";} 
-}
-
-/* IE5.5 */
-@media tty {
-    i{content:"\";/*" "*/}}@m; @import 'IEFixes.css'; /*";}
-}
-
-/* IE6.0 */
-@import "null?\"\{"; 
-@import "IEFixes.css";
-
-voice-family: "\"}\"";
-voice-family:inherit;
- 
 /* For emacs users
  *
  * Local Variables:
diff -ruN 11p1/themes/smaller/templates/signin.tmpl 12p3/themes/smaller/templates/signin.tmpl
--- 11p1/themes/smaller/templates/signin.tmpl	2005-02-02 12:54:16.000000000 -0600
+++ 12p3/themes/smaller/templates/signin.tmpl	2006-06-18 06:20:26.000000000 -0500
@@ -51,7 +51,7 @@
 ?>
   <?= $SignInJS ?>
   <?= $SignInInput ?>
-  <?= Button("submit:auth[login]", _("Sign in:"), 'wikiaction')?>
+  <?= Button("submit:auth[login]", _("Sign In"), 'wikiaction')?>
 <?php } ?>
 <?php if (empty($NOFORM)) { ?>
   </form>
diff -ruN 11p1/themes/smaller/themeinfo.php 12p3/themes/smaller/themeinfo.php
--- 11p1/themes/smaller/themeinfo.php	2005-04-23 06:44:54.000000000 -0500
+++ 12p3/themes/smaller/themeinfo.php	2006-06-18 06:20:26.000000000 -0500
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: themeinfo.php,v 1.4 2005/04/23 11:44:54 rurban Exp $');
+rcs_id('$Id: themeinfo.php,v 1.5 2006/02/22 06:51:37 rurban Exp $');
 /**
  * tiny actionbar, only Edit (if signed in) and Info => PageInfo,
  *   all other Actionbars buttons in info.tmpl
@@ -36,7 +36,6 @@
 }
 
 $WikiTheme = new Theme_smaller('smaller');
-
 // CSS file defines fonts, colors and background images for this
 // style.  The companion '*-heavy.css' file isn't defined, it's just
 // expected to be in the same directory that the base style is in.
@@ -53,6 +52,12 @@
 $WikiTheme->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
 $WikiTheme->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
 
+if (isBrowserIE()) {
+    $WikiTheme->addMoreHeaders($WikiTheme->_CSSlink(0,
+        $WikiTheme->_findFile('IEFixes.css'),'all'));
+    $WikiTheme->addMoreHeaders("\n");
+}
+
 /**
  * The logo image appears on every page and links to the HomePage.
  */
Files 11p1/themes/Wordpress/buttons/asc_order.png and 12p3/themes/Wordpress/buttons/asc_order.png differ
Files 11p1/themes/Wordpress/buttons/desc_order.png and 12p3/themes/Wordpress/buttons/desc_order.png differ
Files 11p1/themes/Wordpress/buttons/no_order.png and 12p3/themes/Wordpress/buttons/no_order.png differ
diff -ruN 11p1/themes/Wordpress/templates/editpage.tmpl 12p3/themes/Wordpress/templates/editpage.tmpl
--- 11p1/themes/Wordpress/templates/editpage.tmpl	2004-06-14 06:26:51.000000000 -0500
+++ 12p3/themes/Wordpress/templates/editpage.tmpl	2006-06-18 06:20:28.000000000 -0500
@@ -1,26 +1,5 @@
 <!-- -*-html-*- -->
-<!-- $Id: editpage.tmpl,v 1.3 2004/06/14 11:26:51 rurban Exp $ -->
-<?php
-
-$WidthI = HTML::input(array('type' => 'text',
-                            'size' => 3,
-                            'maxlength' => 4,
-                            'class' => "numeric",
-                            'name' => 'pref[editWidth]',
-                            'value' => $request->getPref('editWidth'),
-                            'onchange' => 'this.form.submit();'));
-
-$HeightI = HTML::input(array('type' => 'text',
-                             'size' => 3,
-                             'maxlength' => 4,
-                             'class' => "numeric",
-                             'name' => 'pref[editHeight]',
-                             'value' => $request->getPref('editHeight'),
-                             'onchange' => 'this.form.submit();'));
-
-$s = $WikiTheme->getButtonSeparator();
-?>
-
+<!-- $Id: editpage.tmpl,v 1.4 2005/09/28 19:00:24 rurban Exp $ -->
 <?php /*
  * FIXME: Hack!
  * The funky URL used for the form action parameter is bogus.
@@ -48,7 +27,7 @@
   <td>
     <?= $PREVIEW_B ?>
     <?php if ($SAVE_B) { ?>
-      <?=$s?> <?= $SAVE_B ?>
+      <?=$SEP?> <?= $SAVE_B ?>
     <?php } ?>
   </td>
 </tr>
@@ -57,8 +36,8 @@
     <tr><td><?= $EDIT_TOOLBAR ?></td>
         <td align="right"><div id="editarea-size">
     <?=_("Size").':'?>
-    <b><?=_("H")?></b> <?=$HeightI?>
-    <b><?=_("W")?></b> <?=$WidthI?>
+    <label for="pref[editHeight]"><b><?=_("H")?></b></label> <?=$HEIGHT_PREF?> 
+    <label for="pref[editWidth]"><b><?=_("W")?></b></label> <?=$WIDTH_PREF?>
     <noscript><?=Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
   </div></td></tr></table>
 <br />
@@ -68,6 +47,10 @@
 <br />
 <?=_("Summary")?>: <?= $SUMMARY_INPUT ?>
 <br />
+<?php if (ENABLE_CAPTCHA) { ?>
+  <?php echo $CAPTCHA_IMAGE ?><br/>
+  <?php echo $CAPTCHA_LABEL ?><?= $CAPTCHA_INPUT ?><br/>
+<?php } ?>
 <?= fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
 <br />
 <?= $MINOR_EDIT_CB ?>
diff -ruN 11p1/uploads/highlight-emacs.css 12p3/uploads/highlight-emacs.css
--- 11p1/uploads/highlight-emacs.css	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/uploads/highlight-emacs.css	2006-06-18 06:20:28.000000000 -0500
@@ -0,0 +1,30 @@
+/* CSS definition file generated by highlight 2.0-22, http://www.andre-simon.de/ */
+
+
+
+/* Highlighting theme definition: */
+
+	/* Used abbreviations: */
+	/* key:  Keywords */
+	/* typ:  Types and type modifiers */
+	/* str:  Strings */
+	/* num:  Numbers */
+	/* com:  Comments */
+	/* esc:  Escape characters */
+	/* dir:  Directive lines */
+	/* dstr: Strings within directive lines */
+	/* sym:  Symbols */
+	/* line: Line numbers */
+
+	pre	{ color:#000000; background-color:#ffffff; font-size:10pt; font-family:Courier;}
+	.key	{ color:#9c20ee; font-weight:bold; }
+	.num	{ color:#000000; }
+	.typ	{ color:#208920; }
+	.esc	{ color:#bd8d8b; }
+	.str	{ color:#bd8d8b; }
+	.dstr	{ color:#bd8d8b; }
+	.com	{ color:#ac2020; font-style:italic; }
+	.dir	{ color:#000000; }
+	.sym	{ color:#000000; }
+	.line	{ color:#555555; }
+
diff -ruN 11p1/uploads/index.php 12p3/uploads/index.php
--- 11p1/uploads/index.php	1969-12-31 18:00:00.000000000 -0600
+++ 12p3/uploads/index.php	2006-06-18 06:20:28.000000000 -0500
@@ -0,0 +1,4 @@
+<?php // $Id: index.php,v 1.1 2005/06/06 16:45:45 rurban Exp $ 
+	header( "Location: ../index.php?pagename=UpLoad" );
+	exit();
+?>
\ No newline at end of file
