[Fusionforge-commits] r13355 - in branches/Branch_5_1/src/plugins/wiki/www: . config lib lib/DbSession lib/WikiDB lib/WikiDB/backend lib/WikiDB/backend/dumb lib/WikiUser lib/WysiwygEdit lib/fpdf lib/nusoap lib/pear lib/pear/DB lib/plugin lib/wikilens locale locale/de/LC_MESSAGES locale/de/pgsrc locale/es/LC_MESSAGES locale/fr/LC_MESSAGES locale/fr/pgsrc locale/it/LC_MESSAGES locale/it/pgsrc locale/ja/LC_MESSAGES locale/nl/LC_MESSAGES locale/nl/pgsrc locale/po locale/sv/LC_MESSAGES locale/sv/pgsrc locale/zh/LC_MESSAGES locale/zh/pgsrc pgsrc schemas tests tests/unit tests/unit/lib tests/unit/lib/plugin themes/Crao themes/Crao/templates themes/Hawaiian themes/Hawaiian/lib themes/MacOSX themes/MacOSX/lib themes/MonoBook themes/MonoBook/templates themes/Portland themes/Portland/lib themes/Portland/templates themes/Sidebar themes/Sidebar/templates themes/SpaceWiki themes/SpaceWiki/lib themes/Wordpress themes/Wordpress/lib themes/Wordpress/templates themes/blog themes/blog/lib themes/blog/templates themes/default themes/default/templates themes/fusionforge themes/fusionforge/pgsrc themes/fusionforge/templates themes/shamino_com themes/shamino_com/templates themes/smaller themes/smaller/templates themes/wikilens themes/wikilens/templates uploads

Marc-Etienne VARGENAU vargenau at fusionforge.org
Wed May 18 21:36:26 CEST 2011


Author: vargenau
Date: 2011-05-18 21:36:20 +0200 (Wed, 18 May 2011)
New Revision: 13355

Modified:
   branches/Branch_5_1/src/plugins/wiki/www/INSTALL
   branches/Branch_5_1/src/plugins/wiki/www/ImageTile.php
   branches/Branch_5_1/src/plugins/wiki/www/README
   branches/Branch_5_1/src/plugins/wiki/www/SOAP.php
   branches/Branch_5_1/src/plugins/wiki/www/config/config-default.ini
   branches/Branch_5_1/src/plugins/wiki/www/config/config-dist.ini
   branches/Branch_5_1/src/plugins/wiki/www/config/migrate-phpwiki-config
   branches/Branch_5_1/src/plugins/wiki/www/configurator.php
   branches/Branch_5_1/src/plugins/wiki/www/g
   branches/Branch_5_1/src/plugins/wiki/www/index.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/AccessLog.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/ArchiveCleaner.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/AtomParser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/BlockParser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/CachedMarkup.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/Captcha.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/ADODB.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/PDO.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/SQL.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/dba.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/DbaDatabase.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/DbaListSet.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/DbaPartition.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/EditToolbar.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/ErrorManager.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/ExternalReferrer.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/FileFinder.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/Google.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlElement.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlElement5.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlParser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/HttpClient.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/IniConfig.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/InlineParser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/MailNotify.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/PageList.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/PagePerm.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/PageType.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/RSSWriter091.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/Request.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/RssParser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/RssWriter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/RssWriter2.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/SemanticWeb.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/SpamBlocklist.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/Template.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/TextSearchQuery.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/Units.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiCallback.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/ADODB.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/PDO.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/SQL.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mssql.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mssqlnative.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mysql.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_postgres7.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_sqlite.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_mysql.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_oci8.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_pgsql.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_ffpgsql.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_mysql.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_pgsql.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_sqlite.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/cvs.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dba.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dbaBase.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/AllRevisionsIter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/BackLinkIter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/LinkSearchIter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/MostPopularIter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/MostRecentIter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/TextSearchIter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/WantedPagesIter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/file.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/flatfile.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/cvs.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/dba.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/file.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/flatfile.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiGroup.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiPlugin.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiPluginCached.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiTheme.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/AdoDb.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/BogoLogin.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Db.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/EMailConfirm.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Facebook.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/File.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Forbidden.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/FusionForge.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/HttpAuth.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/HttpAuthUpper.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/IMAP.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/LDAP.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/LdapUpper.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/OpenID.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/POP3.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PdoDb.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PearDb.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PersonalPage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Session.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUserNew.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/FCKeditor.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/Wikiwyg.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/htmlarea2.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/htmlarea3.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/tinymce.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/XmlElement.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/XmlParser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/XmlRpcClient.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/XmlRpcServer.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/config.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/diff.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/diff3.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/difflib.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/display.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/editpage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/fortune.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf/chinese.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf/japanese.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/gif.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/imagecache.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/imdb.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/install.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/interwiki.map
   branches/Branch_5_1/src/plugins/wiki/www/lib/loadsave.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/main.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/nusoap/nusoap.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/pdf.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/pear/DB/Pager.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/pear/DB/ldap.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/pear/PEAR.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AddComment.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AllPages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AllUsers.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AnalyseAccessLogSql.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AppendText.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AsciiMath.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AsciiSVG.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AtomFeed.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AuthorHistory.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BackLinks.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BlogArchives.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BlogJournal.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BoxRight.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CacheTest.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Calendar.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CalendarList.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CategoryPage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Chart.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Comment.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreateBib.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreatePage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreateToc.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CurrentTime.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/DeadEndPages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Diff.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/DynamicIncludePage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/EditMetaData.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ExternalSearch.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FacebookLike.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FileInfo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FoafViewer.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FrameInclude.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FullTextSearch.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FuzzyPages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GoTo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GoogleMaps.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GooglePlugin.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GraphViz.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/HelloWorld.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/HtmlConverter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Imdb.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludePage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludePages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludeSiteMap.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludeTree.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/InterWikiSearch.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/JabberPresence.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LdapSearch.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LikePages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LinkDatabase.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LinkSearch.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListPages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListRelations.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListSubpages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/MediawikiTable.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ModeratedPage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/MostPopular.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/NewPagesPerUser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/NoCache.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/OldStyleTable.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/OrphanedPages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageDump.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageGroup.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageHistory.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageInfo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageTrail.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PasswordReset.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhotoAlbum.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhpHighlight.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhpWeather.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Ploticus.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PluginManager.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopUp.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopularNearby.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopularTags.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PreferenceApp.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PrevNext.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Processing.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RandomPage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RateIt.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RawHtml.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentChanges.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentChangesCached.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentComments.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentEdits.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentReferrers.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RedirectTo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RelatedChanges.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RichTable.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RssFeed.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SearchHighlight.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticRelations.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticSearch.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticSearchAdvanced.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SiteMap.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SpellCheck.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SqlResult.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SyncWiki.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SyntaxHighlighter.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SystemInfo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TeX2png.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Template.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TexToPng.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TitleSearch.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Transclude.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TranslateText.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UnfoldSubpages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UpLoad.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UriResolver.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UserPreferences.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UserRatings.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Video.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/VisualWiki.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WantedPages.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WantedPagesOld.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WatchPage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WhoIsOnline.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminChmod.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminChown.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminMarkup.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminPurge.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminRemove.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminRename.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSearchReplace.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSelect.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetAcl.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetAclSimple.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetExternal.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminUtils.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiBlog.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiForm.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiFormRich.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiForum.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiPoll.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikicreoleTable.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/YouTube.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_AuthInfo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_BackendInfo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_GroupInfo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_PreferencesInfo.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_Retransform.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_WikiTranslation.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/text2png.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/prepend.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/purgepage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/removepage.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/spam_babycart.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/stdlib.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/upgrade.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/Buddy.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/CustomPrefs.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/PageListColumns.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/RatingsDb.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/RatingsUser.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/Utils.php
   branches/Branch_5_1/src/plugins/wiki/www/lib/ziplib.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/Makefile
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.mo
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleBenutzer
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeiten
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenEditiertVonMir
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenErzeugtVonMir
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenImBesitzVonMir
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/BenutzerEinstellungen
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/EditiereText
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Einstellungen
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/PhpWikiSystemverwalten
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeiteFinden
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeiteSpeichern
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeitenErzeugen
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/StartSeite
   branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/UpLoad
   branches/Branch_5_1/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.mo
   branches/Branch_5_1/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.mo
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FAjouterDesPages
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPhpWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginBeauTableau
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCalendrier
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginColorationPhp
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCommenter
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginHtmlPur
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnePage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRechercheExterne
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRedirection
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginTeX2png
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginWikiBlog
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FStyleCorrect
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FWabiSabi
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FWikiWikiWeb
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AliasAccueil
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9gorieGroupes
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ChangementsLi%C3%A9s
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ChercherUnePage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ClassezLa
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/CommentairesR%C3%A9cents
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cr%C3%A9erUnePage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/D%C3%A9poserUnFichier
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Derni%C3%A8resModifs
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/GestionDesPlugins
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/HistoriqueDeLaPage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosAuthentification
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosDeD%C3%A9bogage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosSurLaPage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/LesPlusVisit%C3%A9es
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ListeDePages
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/NotesDeVersion
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PageAccueil
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PageAl%C3%A9atoire
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesFloues
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesOrphelines
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesRecherch%C3%A9es
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesSemblables
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/QuiEstEnLigne
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/R%C3%A9troLiens
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheInterWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheParTitre
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SommaireDuProjet
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SondagePhpWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SteveWainstead
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/TousLesUtilisateurs
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ToutesLesPages
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/TraduireUnTexte
   branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/VersionsR%C3%A9centes
   branches/Branch_5_1/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.mo
   branches/Branch_5_1/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/AmministrazioneDiPhpWiki
   branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/PaginaDiProva
   branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/TrovaPagina
   branches/Branch_5_1/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.mo
   branches/Branch_5_1/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/make-php-trans.awk
   branches/Branch_5_1/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.mo
   branches/Branch_5_1/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/PhpWikiBeheer
   branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/UitgaveNoten
   branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/ZoekPagina
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/de.po
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/es.po
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/fr.po
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/it.po
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/ja.po
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/nl.po
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/phpwiki.pot
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/sv.po
   branches/Branch_5_1/src/plugins/wiki/www/locale/po/zh.po
   branches/Branch_5_1/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.mo
   branches/Branch_5_1/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/Framsida
   branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/PhpWikiAdministration
   branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/S%C3%B6kEfterSida
   branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/Senaste%C3%84ndringar
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.mo
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/%E9%A6%96%E9%A0%81
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/AllUsers
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/FindPage
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/HomePage
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/InterWikiSearch
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/PhpWikiAdministration
   branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/UpLoad
   branches/Branch_5_1/src/plugins/wiki/www/passencrypt.php
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/AllUsers
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/AppendText
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/BackLinks
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FAddCommentPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FBackLinksPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCacheTestPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCategories
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCreateBibPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCreateTocPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FDynamicIncludePagePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FExternalSearchPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FFileInfoPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FFullTextSearchPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FGooglePluginPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FGraphVizPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FHtmlConverterPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FImages
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludePagePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludePagesPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludeSiteMapPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FInterWikiSearchPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FJabberPresencePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FLdapSearchPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FListPagesPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FModeratedPagePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FNoCachePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FOldStyleTablePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageDumpPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageGroupPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageInfoPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageList
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPagePermissions
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageTrailPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPhotoAlbumPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPhpHighlightPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPloticusPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPluginManagerPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentCommentsPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentEditsPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentReferrersPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRichTablePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSemanticRelations
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSemanticSearchPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSiteMapPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSqlResultPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSyntaxHighlighterPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTemplatePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTextFormattingRules
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTitleSearchPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTranscludePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTranslateTextPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUpLoadPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUserPreferencesPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUserRatingsPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FVideoPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWantedPagesOldPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWantedPagesPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWatchPagePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWhoIsOnlinePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiForumPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiWikiWeb
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikicreole
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FYouTubePlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_AuthInfoPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_BackendInfoPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_GroupInfoPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_WikiTranslationPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2Ftext2pngPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/HomePage
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/InterWikiSearch
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/LinkDatabase
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/MyRecentEdits
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PasswordReset
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PhpWikiManual
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PhpWikiRecentChanges
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/RecentVisitors
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/ReleaseNotes
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/SteveWainstead
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FAttribute
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FExample
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FLinkto
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FNewPlugin
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FRelation
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/TranslateText
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/UserContribs
   branches/Branch_5_1/src/plugins/wiki/www/pgsrc/WikiBlog
   branches/Branch_5_1/src/plugins/wiki/www/schemas/mysql-destroy.sql
   branches/Branch_5_1/src/plugins/wiki/www/tests/CompatInfo.php
   branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/AtomParserTest.php
   branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/HtmlParserTest.php
   branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/InlineParserTest.php
   branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/XmlRpcTest.php
   branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/plugin/AtomFeedTest.php
   branches/Branch_5_1/src/plugins/wiki/www/tests/unit/test.php
   branches/Branch_5_1/src/plugins/wiki/www/tests/unit_test_backend_cvs.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/crao-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/crao.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/browse.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/editpage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/head.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/htmldump.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/signin.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/top.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/wikiblog.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/Hawaiian-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/lib/random.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-topbottombars-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-topbottombars.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/lib/RecentChanges.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IE60Fixes.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IE70Fixes.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IEFixes-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IEFixes.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/Makefile
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/commonPrint-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/commonPrint.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/main-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/main.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/rtl-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/rtl.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/browse-footer.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/browse.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/editpage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/info.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/logo.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/tags.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/top.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/viewsource.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikibits-min.js
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikibits.js
   branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikiprintable.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/lib/RecentChanges.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/portland-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/portland.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/browse.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/debug.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/editpage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/viewsource.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/clock.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/hyperapplet.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/hyperwiki.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/sidebar-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/sidebar.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/calendar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/content.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/debug.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/dump-footer.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/frame-left.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/frameset.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/html.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/htmldump.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/logo.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/ratings.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/rc.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/search.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/signin.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/tags.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/top.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/lib/RecentChanges.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/Wordpress-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/Wordpress.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/lib/RecentChanges.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/browse.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/editpage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/signin.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/viewsource.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/Kubrick-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/Kubrick.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/lib/RecentChanges.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/blogform.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/bottom.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/browse-footer.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/browse.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/debug.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/info.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/sidebar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/top.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/viewsource.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/wikiblog.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/blog/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/highlight.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-modern-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-modern.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-printer-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-printer.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-topbottombars-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-topbottombars.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/addcomment.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/blogform.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/bottom.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/browse-footer.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/browse.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/categorypage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/comment.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/content.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/debug.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/dialog.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/editpage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/forumadd.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/frameset.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/head.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/homepage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/html.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/htmldump.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/info.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/login.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/nochanges.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/online.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/pagelink.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/redirect.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/savepage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/signin.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/top.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/userprefs.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/viewsource.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/wikiblog.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/wikiforum.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/default/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/blogform.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/shamino_com-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/shamino_com.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/browse-footer.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/debug.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/info.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/signin.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/top.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/actionbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/info.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/signin.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/body.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/categorypage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/head.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/navbar.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/newuserwelcomepage.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/ratings.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/top.tmpl
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/themeinfo.php
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/wikilens-min.css
   branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/wikilens.css
   branches/Branch_5_1/src/plugins/wiki/www/uploads/index.php
   branches/Branch_5_1/src/plugins/wiki/www/wikiadmin.php
Log:
Merge from trunk

Modified: branches/Branch_5_1/src/plugins/wiki/www/INSTALL
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/INSTALL	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/INSTALL	2011-05-18 19:36:20 UTC (rev 13355)
@@ -5,8 +5,8 @@
 PhpWiki was tested with 4.4.7 (centos4), 4.3.9, 4.3.10, 4.4.9, 5.0.3,
 5.1.6 (centos5), 5.2.10, 5.3.2, 5.3.3.
 
-All users of PHP are strongly encouraged to upgrade to PHP 5.2.14
-or PHP 5.3.3 that are the supported versions.
+All users of PHP are strongly encouraged to upgrade to PHP 5.2.17
+or PHP 5.3.6 that are the supported versions.
 Visit <http://www.php.net> for downloads and information.
 
 You need the Perl regular expressions package compiled in; this is the
@@ -152,4 +152,4 @@
 
 FIN
 
-$Id: INSTALL 7737 2010-11-10 08:47:34Z rurban $
+$Id: INSTALL 8033 2011-04-11 08:56:56Z vargenau $

Modified: branches/Branch_5_1/src/plugins/wiki/www/ImageTile.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/ImageTile.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/ImageTile.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: ImageTile.php 7507 2010-06-09 10:10:41Z vargenau $
+<?php // -*-php-*- $Id: ImageTile.php 7960 2011-03-04 13:58:21Z vargenau $
 // FIXME! This is a mess. Everything.
 require_once('lib/stdlib.php');
 
@@ -13,9 +13,9 @@
         if (preg_match('/DATA_PATH/',$config[0])) {
             list($key,$value) = explode('=', $config[0]);
             $data_path = trim($value).'/';
-	    break;
-	}
+        break;
     }
+    }
     fclose($fp);
     @mkdir($data_path."uploads/thumbs",0775);
     $file = $data_path."uploads/thumbs/image_" . ((float)$usec + (float)$sec);

Modified: branches/Branch_5_1/src/plugins/wiki/www/README
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/README	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/README	2011-05-18 19:36:20 UTC (rev 13355)
@@ -5,6 +5,16 @@
 See ./INSTALL for installation notes.
 Read ./UPGRADING before upgrading from a previous version of PhpWiki.
 
+Supported browsers:
+
+Phpwiki should work with the following browsers:
+* Firefox >= 2
+* Safari >= 5
+* Opera >= 8
+* Chrome >= 6
+* Konqueror >= 3.5
+* Internet Explorer >= 6 (so no Internet Explorer for Macintosh)
+
 Additional docs:
 
 doc/:

Modified: branches/Branch_5_1/src/plugins/wiki/www/SOAP.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/SOAP.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/SOAP.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: SOAP.php 7638 2010-08-11 11:58:40Z vargenau $
+<?php // -*-php-*- $Id: SOAP.php 7960 2011-03-04 13:58:21Z vargenau $
 /**
  * SOAP server
  * Taken from http://www.wlug.org.nz/archive/
@@ -64,7 +64,7 @@
         $request->_user = new WikiUser($request, $credentials['username']);
     }
     $request->_user->AuthCheck(array('userid' => $credentials['username'],
-				     'passwd' => $credentials['password']));
+                                     'passwd' => $credentials['password']));
     if (! mayAccessPage ($access, $pagename))
         $server->fault(401,'',"no permission");
 }
@@ -86,12 +86,12 @@
 $server->soapaction = $url; // soap_transport_http
 
 $actions = array('getPageContent','getPageRevision','getCurrentRevision',
-	         'getPageMeta','doSavePage','getAllPagenames',
-	         'getBackLinks','doTitleSearch','doFullTextSearch',
-		 'getRecentChanges','listLinks','listPlugins',
-		 'getPluginSynopsis','callPlugin','listRelations',
-		 'linkSearch'
-		 );
+                 'getPageMeta','doSavePage','getAllPagenames',
+                 'getBackLinks','doTitleSearch','doFullTextSearch',
+                 'getRecentChanges','listLinks','listPlugins',
+                 'getPluginSynopsis','callPlugin','listRelations',
+                 'linkSearch'
+                 );
 foreach ($actions as $action) {
     $server->register($actions);
     $server->operations[$actions]['soapaction'] = $url;
@@ -214,16 +214,16 @@
     checkCredentials($server,$credentials,'view',_("RecentChanges"));
     $dbi = WikiDB::open($GLOBALS['DBParams']);
     $params = array('limit' => $limit, 'since' => $since,
-		    'include_minor_revisions' => $include_minor);
+                    'include_minor_revisions' => $include_minor);
     $page_iter = $dbi->mostRecent($params);
     $pages = array();
     while ($page = $page_iter->next()) {
         $pages[] = array('pagename' => $page->getName(),
-			 'lastModified' => $page->get('mtime'),
-			 'author'  => $page->get('author'),
-			 'summary' => $page->get('summary'), // added with 1.3.13
-			 'version' => $page->getVersion()
-			 );
+                         'lastModified' => $page->get('mtime'),
+                         'author'  => $page->get('author'),
+                         'summary' => $page->get('summary'), // added with 1.3.13
+                         'version' => $page->getVersion()
+                         );
     }
     return $pages;
 }
@@ -236,8 +236,8 @@
     $linkiterator = $page->getPageLinks();
     $links = array();
     while ($currentpage = $linkiterator->next()) {
-	if ($currentpage->exists())
-	    $links[] = array('pagename' => $currentpage->getName());
+        if ($currentpage->exists())
+            $links[] = array('pagename' => $currentpage->getName());
     }
     return $links;
 }
@@ -298,8 +298,8 @@
     $pagelist = $p->run($dbi, $pluginargs, $request, $basepage);
     $pages = array();
     if (is_object($pagelist) and isa($pagelist, 'PageList')) {
-	foreach ($pagelist->pageNames() as $name)
-	    $pages[] = array('pagename' => $name);
+        foreach ($pagelist->pageNames() as $name)
+            $pages[] = array('pagename' => $name);
     }
     return $pages;
 }
@@ -322,8 +322,8 @@
     $only_attributes = $option & 2 and !($option & 1);
     $sorted = !($option & 4);
     return $dbh->listRelations($also_attributes,
-			       $only_attributes,
-			       $sorted);
+                               $only_attributes,
+                               $sorted);
 }
 // some basic semantic search
 function linkSearch($linktype, $search, $pages="*", $relation="*", $credentials=false) {
@@ -334,17 +334,17 @@
     $pagequery = new TextSearchQuery($pages);
     $linkquery = new TextSearchQuery($search);
     if ($linktype == 'relation') {
-	$relquery = new TextSearchQuery($relation);
-	$links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
+        $relquery = new TextSearchQuery($relation);
+        $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
     } elseif ($linktype == 'attribute') { // only numeric search withh attributes!
-	$relquery = new TextSearchQuery($relation);
-	require_once("lib/SemanticWeb.php");
-	// search: "population > 1 million and area < 200 km^2" relation="*" pages="*"
-	$linkquery = new SemanticAttributeSearchQuery($search, $relation);
-	$links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
+        $relquery = new TextSearchQuery($relation);
+        require_once("lib/SemanticWeb.php");
+        // search: "population > 1 million and area < 200 km^2" relation="*" pages="*"
+        $linkquery = new SemanticAttributeSearchQuery($search, $relation);
+        $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
     } else {
-	// we already do have forward and backlinks as SOAP
-	$links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype);
+        // we already do have forward and backlinks as SOAP
+        $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype);
     }
     return $links->asArray();
 }
@@ -357,5 +357,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/config/config-default.ini
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/config/config-default.ini	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/config/config-default.ini	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-; $Id: config-default.ini 7515 2010-06-10 06:35:40Z rurban $
+; $Id: config-default.ini 7914 2011-01-27 09:11:37Z vargenau $
 ; This is the default PhpWiki configuration for undefined config.ini entries.
 
 ; recent development and debugging features:
@@ -9,6 +9,7 @@
 JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = false
 ENABLE_XHTML_XML = false
+ENABLE_OPEN_GRAPH = false
 USECACHE = true
 READONLY = false
 
@@ -132,7 +133,7 @@
 WIKI_PGSRC = pgsrc
 DEFAULT_WIKI_PGSRC = pgsrc
 ; untranslated pgsrc pages to always include
-DEFAULT_WIKI_PAGES = "ReleaseNotes:SandBox:PhpWiki:SteveWainstead"
+DEFAULT_WIKI_PAGES = "ReleaseNotes"
 
 ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
 INLINE_IMAGES = "png|jpg|jpeg|gif"

Modified: branches/Branch_5_1/src/plugins/wiki/www/config/config-dist.ini
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/config/config-dist.ini	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/config/config-dist.ini	2011-05-18 19:36:20 UTC (rev 13355)
@@ -86,6 +86,9 @@
 ; See http://hixie.ch/advocacy/xhtml
 ;ENABLE_XHTML_XML = true
 
+; Needed for FacebookLike plugin
+;ENABLE_OPEN_GRAPH = true
+
 ; Needs babycart installed. See http://phpwiki.org/SpamAssassinIntegration
 ; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart
 ;ENABLE_SPAMASSASSIN = true
@@ -957,7 +960,7 @@
 ;DEFAULT_WIKI_PGSRC = pgsrc
 
 ; These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
-;DEFAULT_WIKI_PAGES = "ReleaseNotes:SteveWainstead:TestPage"
+;DEFAULT_WIKI_PAGES = "ReleaseNotes"
 
 ;=========================================================================
 ; Part Five: Mark-up options.

Modified: branches/Branch_5_1/src/plugins/wiki/www/config/migrate-phpwiki-config
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/config/migrate-phpwiki-config	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/config/migrate-phpwiki-config	2011-05-18 19:36:20 UTC (rev 13355)
@@ -5,7 +5,7 @@
 #
 # Author:   Matt Brown <matt at mattb.net.nz>,
 #           Reini Urban <rurban at x-ray.at>
-# Version:  $Id: migrate-phpwiki-config 6200 2008-08-26 12:57:28Z vargenau $
+# Version:  $Id: migrate-phpwiki-config 8071 2011-05-18 14:56:14Z vargenau $
 #
 # Run this script without any arguments for usage information.
 #
@@ -20,7 +20,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
+# with PhpWiki; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Store the values

Modified: branches/Branch_5_1/src/plugins/wiki/www/configurator.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/configurator.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/configurator.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,7 +1,7 @@
-<?php // -*-php-*- $Id: configurator.php 7664 2010-08-31 15:42:34Z vargenau $
+<?php // -*-php-*- $Id: configurator.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam
- * Copyright 2002 Martin Geisler <gimpster at gimpster.com> 
+ * Copyright 2002 Martin Geisler <gimpster at gimpster.com>
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
@@ -12,19 +12,19 @@
  * 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**
- * Starts automatically the first time by IniConfig("config/config.ini") 
+ * Starts automatically the first time by IniConfig("config/config.ini")
  * if it doesn't exist.
  *
  * DONE:
@@ -40,24 +40,24 @@
  * o parse_ini_file("config-dist.ini") for the commented vars
  * o check automatically for commented and optional vars
  * o fix _optional, to ignore existing config.ini and only use config-default.ini values
- * o mixin class for commented 
+ * o mixin class for commented
  * o fix SQL quotes, AUTH_ORDER quotes and file forward slashes
  * o posted values validation, extend js validation for sane DB values
  * o read config-dist.ini into sections, comments, and optional/required settings
  *
  * A file config/config.ini will be automatically generated, if writable.
  *
- * NOTE: If you have a starterscript outside PHPWIKI_DIR but no 
- * config/config.ini yet (very unlikely!), you must define DATA_PATH in the 
- * starterscript, otherwise the webpath to configurator is unknown, and 
+ * NOTE: If you have a starterscript outside PHPWIKI_DIR but no
+ * config/config.ini yet (very unlikely!), you must define DATA_PATH in the
+ * starterscript, otherwise the webpath to configurator is unknown, and
  * subsequent requests will fail. (POST to save the INI)
  */
 
 global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth;
-if (empty($_SERVER)) 	$_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
-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($_SERVER))         $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
+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";
@@ -66,9 +66,9 @@
 $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["SCRIPT_NAME"]);
 if (strstr($_SERVER["SCRIPT_NAME"],"/php")) {  // cgi got this different
     if (defined('DATA_PATH'))
-	$scriptname = DATA_PATH . "/index.php";
+        $scriptname = DATA_PATH . "/index.php";
     else
-	$scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]);
+        $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]);
 }
 
 $tdwidth = 700;
@@ -81,22 +81,22 @@
     function _http_user() {
         if (!isset($_SERVER))
             $_SERVER = $GLOBALS['HTTP_SERVER_VARS'];
-	if (!empty($_SERVER['PHP_AUTH_USER']))
-	    return array($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
-	if (!empty($_SERVER['REMOTE_USER']))
-	    return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']);
+        if (!empty($_SERVER['PHP_AUTH_USER']))
+            return array($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+        if (!empty($_SERVER['REMOTE_USER']))
+            return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']);
         if (!empty($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER']))
-	    return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'], 
-	                 $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
-	if (!empty($GLOBALS['REMOTE_USER']))
-	    return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']);
-	    
-	// MsWindows IIS:
-	if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
+            return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'],
+                         $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
+        if (!empty($GLOBALS['REMOTE_USER']))
+            return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']);
+
+        // MsWindows IIS:
+        if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
             list($userid, $passwd) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
             return array($userid, $passwd);
-	}
-	return array('','');
+        }
+        return array('','');
     }
     function _http_logout() {
         if (!isset($_SERVER))
@@ -105,52 +105,52 @@
         // better_srand(); $realm = microtime().rand();
         header('WWW-Authenticate: Basic realm="'.WIKI_NAME.'"');
         if (strstr(php_sapi_name(), 'apache'))
-            header('HTTP/1.0 401 Unauthorized'); 
-        else    
+            header('HTTP/1.0 401 Unauthorized');
+        else
             header("Status: 401 Access Denied"); //IIS and CGI need that
         unset($GLOBALS['REMOTE_USER']);
         unset($_SERVER['PHP_AUTH_USER']);
         unset($_SERVER['PHP_AUTH_PW']);
 
-	trigger_error("Permission denied. Require ADMIN_USER.", E_USER_ERROR);
-	exit();
+        trigger_error("Permission denied. Require ADMIN_USER.", E_USER_ERROR);
+        exit();
     }
 }
 
-// If config.ini exists, we require ADMIN_USER access by faking HttpAuth. 
+// If config.ini exists, we require ADMIN_USER access by faking HttpAuth.
 // So nobody can see or reset the password(s).
 if (file_exists($fs_config_file)) {
     // Require admin user
     if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) {
-    	if (!function_exists("IniConfig")) {
-    	    include_once("lib/prepend.php");
-	    include_once("lib/IniConfig.php");
-    	}
-	IniConfig($fs_config_file);
+            if (!function_exists("IniConfig")) {
+                include_once("lib/prepend.php");
+            include_once("lib/IniConfig.php");
+            }
+        IniConfig($fs_config_file);
     }
     if (!defined('ADMIN_USER') or ADMIN_USER == '') {
-	trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n"
-		      . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
-	exit();
+        trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n"
+                      . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
+        exit();
     }
 
     list($admin_user, $admin_pw) = _http_user();
     //$required_user = ADMIN_USER;
     if (empty($admin_user) or $admin_user != ADMIN_USER)
     {
-	_http_logout();
+        _http_logout();
     }
     // check password
     if (ENCRYPTED_PASSWD and function_exists('crypt')) {
-        if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD) 
-	    _http_logout();
+        if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD)
+            _http_logout();
     } elseif ($admin_pw != ADMIN_PASSWD) {
         _http_logout();
     }
 } else {
     if (!function_exists("IniConfig")) {
         include_once("lib/prepend.php");
-	include_once("lib/IniConfig.php");
+        include_once("lib/IniConfig.php");
     }
     $def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
     $fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file;
@@ -163,7 +163,7 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<!-- $Id: configurator.php 7664 2010-08-31 15:42:34Z vargenau $ -->
+<!-- $Id: configurator.php 8071 2011-05-18 14:56:14Z vargenau $ -->
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
 <style type="text/css" media="screen">
@@ -247,8 +247,8 @@
   for (var i = 0; i < rows.length; i++) {
     var tr = rows[i];
     if (tr.className == 'header')
-	if (!show || tr.id != show)
-	    toggle_group(tr.id);
+        if (!show || tr.id != show)
+            toggle_group(tr.id);
   }
 
   // Select text in textarea upon focus
@@ -258,7 +258,7 @@
     area.addEventListener('focus', listener, false);
   }
 }
-  
+
 -->
 </script>
 </head>
@@ -282,7 +282,7 @@
  * TO CHANGE THE CONFIGURATION OF YOUR PHPWIKI, DO *NOT* MODIFY THIS FILE!
  * more instructions go here
  *
- * Todo: 
+ * Todo:
  *   * fix include_path
  *   * eval config.ini to get the actual settings.
  */
@@ -305,8 +305,8 @@
  *   for the html version of the descriptive text.
  *
  * - Double-quotes and dollar signs in the descriptive text must be
- *   escaped: \" and \$. Instead of escaping double-quotes you can use 
- *   single (') quotes for the enclosing quotes. 
+ *   escaped: \" and \$. Instead of escaping double-quotes you can use
+ *   single (') quotes for the enclosing quotes.
  *
  * - Special characters like < and > must use html entities,
  *   they will be converted back to characters for the final output.
@@ -316,11 +316,11 @@
 
 $preamble = "
 ; This is the main configuration file for PhpWiki in INI-style format.
-; Note that certain characters are used as comment char and therefore 
+; Note that certain characters are used as comment char and therefore
 ; these entries must be in double-quotes. Such as \":\", \";\", \",\" and \"|\"
 ; Take special care for DBAUTH_ sql statements. (Part 3a)
 ;
-; This file is divided into several parts: Each one has different configuration 
+; This file is divided into several parts: Each one has different configuration
 ; settings you can change; in all cases the default should work on your system,
 ; however, we recommend you tailor things to your particular setting.
 ; Here undefined definitions get defined by config-default.ini settings.
@@ -341,7 +341,7 @@
   if (substr(PHP_OS,0,3) == 'WIN') {
       $include_path = dirname(__FILE__) . ';' . ini_get('include_path');
       if (strchr(ini_get('include_path'),'/'))
-	  $include_path = strtr($include_path,'\\','/');
+          $include_path = strtr($include_path,'\\','/');
   } else {
     $include_path = dirname(__FILE__) . ':' . ini_get('include_path');
   }
@@ -369,12 +369,12 @@
 
 $properties["WYSIWYG_BACKEND"] =
 new _define_selection(
-'WYSIWYG_BACKEND', 
+'WYSIWYG_BACKEND',
 array('Wikiwyg'   => 'Wikiwyg',
       'tinymce'   => 'tinymce',
-      'FCKeditor' => 'FCKeditor', 
-      'spaw'      => 'spaw', 
-      'htmlarea3' => 'htmlarea3', 
+      'FCKeditor' => 'FCKeditor',
+      'spaw'      => 'spaw',
+      'htmlarea3' => 'htmlarea3',
       'htmlarea2' => 'htmlarea2',
 ));
 
@@ -393,6 +393,9 @@
 $properties["ENABLE_XHTML_XML"] =
 new boolean_define_commented_optional('ENABLE_XHTML_XML');
 
+$properties["ENABLE_OPEN_GRAPH"] =
+new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
+
 $properties["ENABLE_SPAMASSASSIN"] =
 new boolean_define_commented_optional('ENABLE_SPAMASSASSIN');
 
@@ -443,11 +446,11 @@
 
 $properties["Admin Password"] =
 new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, "
-You must set this! 
+You must set this!
 For heaven's sake pick a good password.
 
 If your version of PHP supports encrypted passwords, your password will be
-automatically encrypted within the generated config file. 
+automatically encrypted within the generated config file.
 Use the \"Create Random Password\" button to create a good (random) password.
 
 ADMIN_PASSWD is ignored on HttpAuth",
@@ -466,7 +469,7 @@
        'false' => "false. just record the address as given by the httpd server"));
 
 $properties["ZIP Dump Authentication"] =
-new boolean_define_optional('ZIPDUMP_AUTH', 
+new boolean_define_optional('ZIPDUMP_AUTH',
                     array('false' => "false. Everyone may download zip dumps",
                           'true'  => "true. Only admin may download zip dumps"));
 
@@ -499,14 +502,14 @@
 
 $properties["Access Log SQL"] =
 new _define_selection(
-'ACCESS_LOG_SQL', 
+'ACCESS_LOG_SQL',
 array('0' => 'disabled',
       '1' => 'read only',
       '2' => 'read + write'));
 
 $properties["Compress Output"] =
 new boolean_define_commented_optional
-( 'COMPRESS_OUTPUT', 
+( 'COMPRESS_OUTPUT',
   array(''      => 'undefined - GZIP compress when appropriate.',
         'false' => 'Never compress output.',
         'true'  => 'Always try to compress output.'));
@@ -522,7 +525,7 @@
 HTTP CACHE_CONTROL
 
 This controls how PhpWiki sets the HTTP cache control
-headers (Expires: and Cache-Control:) 
+headers (Expires: and Cache-Control:)
 
 Choose one of:
 <dl>
@@ -576,7 +579,7 @@
 
 $properties["Force PHP Database Sessions"] =
 new boolean_define_commented_optional
-('USE_DB_SESSION', 
+('USE_DB_SESSION',
  array('false' => 'Disable database sessions, use files',
        'true'  => 'Enable database sessions'));
 
@@ -660,7 +663,7 @@
 <pre>
   unix(/var/lib/mysql/mysql.sock)
 </pre>
-here. 
+here.
 mysql on Windows via named pipes might need 127.0.0.1");
 
 $properties["SQL Database Name"] =
@@ -675,7 +678,7 @@
 $dsn_sqlstring = $dsn_sqltype."://{$dsn_sqluser}:{$dsn_sqlpass}@{$dsn_sqlhostorsock}/{$dsn_sqldbname}";
 
 $properties["SQL dsn"] =
-new unchangeable_define("DATABASE_DSN", 
+new unchangeable_define("DATABASE_DSN",
                         $dsn_sqlstring, "
 Calculated from the settings above:");
 
@@ -695,7 +698,7 @@
 
 $properties["DATABASE_PERSISTENT"] =
 new boolean_define_commented_optional
-('DATABASE_PERSISTENT', 
+('DATABASE_PERSISTENT',
  array('false' => "Disabled",
        'true'  => "Enabled"));
 
@@ -720,8 +723,8 @@
                     'db3'  => "DB3 - BerkeleyDB (Sleepycat) DB3. Default on Windows but not on every Linux",
                     'db4'  => "DB4 - BerkeleyDB (Sleepycat) DB4."), "
 Use 'gdbm', 'dbm', 'db2', 'db3' or 'db4' depending on your DBA handler methods supported: <br />  "
-                      . (function_exists("dba_handlers") ? join(", ",dba_handlers()) : "")
-		      . "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
+                      . join(", ",dba_handlers())
+                      . "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
 
 $properties["dba timeout"] =
 new numeric_define("DATABASE_TIMEOUT", DATABASE_TIMEOUT, "
@@ -751,7 +754,7 @@
 class a revision belongs in is determined by whether the author
 checked the \"this is a minor revision\" checkbox when they saved the
 page.
- 
+
 There is, additionally, a third class of revisions: author
 revisions. The most recent non-mergable revision from each distinct
 author is and author revision.
@@ -800,11 +803,11 @@
 
 $properties["Major Edits: keep minimum days"] =
     new numeric_define('MAJOR_MIN_KEEP', MAJOR_MIN_KEEP, "
-Default: Keep for unlimited time. 
+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, "
-Default: Keep for unlimited time. 
+Default: Keep for unlimited time.
 Set to 0 to enable archive cleanup");
 
 $properties["Major Edits: how many"] =
@@ -860,42 +863,42 @@
 new boolean_define_optional('ALLOW_BOGO_LOGIN',
                     array('true'  => "true. Users may Sign In with any WikiWord, without password. (Default)",
                           'false' => "false. Require stricter authentication."), "
-If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password. 
+If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password.
 If true, users are allowed to create themselves with any WikiWord username. See below.");
 
 $properties["Allow User Passwords"] =
 new boolean_define_optional('ALLOW_USER_PASSWORDS',
                     array('true'  => "True user authentication with password checking. (Default)",
                           'false' => "false. Ignore authentication settings below."), "
-If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to 
+If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to
 check against given username/passwords. For completely security disable BOGO_LOGIN and ANON_EDIT above.");
 
 $properties["User Authentication Methods"] =
     new array_define('USER_AUTH_ORDER', array("PersonalPage", "Db"), "
-Many different methods can be used to check user's passwords. 
+Many different methods can be used to check user's passwords.
 Try any of these in the given order:
 <dl>
 <dt>BogoLogin</dt>
-	<dd>WikiWord username, with no *actual* password checking,
+        <dd>WikiWord username, with no *actual* password checking,
         although the user will still have to enter one.</dd>
 <dt>PersonalPage</dt>
-	<dd>Store passwords in the users homepage metadata (simple)</dd>
+        <dd>Store passwords in the users homepage metadata (simple)</dd>
 <dt>Db</dt>
-	<dd>Use DBAUTH_AUTH_* (see below) with PearDB or ADODB only.</dd>
+        <dd>Use DBAUTH_AUTH_* (see below) with PearDB or ADODB only.</dd>
 <dt>LDAP</dt>
-	<dd>Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN.</dd>
+        <dd>Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN.</dd>
 <dt>IMAP</dt>
-	<dd>Authenticate against IMAP_AUTH_HOST (email account)</dd>
+        <dd>Authenticate against IMAP_AUTH_HOST (email account)</dd>
 <dt>POP3</dt>
-	<dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
+        <dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
 <dt>Session</dt>
-	<dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
+        <dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
 <dt>File</dt>
-	<dd>Store username:crypted-passwords in .htaccess like files. 
+        <dd>Store username:crypted-passwords in .htaccess like files.
          Use Apache's htpasswd to manage this file.</dd>
 <dt>HttpAuth</dt>
-	<dd>Use the protection by the webserver (.htaccess/.htpasswd) (experimental)
-	Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also.
+        <dd>Use the protection by the webserver (.htaccess/.htpasswd) (experimental)
+        Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also.
         Using HttpAuth disables all other methods and no userauth sessions are used.</dd>
 </dl>
 
@@ -916,22 +919,22 @@
 $properties["USER_AUTH_POLICY"] =
 new _define_selection('USER_AUTH_POLICY',
               array('first-only' => "first-only - use only the first method in USER_AUTH_ORDER",
-                    'old'  	=> "old - ignore USER_AUTH_ORDER (legacy)",
-                    'strict'  	=> "strict - check all methods for userid + password (recommended)",
-                    'stacked'  	=> "stacked - check all methods for userid, and if found for password"), "
+                    'old'          => "old - ignore USER_AUTH_ORDER (legacy)",
+                    'strict'          => "strict - check all methods for userid + password (recommended)",
+                    'stacked'          => "stacked - check all methods for userid, and if found for password"), "
 The following policies are available for user authentication:
 <dl>
 <dt>first-only</dt>
-	<dd>use only the first method in USER_AUTH_ORDER</dd>
+        <dd>use only the first method in USER_AUTH_ORDER</dd>
 <dt>old</dt>
-	<dd>ignore USER_AUTH_ORDER and try to use all available 
+        <dd>ignore USER_AUTH_ORDER and try to use all available
         methods as in the previous PhpWiki releases (slow)</dd>
 <dt>strict</dt>
-	<dd>check if the user exists for all methods: 
-        on the first existing user, try the password. 
+        <dd>check if the user exists for all methods:
+        on the first existing user, try the password.
         dont try the other methods on failure then</dd>
 <dt>stacked</dt>
-	<dd>check the given user - password combination for all
+        <dd>check the given user - password combination for all
         methods and return true on the first success.</dd></dl>");
 
 $properties["ENABLE_USER_NEW"] =
@@ -968,7 +971,7 @@
 <dt>FILE</dt>
           <dd>Flatfile. See AUTH_GROUP_FILE below.</dd>
 <dt>LDAP</dt>
-          <dd>LDAP groups. See \"LDAP authentication options\" above and 
+          <dd>LDAP groups. See \"LDAP authentication options\" above and
           lib/WikiGroup.php. (experimental)</dd></dl>");
 
 $properties["CATEGORY_GROUP_PAGE"] =
@@ -1109,12 +1112,12 @@
 
 $properties["LDAP AUTH USER"] =
     new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", "
-DN to initially bind to the LDAP server as. This is needed if the server doesn't 
+DN to initially bind to the LDAP server as. This is needed if the server doesn't
 allow anonymous queries. (Windows Active Directory Server)");
 
 $properties["LDAP AUTH PASSWORD"] =
     new _define_optional('LDAP_AUTH_PASSWORD', "secret", "
-Password to use to initially bind to the LDAP server, as the DN 
+Password to use to initially bind to the LDAP server, as the DN
 specified in the LDAP_AUTH_USER option (above).");
 
 $properties["LDAP SEARCH FIELD"] =
@@ -1142,12 +1145,12 @@
 $properties["LDAP Authentication"] =
 new unchangeable_variable('LDAP Authentication', "
 ; If USER_AUTH_ORDER contains Ldap:
-; 
+;
 ; The LDAP server to connect to.  Can either be a hostname, or a complete
 ; URL to the server (useful if you want to use ldaps or specify a different
 ; port number).
 ;LDAP_AUTH_HOST = \"ldap://localhost:389\"
-; 
+;
 ; The organizational or domain BASE DN: e.g. \"dc=mydomain,dc=com\".
 ;
 ; Note: ou=Users and ou=Groups are used for GroupLdap Membership
@@ -1159,11 +1162,11 @@
 ; and their values as NAME=value pairs separated by colons.
 ; LDAP_SET_OPTION = \"LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0\"
 
-; DN to initially bind to the LDAP server as. This is needed if the server doesn't 
+; DN to initially bind to the LDAP server as. This is needed if the server doesn't
 ; allow anonymous queries. (Windows Active Directory Server)
 ; LDAP_AUTH_USER = \"CN=ldapuser,ou=Users,o=Development,dc=mycompany.com\"
 
-; Password to use to initially bind to the LDAP server, as the DN 
+; Password to use to initially bind to the LDAP server, as the DN
 ; specified in the LDAP_AUTH_USER option (above).
 ; LDAP_AUTH_PASSWORD = secret
 
@@ -1193,7 +1196,7 @@
 The IMAP server to check usernames from. Defaults to localhost.
 
 Some IMAP_AUTH_HOST samples:
-  localhost, localhost:143/imap/notls, 
+  localhost, localhost:143/imap/notls,
   localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)");
 
 } else { // function_exists('imap_open')
@@ -1202,9 +1205,9 @@
   new unchangeable_variable('IMAP_AUTH_HOST',"
 ; If USER_AUTH_ORDER contains IMAP:
 ; The IMAP server to check usernames from. Defaults to localhost.
-; 
+;
 ; Some IMAP_AUTH_HOST samples:
-;   localhost, localhost:143/imap/notls, 
+;   localhost, localhost:143/imap/notls,
 ;   localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)
 ;IMAP_AUTH_HOST = localhost:143/imap/notls", "
 Ignored. No IMAP support in this php. configure --with-imap");
@@ -1259,7 +1262,7 @@
                     'SpaceWiki' => "SpaceWiki",
                     'Hawaiian' => "Hawaiian",
                     'MonoBook'  => 'MonoBook [experimental]',
-                    'blog' 	=> 'blog [experimental]',
+                    'blog'         => 'blog [experimental]',
                     ), "
 THEME
 
@@ -1327,11 +1330,11 @@
 WIKI_PGSRC is scanned for files -- one file per page.
 <pre>
 // Default (old) behavior:
-define('WIKI_PGSRC', 'pgsrc'); 
+define('WIKI_PGSRC', 'pgsrc');
 // New style:
-define('WIKI_PGSRC', 'wiki.zip'); 
-define('WIKI_PGSRC', 
-       '../Logs/Hamwiki/hamwiki-20010830.zip'); 
+define('WIKI_PGSRC', 'wiki.zip');
+define('WIKI_PGSRC',
+       '../Logs/Hamwiki/hamwiki-20010830.zip');
 </pre>");
 
 $properties["Default Wiki Page Source"] =
@@ -1391,7 +1394,7 @@
 new _define_optional('KEYWORDS', '\"Category* OR Topic*\"', "
 Search term used for automatic page classification by keyword extraction.
 
-Any links on a page to pages whose names match this search 
+Any links on a page to pages whose names match this search
 will be used keywords in the keywords html meta tag. This is an aid to
 classification by search engines. The value of the match is
 used as the keyword.
@@ -1435,7 +1438,7 @@
 $properties["DISABLE_MARKUP_WIKIWORD"] =
 new boolean_define_optional('DISABLE_MARKUP_WIKIWORD');
 
-$properties["ENABLE_MARKUP_DIVSPAN" ] = 
+$properties["ENABLE_MARKUP_DIVSPAN" ] =
 new boolean_define_optional('ENABLE_MARKUP_DIVSPAN');
 
 ///////////////////
@@ -1458,9 +1461,9 @@
 "onchange=\"validate_ereg('Sorry, \'%s\' is no valid port number.', '^[0-9]+$', 'SERVER_PORT', this);\"");
 
 $properties["Server Protocol"] =
-    new _define_selection_optional_commented('SERVER_PROTOCOL', 
-		    array('http'  => 'http',
-			  'https' => 'https'));
+    new _define_selection_optional_commented('SERVER_PROTOCOL',
+                    array('http'  => 'http',
+                          'https' => 'https'));
 
 $properties["Script Name"] =
     new _define_commented_optional('SCRIPT_NAME', $scriptname);
@@ -1472,18 +1475,18 @@
 new _define_commented_optional('PHPWIKI_DIR', dirname(__FILE__));
 
 $properties["Use PATH_INFO"] =
-new _define_selection_optional_commented('USE_PATH_INFO', 
-		    array(''      => 'automatic',
-			  'true'  => 'use PATH_INFO',
-			  'false' => 'do not use PATH_INFO'), "
-PhpWiki will try to use short urls to pages, eg 
+new _define_selection_optional_commented('USE_PATH_INFO',
+                    array(''      => 'automatic',
+                          'true'  => 'use PATH_INFO',
+                          'false' => 'do not use PATH_INFO'), "
+PhpWiki will try to use short urls to pages, eg
 http://www.example.com/index.php/HomePage
-If you want to use urls like 
+If you want to use urls like
 http://www.example.com/index.php?pagename=HomePage
 then define 'USE_PATH_INFO' as false by uncommenting the line below.
 NB:  If you are using Apache >= 2.0.30, then you may need to to use
 the directive \"AcceptPathInfo On\" in your Apache configuration file
-(or in an appropriate <.htaccess> file) for the short urls to work:  
+(or in an appropriate <.htaccess> file) for the short urls to work:
 See http://httpd.apache.org/docs-2.0/mod/core.html#acceptpathinfo
 
 See also http://phpwiki.sourceforge.net/phpwiki/PrettyWiki for more ideas
@@ -1497,7 +1500,7 @@
 new _define_commented_optional('VIRTUAL_PATH', '/SomeWiki', "
 VIRTUAL_PATH is the canonical URL path under which your your wiki
 appears. Normally this is the same as dirname(SCRIPT_NAME), however
-using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite), 
+using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite),
 you can make it something different.
 
 If you do this, you should set VIRTUAL_PATH here or in the starter scripts.
@@ -1539,7 +1542,7 @@
 ");
 
 $properties["Strict Mailable Pagedumps"] =
-    new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS', 
+    new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS',
      array('false' => "binary",
            'true'  => "quoted-printable"));
 
@@ -1553,8 +1556,8 @@
     new _define_optional('HTML_DUMP_SUFFIX');
 
 $properties["Pagename of Recent Changes"] =
-    new _define_optional('RECENT_CHANGES', 
-			 "RecentChanges");
+    new _define_optional('RECENT_CHANGES',
+                         "RecentChanges");
 
 $properties["Disable HTTP Redirects"] =
     new boolean_define_commented_optional('DISABLE_HTTP_REDIRECT');
@@ -1634,14 +1637,14 @@
 ");
 
 $properties["pear Cache USECACHE"] =
-new boolean_define_optional('PLUGIN_CACHED_USECACHE', 
+new boolean_define_optional('PLUGIN_CACHED_USECACHE',
                     array('true'  => 'Enabled',
-			  'false' => 'Disabled'), "
+                          'false' => 'Disabled'), "
 Enable or disable pear caching of plugins.");
 $properties["pear Cache Database Container"] =
-new _define_selection_optional('PLUGIN_CACHED_DATABASE', 
+new _define_selection_optional('PLUGIN_CACHED_DATABASE',
                                array('file' => 'file'), "
-Curently only file is supported. 
+Curently only file is supported.
 db, trifile and imgfile might be supported, but you must hack that by yourself.");
 
 $properties["pear Cache cache directory"] =
@@ -1662,9 +1665,9 @@
 new numeric_define_optional('PLUGIN_CACHED_MAXARGLEN', "1000", "
 max. generated url length.");
 $properties["pear Cache FORCE_SYNCMAP"] =
-new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP', 
+new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP',
                     array('true'  => 'Enabled',
-			  'false' => 'Disabled'), "");
+                          'false' => 'Disabled'), "");
 $properties["pear Cache IMGTYPES"] =
 new list_define('PLUGIN_CACHED_IMGTYPES', "png|gif|gd|gd2|jpeg|wbmp|xbm|xpm", "
 Handle those image types via GD handles. Check your GD supported image types.");
@@ -1679,7 +1682,7 @@
 // begin class definitions
 
 /**
- * A basic config-dist.ini configuration line in the form of a variable. 
+ * A basic config-dist.ini configuration line in the form of a variable.
  * (not needed anymore, we have only defines)
  *
  * Produces a string in the form "$name = value;"
@@ -1696,40 +1699,40 @@
 
     function _variable($config_item_name, $default_value='', $description = '', $jscheck = '') {
         $this->config_item_name = $config_item_name;
-	if (!$description)
-	    $description = text_from_dist($config_item_name);
+        if (!$description)
+            $description = text_from_dist($config_item_name);
         $this->description = $description;
-	if (defined($config_item_name) 
-	    and !preg_match("/(selection|boolean)/", get_class($this))
-	    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 = '';
-	else
-	    $this->default_value = $default_value;
-	$this->jscheck = $jscheck;
+        if (defined($config_item_name)
+            and !preg_match("/(selection|boolean)/", get_class($this))
+            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 = '';
+        else
+            $this->default_value = $default_value;
+        $this->jscheck = $jscheck;
         if (preg_match("/variable/i", get_class($this)))
-	    $this->prefix = "\$";
-	elseif (preg_match("/ini_set/i", get_class($this)))
+            $this->prefix = "\$";
+        elseif (preg_match("/ini_set/i", get_class($this)))
             $this->prefix = "ini_get: ";
         else
-	    $this->prefix = "";
+            $this->prefix = "";
     }
 
     function _define($config_item_name, $default_value='', $description = '', $jscheck = '') {
-    	$this->_variable($config_item_name, $default_value, $description, $jscheck);
+            $this->_variable($config_item_name, $default_value, $description, $jscheck);
     }
 
     function value() {
       global $HTTP_POST_VARS;
       if (isset($HTTP_POST_VARS[$this->config_item_name]))
           return $HTTP_POST_VARS[$this->config_item_name];
-      else 
+      else
           return $this->default_value;
     }
 
     function _config_format($value) {
-	return '';
+        return '';
         $v = $this->get_config_item_name();
         // handle arrays: a|b --> a['b']
         if (strpos($v, '|')) {
@@ -1752,11 +1755,11 @@
     function get_config_item_header() {
        if (strchr($this->config_item_name,'|')) {
           list($var,$param) = explode('|',$this->config_item_name);
-	  return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />";
+          return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />";
        }
        elseif ($this->config_item_name[0] != '_')
-	  return "<b>" . $this->prefix . $this->config_item_name . "</b><br />";
-       else 
+          return "<b>" . $this->prefix . $this->config_item_name . "</b><br />";
+       else
           return '';
     }
 
@@ -1781,10 +1784,10 @@
     }
 
     function get_html() {
-    	$size = strlen($this->default_value) > 45 ? 90 : 50;
-	return $this->get_config_item_header() . 
-	    "<input type=\"text\" size=\"$50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " . 
-	    $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+            $size = strlen($this->default_value) > 45 ? 90 : 50;
+        return $this->get_config_item_header() .
+            "<input type=\"text\" size=\"$50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " .
+            $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
     }
 }
 
@@ -1795,9 +1798,9 @@
     }
     // function get_html() { return false; }
     function get_html() {
-	return $this->get_config_item_header() . 
-	"<em>Not editable.</em>" . 
-	"<pre>" . $this->default_value."</pre>";
+        return $this->get_config_item_header() .
+        "<em>Not editable.</em>" .
+        "<pre>" . $this->default_value."</pre>";
     }
     function _get_config_line($posted_value) {
         if ($this->description)
@@ -1805,11 +1808,11 @@
         return "${n}".$this->default_value;
     }
     function get_instructions($title) {
-	global $tdwidth;
+        global $tdwidth;
         $i = "<h3>" . $title . "</h3>\n    " . nl2p($this->_get_description()) . "\n";
         // $i .= "<em>Not editable.</em><br />\n<pre>" . $this->default_value."</pre>";
-        return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n" 
-	. '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>';
+        return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n"
+        . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>';
     }
 }
 
@@ -1840,25 +1843,25 @@
         if (!empty($HTTP_POST_VARS[$this->config_item_name]))
             return $HTTP_POST_VARS[$this->config_item_name];
         else {
-	    list($option, $label) = each($this->default_value);
+            list($option, $label) = each($this->default_value);
             return $option;
         }
     }
     function get_html() {
-	$output = $this->get_config_item_header();
+        $output = $this->get_config_item_header();
         $output .= '<select name="' . $this->get_config_item_name() . "\">\n";
         /* The first option is the default */
-	$values = $this->default_value;
-	if (defined($this->get_config_item_name()))
-	    $this->default_value = constant($this->get_config_item_name());
-	else
-	    $this->default_value = null;
+        $values = $this->default_value;
+        if (defined($this->get_config_item_name()))
+            $this->default_value = constant($this->get_config_item_name());
+        else
+            $this->default_value = null;
 
         foreach ($values as $option => $label) {
-	    if (!is_null($this->default_value) && $this->default_value === $option)
-		$output .= "  <option value=\"$option\" selected=\"selected\">$label</option>\n";
-	    else
-		$output .= "  <option value=\"$option\">$label</option>\n";
+            if (!is_null($this->default_value) && $this->default_value === $option)
+                $output .= "  <option value=\"$option\" selected=\"selected\">$label</option>\n";
+            else
+                $output .= "  <option value=\"$option\">$label</option>\n";
         }
         $output .= "</select>\n";
         return $output;
@@ -1880,10 +1883,10 @@
             return "${n}" . $this->_config_format($posted_value);
     }
     function get_html() {
-    	$size = strlen($this->default_value) > 45 ? 90 : 50;
-	return $this->get_config_item_header() 
-            . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name()) 
-            . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />" 
+            $size = strlen($this->default_value) > 45 ? 90 : 50;
+        return $this->get_config_item_header()
+            . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name())
+            . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />"
             . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
     }
 }
@@ -1902,8 +1905,8 @@
     }
 }
 
-/** 
- * We don't use _optional anymore, because INI-style config's don't need that. 
+/**
+ * We don't use _optional anymore, because INI-style config's don't need that.
  * IniConfig.php does the optional logic now.
  * But we use _optional for config-default.ini options
  */
@@ -1916,13 +1919,13 @@
 class _define_notempty
 extends _define {
     function get_html() {
-	$s = $this->get_config_item_header() 
-            . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name() 
+        $s = $this->get_config_item_header()
+            . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name()
             . "\" value=\"" . $this->default_value . "\" {$this->jscheck} />";
         if (empty($this->default_value))
-	    return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
-	else
-	    return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+            return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
+        else
+            return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
     }
 }
 
@@ -1999,7 +2002,7 @@
 extends _variable_selection { }
 
 class _define_selection_optional_commented
-extends _define_selection_optional { 
+extends _define_selection_optional {
     function _get_config_line($posted_value) {
         if ($this->description)
             $n = "\n";
@@ -2016,11 +2019,11 @@
 extends _define {
 
     function _define_password($config_item_name, $default_value='', $description = '', $jscheck = '') {
-    	if ($config_item_name == $default_value) $default_value = '';
+            if ($config_item_name == $default_value) $default_value = '';
         $this->_define($config_item_name, $default_value, $description, $jscheck);
         if (!$jscheck)
-            $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" 
-		. $this->get_config_item_name() . "', this);\"";
+            $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '"
+                . $this->get_config_item_name() . "', this);\"";
     }
     function _get_config_line($posted_value) {
         if ($this->description)
@@ -2057,10 +2060,10 @@
 }
 
 class _define_password_optional
-extends _define_password { 
+extends _define_password {
 
     function _define_password_optional($config_item_name, $default_value='', $description = '', $jscheck = '') {
-    	if ($config_item_name == $default_value) $default_value = '';
+            if ($config_item_name == $default_value) $default_value = '';
         if (!$jscheck) $this->jscheck = " ";
         $this->_define($config_item_name, $default_value, $description, $jscheck);
     }
@@ -2071,20 +2074,20 @@
         if ($posted_value == '') {
             return "${n};" . $this->_config_format("");
         } else {
-	    return "${n}" . $this->_config_format($posted_value);
+            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 = $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;
+        return $s;
     }
 }
 
@@ -2094,35 +2097,35 @@
 class _variable_password
 extends _variable {
     function _variable_password($config_item_name, $default_value='', $description = '', $jscheck = '') {
-    	if ($config_item_name == $default_value) $default_value = '';
+            if ($config_item_name == $default_value) $default_value = '';
         $this->_define($config_item_name, $default_value, $description, $jscheck);
         if (!$jscheck)
             $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" . $this->get_config_item_name() . "', this);\"";
     }
     function get_html() {
-	global $HTTP_POST_VARS, $HTTP_GET_VARS;
-	$s = $this->get_config_item_header();
+        global $HTTP_POST_VARS, $HTTP_GET_VARS;
+        $s = $this->get_config_item_header();
         if (isset($HTTP_POST_VARS['create']) or isset($HTTP_GET_VARS['create'])) {
-	    $new_password = random_good_password();
-	    $this->default_value = $new_password;
-	    $s .= "Created password: <strong>$new_password</strong><br /> <br />";
-	}
-	// 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;
+            $new_password = random_good_password();
+            $this->default_value = $new_password;
+            $s .= "Created password: <strong>$new_password</strong><br /> <br />";
+        }
+        // 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} />" 
+           . "\" value=\"" . $value . "\" {$this->jscheck} />"
            . "  <input type=\"submit\" name=\"create\" value=\"Create Random Password\" />";
-	if (empty($value))
-	    $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
-	elseif (strlen($this->default_value) < 4)
-	    $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>";
-	else
-	    $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
-	return $s;
+        if (empty($value))
+            $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
+        elseif (strlen($this->default_value) < 4)
+            $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>";
+        else
+            $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+        return $s;
     }
 }
 
@@ -2141,9 +2144,9 @@
         $rows = max(3, count($list_values) +1);
         $list_values = join("\n", $list_values);
         $ta = $this->get_config_item_header();
-	$ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
+        $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";
-	$ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
         return $ta;
     }
 }
@@ -2162,9 +2165,9 @@
         if ($list_values)
             $list_values = join("\n", $list_values);
         $ta = $this->get_config_item_header();
-	$ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
+        $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";
-	$ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
         return $ta;
     }
 }
@@ -2172,7 +2175,7 @@
 class array_variable
 extends _variable {
     function _config_format($value) {
-        return sprintf("%s = \"%s\"", $this->get_config_item_name(), 
+        return sprintf("%s = \"%s\"", $this->get_config_item_name(),
                        is_array($value) ? join(':', $value) : $value);
     }
     function _get_config_line($posted_value) {
@@ -2186,15 +2189,15 @@
             return "\n;" . $this->_config_format('');
     }
     function get_html() {
-    	if (is_array($this->default_value))
+            if (is_array($this->default_value))
             $list_values = join("\n", $this->default_value);
-        else    
+        else
             $list_values = $this->default_value;
         $rows = max(3, count($this->default_value) +1);
         $ta = $this->get_config_item_header();
         $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";
-	$ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
         return $ta;
     }
 }
@@ -2202,7 +2205,7 @@
 class array_define
 extends _define {
     function _config_format($value) {
-        return sprintf("%s = \"%s\"", $this->get_config_item_name(), 
+        return sprintf("%s = \"%s\"", $this->get_config_item_name(),
                        is_array($value) ? join(' : ', $value) : $value);
     }
     function _get_config_line($posted_value) {
@@ -2216,16 +2219,16 @@
             return "\n;" . $this->_config_format('');
     }
     function get_html () {
-	if (!$this->default_value)
-	    $this->default_value = array();
-	elseif (is_string($this->default_value))
-	    $this->default_value = preg_split("/[\s,:]+/", $this->default_value, -1, PREG_SPLIT_NO_EMPTY);
-	$list_values = join(" : \n", $this->default_value);
+        if (!$this->default_value)
+            $this->default_value = array();
+        elseif (is_string($this->default_value))
+            $this->default_value = preg_split("/[\s,:]+/", $this->default_value, -1, PREG_SPLIT_NO_EMPTY);
+        $list_values = join(" : \n", $this->default_value);
         $rows = max(3, count($this->default_value) + 1);
         $ta = $this->get_config_item_header();
         $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
         $ta .= $list_values . "</textarea>";
-	$ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+        $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
         return $ta;
     }
 }
@@ -2238,7 +2241,7 @@
         if ($v = $HTTP_POST_VARS[$this->config_item_name])
             return $v;
         else {
-	    return ini_get($this->get_config_item_name);
+            return ini_get($this->get_config_item_name);
         }
     }
     function _config_format($value) {
@@ -2259,20 +2262,20 @@
     // 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);
+        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
+        // 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) 
+            list($this->default_value,$dummy) = $values[0];
+        if (!$values)
             $values = array('false' => "Disabled",
                             'true'  => "Enabled");
-	$this->values  = $values;
-	$this->jscheck = $jscheck;
-	$this->prefix = "";
+        $this->values  = $values;
+        $this->jscheck = $jscheck;
+        $this->prefix = "";
     }
     function _get_config_line($posted_value) {
         if ($this->description)
@@ -2288,18 +2291,18 @@
     //TODO: radiobuttons, no list
     function get_html() {
         $output = $this->get_config_item_header();
-	$name = $this->get_config_item_name();
+        $name = $this->get_config_item_name();
         $output .= '<select name="' . $name . "\" {$this->jscheck}>\n";
-	$values = $this->values;
-	$default_value = $this->default_value ? 'true' : 'false';
+        $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 $option === $default_value)
-		$output .= "  <option value=\"$option\" selected=\"selected\">$label</option>\n";
-	    else
-		$output .= "  <option value=\"$option\">$label</option>\n";
-	}
+            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";
+        }
         $output .= "</select>\n";
         return $output;
     }
@@ -2335,11 +2338,11 @@
         return "\n".$SEPARATOR . str_replace("\n", "\n; ", $d) ."\n".$this->default_value;
     }
     function get_instructions($title) {
-	$id = preg_replace("/\W/","",$this->config_item_name);
-	$group_name = preg_replace("/\W/","",$title);
-	$i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n";
+        $id = preg_replace("/\W/","",$this->config_item_name);
+        $group_name = preg_replace("/\W/","",$title);
+        $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n";
         $i .= "<h2>" . $title . "</h2>\n    " . nl2p($this->_get_description()) ."\n";
-	$i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>";
+        $i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>";
         return  $i ."</td>\n";
     }
     function get_html() {
@@ -2366,30 +2369,30 @@
 function text_from_dist($var) {
     static $distfile = 0;
     static $f;
-    
+
     if (!$distfile) {
-    	$sep = (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/');
-	$distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini";
-	$f = fopen($distfile, "r");
+            $sep = (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/');
+        $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini";
+        $f = fopen($distfile, "r");
     }
     if ($var == '_MAGIC_CLOSE_FILE') {
-	fclose($f);
-	return;
+        fclose($f);
+        return;
     }
     // if all vars would be in natural order as in the config-dist this would not be needed.
-    fseek($f, 0); 
+    fseek($f, 0);
     $par = "\n";
     while (!feof($f)) {
-	$s = fgets($f);
-	if (preg_match("/^; \w/", $s)) {
-	    $par .= (substr($s,2) . " ");
-	} elseif (preg_match("/^;\s*$/", $s)) {
-	    $par .= "\n\n";
-	}
-	if (preg_match("/^;?".preg_quote($var)."\s*=/", $s))
-	    return $par;
-	if (preg_match("/^\s*$/", $s)) // new paragraph
-	    $par = "\n";
+        $s = fgets($f);
+        if (preg_match("/^; \w/", $s)) {
+            $par .= (substr($s,2) . " ");
+        } elseif (preg_match("/^;\s*$/", $s)) {
+            $par .= "\n\n";
+        }
+        if (preg_match("/^;?".preg_quote($var)."\s*=/", $s))
+            return $par;
+        if (preg_match("/^\s*$/", $s)) // new paragraph
+            $par = "\n";
     }
     return '';
 }
@@ -2429,13 +2432,13 @@
   better_srand();
   if (function_exists('mt_rand')) // mersenne twister
       $length = mt_rand($minlength, $maxlength);
-  else	// the usually bad glibc rand()
+  else        // the usually bad glibc rand()
       $length = rand($minlength, $maxlength);
   while ($length > 0) {
       if (function_exists('mt_rand'))
-	  $newchar = mt_rand($start, $end);
+          $newchar = mt_rand($start, $end);
       else
-	  $newchar = rand($start, $end);
+          $newchar = rand($start, $end);
       if (! strrpos($valid_chars,$newchar) ) continue; // skip holes
       $newpass .= sprintf("%c", $newchar);
       $length--;
@@ -2462,14 +2465,14 @@
 }
 
 
-if (!empty($HTTP_POST_VARS['action']) 
+if (!empty($HTTP_POST_VARS['action'])
     and $HTTP_POST_VARS['action'] == 'make_config'
     and !empty($HTTP_POST_VARS['ADMIN_USER'])
     and !empty($HTTP_POST_VARS['ADMIN_PASSWD'])
     )
 {
 
-    $timestamp = date ('dS of F, Y H:i:s');
+    $timestamp = date ('dS \of F, Y H:i:s');
 
     $config = "
 ; This is a local configuration file for PhpWiki.
@@ -2505,7 +2508,7 @@
     else {
       $fp = false;
     }
-    
+
     if ($fp) {
         fputs($fp, utf8_encode($config));
         fclose($fp);
@@ -2517,8 +2520,8 @@
         }
     } else {
         echo "<p>The configuration file could <b>not</b> be written.<br />\n",
-	    " You should copy the above configuration to a file, ",
-	    "and manually save it as <code><b>config/config.ini</b></code>.</p>\n";
+            " You should copy the above configuration to a file, ",
+            "and manually save it as <code><b>config/config.ini</b></code>.</p>\n";
     }
 
     echo "<hr />\n<p>Here's the configuration file based on your answers:</p>\n";
@@ -2534,8 +2537,8 @@
     $posted = $GLOBALS['HTTP_POST_VARS'];
     // No action has been specified - we make a form.
 
-    if (!empty($GLOBALS['HTTP_GET_VARS']['start_debug'])) 
-    	$configurator .= ("?start_debug=" . $GLOBALS['HTTP_GET_VARS']['start_debug']);
+    if (!empty($GLOBALS['HTTP_GET_VARS']['start_debug']))
+            $configurator .= ("?start_debug=" . $GLOBALS['HTTP_GET_VARS']['start_debug']);
     echo '
 <form action="',$configurator,'" method="post">
 <input type="hidden" name="action" value="make_config" />
@@ -2548,7 +2551,7 @@
             if (defined('DEBUG') and DEBUG)  $h = get_class($obj) . "<br />\n" . $h;
             echo "<td>".$h."</td>\n";
         }
-	echo '</tr>';
+        echo '</tr>';
     }
 
     echo '

Modified: branches/Branch_5_1/src/plugins/wiki/www/g
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/g	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/g	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: g 7719 2010-10-22 09:30:47Z vargenau $
+<?php // -*-php-*- $Id: g 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright (C) 2008-2010 Alcatel-Lucent
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
@@ -106,7 +106,7 @@
     // Disable access log (already in Apache & FusionForge).
     define('ACCESS_LOG_SQL', 0);
 
-    define('DEBUG', (forge_get_config ('installation_environment') != 'production'));
+    define('DEBUG', ($sys_install_type != 'production'));
 
     // Postgresql
     define('DATABASE_TYPE', 'SQL');
@@ -169,7 +169,8 @@
     define('EXTERNAL_LINK_TARGET', '_top');
 
     // Override the default configuration for CONSTANTS before index.php
-    $LANG='en'; $LC_ALL='en_US';
+    $LC_ALL = language_name_to_locale_code(choose_language_from_context());
+    $LANG   = preg_replace('/_.*/', '', $LC_ALL);
 
     // We use a local interwiki map file
     define('INTERWIKI_MAP_FILE', 'themes/fusionforge/interwiki.map');
@@ -192,25 +193,23 @@
 
     define('ENABLE_REVERSE_DNS', false);
 
-    // Perhaps propose Web DAV location ?
-    define('DEFAULT_DUMP_DIR', "");
-    define('HTML_DUMP_DIR', "");
+    // Web DAV location
+    define('DEFAULT_DUMP_DIR', "/opt/groups/".$group_name."/wikidump/");
+    define('HTML_DUMP_DIR', "/opt/groups/".$group_name."/wikidumphtml/");
 
     define('COMPRESS_OUTPUT', false);
 
     define('CACHE_CONTROL', "NO_CACHE");
 
-    define('DEFAULT_LANGUAGE', "en");
+    $lg = language_name_to_locale_code(forge_get_config('default_language'));
+    $lg = preg_replace('/_.*/', '', $lg);
+    define('DEFAULT_LANGUAGE', $lg);
 
     define('DISABLE_GETIMAGESIZE', true);
 
     // If the user is logged in, let the Wiki know
-    if (session_loggedin()){
-        // let php do it's session stuff too!
-        //ini_set('session.save_handler', 'files');
-        // session_start();
+    if (session_loggedin()) {
         $user = session_get_user();
-
         if ($user && is_object($user) && !$user->isError() && $user->isActive()) {
             $user_name = $user->getRealName();
             $_SESSION['user_id'] = $user_name;
@@ -229,8 +228,8 @@
     // Override the default configuration for VARIABLES after index.php:
     // E.g. Use another DB:
     $DBParams['dbtype'] = 'SQL';
-    $DBParams['dsn']    = 'ffpgsql://' . forge_get_config('database_user') . ':' .
-        forge_get_config('database_password') . '@' . forge_get_config('database_host') .'/' . forge_get_config('database_name');
+    $DBParams['dsn']    = 'ffpgsql://' . $sys_dbuser . ':' .
+        $sys_dbpasswd . '@' . $sys_dbhost .'/' . $sys_dbname;
 
     $DBParams['prefix'] = "plugin_wiki_";
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/index.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/index.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/index.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// $Id: index.php 7642 2010-08-12 14:47:15Z vargenau $
+// $Id: index.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 1999-2010 $ThePhpWikiProgrammingTeam
@@ -26,7 +26,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/AccessLog.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/AccessLog.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/AccessLog.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: AccessLog.php 7639 2010-08-11 12:15:16Z vargenau $');
+// $Id: AccessLog.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005, 2007 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -57,7 +57,7 @@
             if (!$request->_dbi->isSQL()) {
                 trigger_error("Unsupported database backend for ACCESS_LOG_SQL.\nNeed DATABASE_TYPE=SQL or ADODB or PDO");
             } else {
-            	global $DBParams;
+                global $DBParams;
                 //$this->_dbi =& $request->_dbi;
                 $this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '')."accesslog";
             }
@@ -126,8 +126,8 @@
         if ($this->logtable) {
             // mysql specific only:
             return $this->read_sql("request_host=".$this->_dbi->quote($host)
-				   ." AND time_stamp > ". (time()-$since_minutes*60)
-				   ." ORDER BY time_stamp DESC");
+                   ." AND time_stamp > ". (time()-$since_minutes*60)
+                   ." ORDER BY time_stamp DESC");
         } else {
             $iter = new WikiDB_Array_generic_iter();
             $logs =& $iter->_array;
@@ -160,7 +160,7 @@
             $entry = new Request_AccessLogEntry($this);
             $re = '/^(\S+)\s(\S+)\s(\S+)\s\[(.+?)\] "([^"]+)" (\d+) (\d+) "([^"]*)" "([^"]*)"$/';
             if (preg_match($re, $s, $m)) {
-            	list(,$entry->host, $entry->ident, $entry->user, $entry->time,
+                list(,$entry->host, $entry->ident, $entry->user, $entry->time,
                      $entry->request, $entry->status, $entry->size,
                      $entry->referer, $entry->user_agent) = $m;
             }
@@ -176,8 +176,8 @@
         return $this->sqliter->next();
     }
     function _read_sql_query($where='') {
-    	global $request;
-    	$dbh =& $request->_dbi;
+        global $request;
+        $dbh =& $request->_dbi;
         $log_tbl =& $this->logtable;
         return $dbh->genericSqlIter("SELECT *,request_uri as request,request_time as time,remote_user as user,"
                                     ."remote_host as host,agent as user_agent"
@@ -187,8 +187,8 @@
 
     /* done in request->finish() before the db is closed */
     function write_sql() {
-    	global $request;
-    	$dbh =& $request->_dbi;
+        global $request;
+        $dbh =& $request->_dbi;
         if (isset($this->entries) and $dbh and $dbh->isOpen())
             foreach ($this->entries as $entry) {
                 $entry->write_sql();
@@ -236,7 +236,7 @@
         $this->logfile = $accesslog->logfile;
         $this->time = time();
         $this->status = 200;    // see setStatus()
-        $this->size = 0;	// see setSize()
+        $this->size = 0;    // see setSize()
     }
 
     /**
@@ -350,7 +350,7 @@
     /* This is better been done by apache mod_log_sql */
     /* If ACCESS_LOG_SQL & 2 we do write it by our own */
     function write_sql() {
-    	global $request;
+        global $request;
 
         $dbh =& $request->_dbi;
         if ($dbh and $dbh->isOpen() and $this->_accesslog->logtable) {
@@ -365,7 +365,7 @@
                 if (!empty($args['pref']['passwd2']))   $args['pref']['passwd2'] = '<not displayed>';
                 $this->request_args = substr(serialize($args),0,254); // if VARCHAR(255) is used.
             } else {
-          	$this->request_args = $request->get('QUERY_STRING');
+              $this->request_args = $request->get('QUERY_STRING');
             }
             $this->request_method = $request->get('REQUEST_METHOD');
             $this->request_uri = $request->get('REQUEST_URI');

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/ArchiveCleaner.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/ArchiveCleaner.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/ArchiveCleaner.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,21 +1,21 @@
-<?php 
-// rcs_id('$Id: ArchiveCleaner.php 7417 2010-05-19 12:57:42Z vargenau $');
+<?php
+// $Id: ArchiveCleaner.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki at dairiki.org>
  *
  * 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -24,7 +24,7 @@
     function ArchiveCleaner ($expire_params) {
         $this->expire_params = $expire_params;
     }
-    
+
     function isMergeable($revision) {
         if ( ! $revision->get('is_minor_edit') )
             return false;
@@ -43,20 +43,20 @@
         while ($page = $iter->next())
             $this->cleanPageRevisions($page);
     }
-        
+
     function cleanPageRevisions($page) {
         $INFINITY = 0x7fffffff;
 
         $expire = &$this->expire_params;
         foreach (array('major', 'minor', 'author') as $class)
             $counter[$class] = new ArchiveCleaner_Counter($expire[$class]);
-        // shortcut to keep all    
-        if (($counter['minor']->min_keep == $INFINITY) 
+        // shortcut to keep all
+        if (($counter['minor']->min_keep == $INFINITY)
             and ($counter['major']->min_keep == $INFINITY))
             return;
 
         $authors_seen = array();
-        
+
         $current = $page->getCurrentRevision(false);
 
         for ( $revision = $page->getRevisionBefore($current,false);
@@ -117,11 +117,11 @@
 
         if ($this->min_age > $this->max_age)
             $this->min_age = $this->max_age;
-            
+
         $this->now = time();
         $this->count = 0;
         $this->previous_supplanted = false;
-        
+
     }
 
     function computeAge($revision) {
@@ -148,14 +148,14 @@
         $this->previous_supplanted = $supplanted;
         return ($this->now - $supplanted) / (24 * 3600);
     }
-        
+
     function keep($revision) {
-    	$INFINITY = 0x7fffffff;
-    	if ($this->min_keep == $INFINITY)
-    	    return true;
+        $INFINITY = 0x7fffffff;
+        if ($this->min_keep == $INFINITY)
+            return true;
         $count = ++$this->count;
         $age = $this->computeAge($revision);
-        
+
         if ($count > $this->max_keep)
             return false;
         if ($age <= $this->min_age || $count <= $this->min_keep)
@@ -170,5 +170,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/AtomParser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/AtomParser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/AtomParser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// $Id: AtomParser.php 7509 2010-06-09 11:35:44Z rurban $
+// $Id: AtomParser.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2010 Sébastien Le Callonnec
  *
@@ -16,14 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**
  * This class is a poor-man Atom parser, it does no validation of the feed.
  * The content of an entry ("payload") is not parsed but rather returned "as-is",
  * as its format can be text, html or xhtml.
- * 
+ *
  * @author: Sébastien Le Callonnec
  */
 require_once('lib/XmlParser.php');
@@ -44,7 +44,7 @@
     var $icon = '';
     var $rights = '';
     var $logo = '';
-    
+
     var $categories = array();
 
     var $authors = array();
@@ -64,7 +64,7 @@
     var $id = '';
     var $links = array();
     var $summary = '';
-    
+
     var $inside_content = false;
     var $content = '';
 
@@ -165,7 +165,7 @@
 
     function cdata($parser, $data) {
         global $current_tag, $current_attrs;
-        
+
         if ($this->inside_content) {
             $this->content .= $data;
         } else {
@@ -244,7 +244,7 @@
             return trim($element);
         }
     }
-    
+
     function serialize_tag($tag_name, $attributes) {
         $tag = "<" . $tag_name;
         foreach ($attributes as $k => $v) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/BlockParser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/BlockParser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/BlockParser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,7 +1,7 @@
-<?php // rcs_id('$Id: BlockParser.php 7711 2010-10-05 16:08:35Z vargenau $');
+<?php // $Id: BlockParser.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki at dairiki.org>
  * Copyright (C) 2004,2005 Reini Urban
- * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -16,10 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-
 //require_once('lib/HtmlElement.php');
 require_once('lib/CachedMarkup.php');
 require_once('lib/InlineParser.php');
@@ -94,11 +93,11 @@
      * @return object  A RegexpSet_match object, or false if no match.
      */
     function match ($text) {
-    	if (!is_string($text)) return false;
+        if (!is_string($text)) return false;
         if (! preg_match($this->_re, $text, $m)) {
             return false;
         }
-      
+
         $match = new AnchoredRegexpSet_match;
         $match->postmatch = substr($text, strlen($m[0]));
         $match->match = $m[1];
@@ -137,7 +136,7 @@
         if (! preg_match($pat, $text, $m)) {
             return false;
         }
-      
+
         $match = new AnchoredRegexpSet_match;
         $match->postmatch = substr($text, strlen($m[0]));
         $match->match = $m[1];
@@ -147,11 +146,11 @@
 }
 
 
-  
+
 class BlockParser_Input {
 
     function BlockParser_Input ($text) {
-      
+
         // Expand leading tabs.
         // FIXME: do this better.
         //
@@ -183,14 +182,14 @@
         }
         return $this->_atSpace;
     }
-      
+
     function currentLine () {
         if ($this->_pos >= count($this->_lines)) {
             return false;
         }
         return $this->_lines[$this->_pos];
     }
-      
+
     function nextLine () {
         $this->_atSpace = $this->_lines[$this->_pos++] === '';
         if ($this->_pos >= count($this->_lines)) {
@@ -203,7 +202,7 @@
         $this->_atSpace = ($this->_lines[$this->_pos] === '');
         $this->_pos++;
     }
-  
+
     function getPos () {
         return array($this->_pos, $this->_atSpace);
     }
@@ -226,7 +225,7 @@
         else
             return "<EOF>";
     }
-  
+
     function _debug ($tab, $msg) {
         //return ;
         $where = $this->where();
@@ -234,7 +233,7 @@
         printXML(HTML::div("$tab $msg: at: '",
                            HTML::tt($where),
                            "'"));
-        flush();                 
+        flush();
     }
 }
 
@@ -272,7 +271,7 @@
         else
             return $this->_atSpace;
     }
-      
+
     function currentLine () {
         return $this->_line;
     }
@@ -297,7 +296,7 @@
     function advance () {
         $this->nextLine();
     }
-      
+
     function getPos () {
         return array($this->_line, $this->_atSpace, $this->_input->getPos());
     }
@@ -307,7 +306,7 @@
         $this->_atSpace = $pos[1];
         $this->_input->setPos($pos[2]);
     }
-  
+
     function getPrefix () {
         assert ($this->_line !== false);
         $line = $this->_input->currentLine();
@@ -323,8 +322,8 @@
         return $this->_input->where();
     }
 }
-  
 
+
 class Block_HtmlElement extends HtmlElement
 {
     function Block_HtmlElement($tag /*, ... */) {
@@ -336,7 +335,7 @@
 }
 
 class ParsedBlock extends Block_HtmlElement {
-  
+
     function ParsedBlock (&$input, $tag = 'div', $attr = false) {
         $this->Block_HtmlElement($tag, $attr);
         $this->_initBlockTypes();
@@ -363,22 +362,22 @@
 
     // FIXME: hackish. This should only be called once.
     function _initBlockTypes () {
-    	// better static or global?
-    	static $_regexpset, $_block_types;
+        // better static or global?
+        static $_regexpset, $_block_types;
 
-    	if (!is_object($_regexpset)) {
+        if (!is_object($_regexpset)) {
             // nowiki_wikicreole must be before template_plugin
-	    $Block_types = array
-		    ('nowiki_wikicreole', 'template_plugin', 'placeholder', 'oldlists', 'list', 'dl',
+        $Block_types = array
+            ('nowiki_wikicreole', 'template_plugin', 'placeholder', 'oldlists', 'list', 'dl',
                      'table_dl', 'table_wikicreole', 'table_mediawiki',
                      'blockquote', 'heading', 'heading_wikicreole', 'hr', 'pre',
                      'email_blockquote', 'wikicreole_indented',
-		     'plugin', 'plugin_wikicreole', 'p');
+             'plugin', 'plugin_wikicreole', 'p');
             // insert it before p!
             if (ENABLE_MARKUP_DIVSPAN) {
-            	array_pop($Block_types);
- 		$Block_types[] = 'divspan';
- 		$Block_types[] = 'p';
+                array_pop($Block_types);
+         $Block_types[] = 'divspan';
+         $Block_types[] = 'p';
             }
             foreach ($Block_types as $type) {
                 $class = "Block_$type";
@@ -390,7 +389,7 @@
             $_regexpset = $this->_regexpset;
             $_block_types = $this->_block_types;
             unset($Block_types);
-    	} else {
+        } else {
              $this->_regexpset = $_regexpset;
              $this->_block_types = $_block_types;
         }
@@ -410,9 +409,9 @@
             $block = clone($this->_block_types[$m->regexp_ind]);
             if (DEBUG & _DEBUG_PARSER)
                 $input->_debug('>', get_class($block));
-          
+
             if ($block->_match($input, $m)) {
-            	//$block->_text = $line;
+                //$block->_text = $line;
                 if (DEBUG & _DEBUG_PARSER)
                     $input->_debug('<', get_class($block));
                 $tight_bottom = ! $input->skipSpace();
@@ -501,12 +500,12 @@
                                        'blockquote');
         return true;
     }
-  
+
     function merge ($nextBlock) {
         if (get_class($nextBlock) == get_class($this)) {
             assert ($nextBlock->_depth < $this->_depth);
             $nextBlock->_element->unshiftContent($this->_element);
-	    if (!empty($this->_tight_top))
+        if (!empty($this->_tight_top))
             $nextBlock->_tight_top = $this->_tight_top;
             return $nextBlock;
         }
@@ -536,7 +535,7 @@
         if (preg_match('/[*#+-o]/', $input->getPrefix())) {
             return false;
         }
-      
+
         $prefix = $m->match;
         $indent = sprintf("\\ {%d}", strlen($prefix));
 
@@ -620,13 +619,13 @@
 {
     var $nrows;
     var $ncols;
-  
+
     function Block_table_dl_defn ($term, $defn) {
         $this->XmlContent();
         if (!is_array($defn))
             $defn = $defn->getContent();
 
-	$this->_next_tight_top = false; // value irrelevant - gets fixed later
+    $this->_next_tight_top = false; // value irrelevant - gets fixed later
         $this->_ncols = $this->_ComputeNcols($defn);
         $this->_nrows = 0;
 
@@ -646,9 +645,9 @@
 
     function setTightness($tight_top, $tight_bot) {
         $this->_tight_top = $tight_top;
-	$this->_tight_bot = $tight_bot;
+    $this->_tight_bot = $tight_bot;
     }
-  
+
     function _addToRow ($item) {
         if (empty($this->_accum)) {
             $this->_accum = HTML::td();
@@ -664,7 +663,7 @@
 
             $row->setTightness($this->_next_tight_top, $tight_bottom);
             $this->_next_tight_top = $tight_bottom;
-          
+
             $this->pushContent($row);
             $this->_accum = false;
             $this->_nrows++;
@@ -676,7 +675,7 @@
             return;
 
         $this->_flushRow($table_rows[0]->_tight_top);
-          
+
         foreach ($table_rows as $subdef) {
             $this->pushContent($subdef);
             $this->_nrows += $subdef->nrows();
@@ -691,7 +690,7 @@
         else
             $first_row->unshiftContent($th);
     }
-  
+
     function _ComputeNcols ($defn) {
         $ncols = 2;
         foreach ($defn as $item) {
@@ -723,17 +722,17 @@
     }
 
     function & firstTR() {
-	$first = &$this->_content[0];
-	if (isa($first, 'Block_table_dl_defn'))
-	    return $first->firstTR();
-	return $first;
+    $first = &$this->_content[0];
+    if (isa($first, 'Block_table_dl_defn'))
+        return $first->firstTR();
+    return $first;
     }
 
     function & lastTR() {
-	$last = &$this->_content[$this->_nrows - 1];
-	if (isa($last, 'Block_table_dl_defn'))
-	    return $last->lastTR();
-	return $last;
+    $last = &$this->_content[$this->_nrows - 1];
+    if (isa($last, 'Block_table_dl_defn'))
+        return $last->lastTR();
+    return $last;
     }
 
     function setWidth ($ncols) {
@@ -775,7 +774,7 @@
     function _setTightness($top, $bot) {
         $this->_content[0]->setTightness($top, $bot);
     }
-  
+
     function finish () {
 
         $defs = &$this->_content;
@@ -783,7 +782,7 @@
         $ncols = 0;
         foreach ($defs as $defn)
             $ncols = max($ncols, $defn->ncols());
-      
+
         foreach ($defs as $key => $defn)
             $defs[$key]->setWidth($ncols);
 
@@ -808,8 +807,8 @@
         if (!preg_match('/[*#;]*$/A', $input->getPrefix())) {
             return false;
         }
-      
 
+
         $prefix = $m->match;
         $oldindent = '[*#;](?=[#*]|;.*:.*\S)';
         $newindent = sprintf('\\ {%d}', strlen($prefix));
@@ -874,7 +873,7 @@
                     */
                     echo 'count($this->_content): ', count($this->_content),"\n";
                     echo "\$this->_content[0]: "; var_dump ($this->_content[0]);
-                  
+
                     for ($i=1; $i < min(5, count($this->_content)); $i++) {
                         $c =& $this->_content[$i];
                         echo '$this->_content[',$i,"]: \n";
@@ -919,26 +918,26 @@
             }
         }
         $input->advance();
-      
-	if ($m->match == '<nowiki>')
-	    $text = join("<br>\n", $text);
-	else
+
+    if ($m->match == '<nowiki>')
+        $text = join("<br>\n", $text);
+    else
             $text = join("\n", $text);
-      
+
         // FIXME: no <img>, <big>, <small>, <sup>, or <sub>'s allowed
         // in a <pre>.
         if ($m->match == '<pre>') {
             $text = TransformInline($text);
         }
-	if ($m->match == '<noinclude>') {
-	    $text = TransformText($text);
-	    $this->_element = new Block_HtmlElement('div', false, $text);
-	} else if ($m->match == '<nowiki>') {
+    if ($m->match == '<noinclude>') {
+        $text = TransformText($text);
+        $this->_element = new Block_HtmlElement('div', false, $text);
+    } else if ($m->match == '<nowiki>') {
             $text = TransformInlineNowiki($text);
-	    $this->_element = new Block_HtmlElement('p', false, $text);
-	} else {
+        $this->_element = new Block_HtmlElement('p', false, $text);
+    } else {
             $this->_element = new Block_HtmlElement('pre', false, $text);
-	}
+    }
         return true;
     }
 }
@@ -1020,7 +1019,7 @@
         }
         $input->advance();
 
-	$this->_element = new Cached_PluginInvocation($pi);
+    $this->_element = new Cached_PluginInvocation($pi);
         return true;
     }
 }
@@ -1175,6 +1174,11 @@
         }
 
         $pi = str_replace("\n", "", $pi);
+
+        // The argument value might contain a double quote (")
+        // We have to encode that.
+        $pi = htmlspecialchars($pi);
+
         $vars = '';
 
         if (preg_match('/^(\S+?)\|(.*)$/', $pi, $_m)) {
@@ -1203,7 +1207,7 @@
 {
     var $_attr = array('class' => 'mail-style-quote');
     var $_re = '>\ ?';
-  
+
     function _match (&$input, $m) {
         //$indent = str_replace(' ', '\\ ', $m->match) . '|>$';
         $indent = $this->_re;
@@ -1240,14 +1244,14 @@
 class Block_heading extends BlockMarkup
 {
     var $_re = '!{1,3}';
-  
+
     function _match (&$input, $m) {
         $tag = "h" . (5 - strlen($m->match));
         $text = TransformInline(trim($m->postmatch));
         $input->advance();
 
         $this->_element = new Block_HtmlElement($tag, false, $text);
-      
+
         return true;
     }
 }
@@ -1255,7 +1259,7 @@
 class Block_heading_wikicreole extends BlockMarkup
 {
     var $_re = '={2,6}';
-  
+
     function _match (&$input, $m) {
         $tag = "h" . strlen($m->match);
         // Remove spaces
@@ -1266,7 +1270,7 @@
         $input->advance();
 
         $this->_element = new Block_HtmlElement($tag, false, $text);
-      
+
         return true;
     }
 }
@@ -1311,12 +1315,12 @@
     var $_re = '<(?im)(?: div|span)(?:[^>]*)?>';
 
     function _match (&$input, $m) {
-    	if (substr($m->match,1,4) == 'span') {
-    	    $tag = 'span';
-	} else {
-    	    $tag = 'div';
-	}
-	// without last >
+        if (substr($m->match,1,4) == 'span') {
+            $tag = 'span';
+    } else {
+            $tag = 'div';
+    }
+    // without last >
         $argstr = substr(trim(substr($m->match,strlen($tag)+1)),0,-1);
         $pos = $input->getPos();
         $pi  = $content = $m->postmatch;
@@ -1335,22 +1339,22 @@
         $input->advance();
         if (strstr($content, "\n"))
             $content = TransformText($content);
-        else  
+        else
             $content = TransformInline($content);
         if (!$argstr)
             $args = false;
         else {
             $args = array();
             while (preg_match("/(\w+)=(.+)/", $argstr, $m)) {
-            	$k = $m[1]; $v = $m[2];
-            	if (preg_match("/^\"(.+?)\"(.*)$/", $v, $m)) {
-            	    $v = $m[1];
-            	    $argstr = $m[2];
-            	} else {
-            	    preg_match("/^(\s+)(.*)$/", $v, $m);
-            	    $v = $m[1];
-            	    $argstr = $m[2];
-            	}
+                $k = $m[1]; $v = $m[2];
+                if (preg_match("/^\"(.+?)\"(.*)$/", $v, $m)) {
+                    $v = $m[1];
+                    $argstr = $m[2];
+                } else {
+                    preg_match("/^(\s+)(.*)$/", $v, $m);
+                    $v = $m[1];
+                    $argstr = $m[2];
+                }
                 if (trim($k) and trim($v)) $args[$k] = $v;
             }
         }
@@ -1376,13 +1380,8 @@
     if (!empty($markup) && $markup < 2.0) {
         $text = ConvertOldMarkup($text);
     }
-    // WikiCreole
-    /*if (!empty($markup) && $markup == 3) {
-    	$text = ConvertFromCreole($text);
-    }*/
     // Expand leading tabs.
     $text = expand_tabs($text);
-    //set_time_limit(3);
     $output = new WikiText($text);
 
     return $output;
@@ -1409,5 +1408,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/CachedMarkup.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/CachedMarkup.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/CachedMarkup.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: CachedMarkup.php 7664 2010-08-31 15:42:34Z vargenau $');
+// $Id: CachedMarkup.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki at dairiki.org>
  * Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -27,12 +27,12 @@
 
     function CacheableMarkup($content, $basepage) {
         $this->_basepage = $basepage;
-	$this->_buf = '';
-	$this->_content = array();
-	$this->_append($content);
-	if ($this->_buf != '')
-	    $this->_content[] = $this->_buf;
-	unset($this->_buf);
+    $this->_buf = '';
+    $this->_content = array();
+    $this->_append($content);
+    if ($this->_buf != '')
+        $this->_content[] = $this->_buf;
+    unset($this->_buf);
     }
 
     function pack() {
@@ -88,15 +88,15 @@
                       E_USER_WARNING);
         return false;
     }
-  
+
     /** Get names of wikipages linked to.
      *
      * @return array of hashes { linkto=>pagename, relation=>pagename }
      */
     function getWikiPageLinks() {
-	$links = array();
-	foreach ($this->_content as $item) {
-	    if (!isa($item, 'Cached_DynamicContent'))
+    $links = array();
+    foreach ($this->_content as $item) {
+        if (!isa($item, 'Cached_DynamicContent'))
                 continue;
             if (!($item_links = $item->getWikiPageLinks($this->_basepage)))
                 continue;
@@ -104,8 +104,8 @@
         }
         // array_unique has a bug with hashes!
         // set_links checks for duplicates, array_merge does not
-	//return array_unique($links);
-	return $links;
+    //return array_unique($links);
+    return $links;
     }
 
     /** Get link info.
@@ -116,63 +116,63 @@
      * Returns an array of hashes.
      */
     function getLinkInfo() {
-	$link = array();
-	foreach ($this->_content as $link) {
-	    if (! isa($link, 'Cached_Link'))
-		continue;
-	    $info = $link->getLinkInfo($this->_basepage);
-	    $links[$info->href] = $info;
-	}
-	return array_values($links);
+    $link = array();
+    foreach ($this->_content as $link) {
+        if (! isa($link, 'Cached_Link'))
+        continue;
+        $info = $link->getLinkInfo($this->_basepage);
+        $links[$info->href] = $info;
     }
+    return array_values($links);
+    }
 
     function _append($item) {
-	if (is_array($item)) {
-	    foreach ($item as $subitem)
-		$this->_append($subitem);
-	}
-	elseif (!is_object($item)) {
-	    $this->_buf .= $this->_quote((string) $item);
-	}
-	elseif (isa($item, 'Cached_DynamicContent')) {
-	    if ($this->_buf) {
-		$this->_content[] = $this->_buf;
-		$this->_buf = '';
-	    }
-	    $this->_content[] = $item;
-	}
-	elseif (isa($item, 'XmlElement')) {
-	    if ($item->isEmpty()) {
-		$this->_buf .= $item->emptyTag();
-	    }
-	    else {
-		$this->_buf .= $item->startTag();
-		foreach ($item->getContent() as $subitem)
-		    $this->_append($subitem);
-		$this->_buf .= "</$item->_tag>";
+    if (is_array($item)) {
+        foreach ($item as $subitem)
+        $this->_append($subitem);
+    }
+    elseif (!is_object($item)) {
+        $this->_buf .= $this->_quote((string) $item);
+    }
+    elseif (isa($item, 'Cached_DynamicContent')) {
+        if ($this->_buf) {
+        $this->_content[] = $this->_buf;
+        $this->_buf = '';
+        }
+        $this->_content[] = $item;
+    }
+    elseif (isa($item, 'XmlElement')) {
+        if ($item->isEmpty()) {
+        $this->_buf .= $item->emptyTag();
+        }
+        else {
+        $this->_buf .= $item->startTag();
+        foreach ($item->getContent() as $subitem)
+            $this->_append($subitem);
+        $this->_buf .= "</$item->_tag>";
 
                 if (!$this->getDescription() and $item->getTag() == 'p') {
                     // performance: when is this really needed?
                     $this->_glean_description($item->asString());
                 }
-	    }
-	    if (!$item->isInlineElement())
-		$this->_buf .= "\n";
-	}
-	elseif (isa($item, 'XmlContent')) {
-	    foreach ($item->getContent() as $item)
-		$this->_append($item);
-	}
-	elseif (method_exists($item, 'asXML')) {
-	    $this->_buf .= $item->asXML();
-	}
-	elseif (method_exists($item, 'asString')) {
-	    $this->_buf .= $this->_quote($item->asString());
-	}
-	else {
-	    $this->_buf .= sprintf("==Object(%s)==", get_class($item));
-	}
+        }
+        if (!$item->isInlineElement())
+        $this->_buf .= "\n";
     }
+    elseif (isa($item, 'XmlContent')) {
+        foreach ($item->getContent() as $item)
+        $this->_append($item);
+    }
+    elseif (method_exists($item, 'asXML')) {
+        $this->_buf .= $item->asXML();
+    }
+    elseif (method_exists($item, 'asString')) {
+        $this->_buf .= $this->_quote($item->asString());
+    }
+    else {
+        $this->_buf .= sprintf("==Object(%s)==", get_class($item));
+    }
+    }
 
     function _glean_description($text) {
         static $two_sentences;
@@ -181,7 +181,7 @@
                            . ".*"
                            . "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)";
         }
-      
+
         if (!isset($this->_description) and preg_match("/$two_sentences/sx", $text))
             $this->_description = preg_replace("/\s*\n\s*/", " ", trim($text));
     }
@@ -204,12 +204,12 @@
     function getDescription () {
         return isset($this->_description) ? $this->_description : '';
     }
-  
+
     function asXML () {
-	$xml = '';
+    $xml = '';
         $basepage = $this->_basepage;
-      
-	foreach ($this->_content as $item) {
+
+    foreach ($this->_content as $item) {
             if (is_string($item)) {
                 $xml .= $item;
             }
@@ -224,15 +224,15 @@
             else {
                 $xml .= $item->asXML();
             }
-	}
-	return $xml;
     }
+    return $xml;
+    }
 
     function printXML () {
         $basepage = $this->_basepage;
         // _content might be changed from a plugin (CreateToc)
-	for ($i=0; $i < count($this->_content); $i++) {
-	    $item = $this->_content[$i];
+    for ($i=0; $i < count($this->_content); $i++) {
+        $item = $this->_content[$i];
             if (is_string($item)) {
                 print $item;
             }
@@ -240,8 +240,8 @@
                                    check_php_version(5)
                                      ? 'Cached_DynamicContent'
                                      : 'cached_dynamiccontent'))
-            {  	// give the content the chance to know about itself or even
-            	// to change itself
+            {      // give the content the chance to know about itself or even
+                // to change itself
                 $val = $item->expand($basepage, $this);
                 if ($val) $val->printXML();
                 else trigger_error('empty item ' . print_r($item, true));
@@ -249,8 +249,8 @@
             else {
                 $item->printXML();
             }
-	}
     }
+    }
 }
 
 /**
@@ -262,7 +262,7 @@
 class Cached_DynamicContent {
 
     function cache(&$cache) {
-	$cache[] = $this;
+    $cache[] = $this;
     }
 
     function expand($basepage, &$obj) {
@@ -276,18 +276,18 @@
 
 class XmlRpc_LinkInfo {
     function XmlRpc_LinkInfo($page, $type, $href, $relation = '') {
-	$this->page = $page;
-	$this->type = $type;
-	$this->href = $href;
-	$this->relation = $relation;
-	//$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
+    $this->page = $page;
+    $this->type = $type;
+    $this->href = $href;
+    $this->relation = $relation;
+    //$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
     }
 }
 
 class Cached_Link extends Cached_DynamicContent {
 
     function isInlineElement() {
-	return true;
+    return true;
     }
 
     /** Get link info (for XML-RPC support)
@@ -296,17 +296,17 @@
      * (See http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=WikiRPCInterface)
      */
     function getLinkInfo($basepage) {
-	return new XmlRpc_LinkInfo($this->_getName($basepage),
+    return new XmlRpc_LinkInfo($this->_getName($basepage),
                                    $this->_getType(),
                                    $this->_getURL($basepage),
                                    $this->_getRelation($basepage));
     }
-  
+
     function _getURL($basepage) {
-	return $this->_url;
+    return $this->_url;
     }
     function __getRelation($basepage) {
-	return $this->_relation;
+    return $this->_relation;
     }
 }
 /*
@@ -315,55 +315,55 @@
  */
 class Cached_InlinedImage extends Cached_DynamicContent {
     function isInlineElement() {
-	return true;
+    return true;
     }
     function _getURL($basepage) {
-	return $this->_url;
+    return $this->_url;
     }
     // TODO: fix interwiki inline links in case of static dumps
     function expand($basepage, &$markup) {
-	global $WikiTheme;
-    	$this->_basepage = $basepage;
-	$label = isset($this->_label) ? $this->_label : false;
-	if ($WikiTheme->DUMP_MODE) {
+    global $WikiTheme;
+        $this->_basepage = $basepage;
+    $label = isset($this->_label) ? $this->_label : false;
+    if ($WikiTheme->DUMP_MODE) {
             // In case of static dumps we need to check if we should
             // inline the image or not: external: keep link, internal: copy locally
-	    return LinkImage($label);
-	} else {
-	    return LinkImage($label);
-	}
+        return LinkImage($label);
+    } else {
+        return LinkImage($label);
     }
+    }
 }
 
 class Cached_WikiLink extends Cached_Link {
 
     function Cached_WikiLink ($page, $label = false, $anchor = false) {
-	$this->_page = $page;
-	/* ":DontStoreLink" */
-	if (substr($this->_page,0,1) == ':') {
-	    $this->_page = substr($this->_page,1);
-	    $this->_nolink = true;
-        }  
+    $this->_page = $page;
+    /* ":DontStoreLink" */
+    if (substr($this->_page,0,1) == ':') {
+        $this->_page = substr($this->_page,1);
+        $this->_nolink = true;
+        }
         if ($anchor)
             $this->_anchor = $anchor;
         if ($label and $label != $page)
             $this->_label = $label;
-        $this->_basepage = false;  
+        $this->_basepage = false;
     }
 
     function _getType() {
         return 'internal';
     }
-  
+
     function getPagename($basepage) {
         $page = new WikiPageName($this->_page, $basepage);
-	if ($page->isValid()) return $page->name;
-	else return false;
+    if ($page->isValid()) return $page->name;
+    else return false;
     }
 
     function getWikiPageLinks($basepage) {
         if ($basepage == '') return false;
-	if (isset($this->_nolink)) return false;
+    if (isset($this->_nolink)) return false;
         if ($link = $this->getPagename($basepage))
             return array(array('linkto' => $link));
         else
@@ -371,41 +371,41 @@
     }
 
     function _getName($basepage) {
-	return $this->getPagename($basepage);
+    return $this->getPagename($basepage);
     }
 
     function _getURL($basepage) {
-	return WikiURL($this->getPagename($basepage));
-	//return WikiURL($this->getPagename($basepage), false, 'abs_url');
+    return WikiURL($this->getPagename($basepage));
+    //return WikiURL($this->getPagename($basepage), false, 'abs_url');
     }
 
     function expand($basepage, &$markup) {
-	global $WikiTheme;
-    	$this->_basepage = $basepage;
-	$label = isset($this->_label) ? $this->_label : false;
-	$anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+    global $WikiTheme;
+        $this->_basepage = $basepage;
+    $label = isset($this->_label) ? $this->_label : false;
+    $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
         $page = new WikiPageName($this->_page, $basepage, $anchor);
-	if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
-	    if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
-		return HTML($label ? $label : $page->getName());
-	}
+    if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
+        if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+        return HTML($label ? $label : $page->getName());
+    }
         if ($page->isValid()) return WikiLink($page, 'auto', $label);
-	else return HTML($label);
+    else return HTML($label);
     }
 
     function asXML() {
-	global $WikiTheme;
-	$label = isset($this->_label) ? $this->_label : false;
-	$anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
-	//TODO: need basepage for subpages like /Remove (within CreateTOC)
+    global $WikiTheme;
+    $label = isset($this->_label) ? $this->_label : false;
+    $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+    //TODO: need basepage for subpages like /Remove (within CreateTOC)
         $page = new WikiPageName($this->_page, $this->_basepage, $anchor);
-	if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
-	    if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
-		return $label ? $label : $page->getName();
-	}
-	$link = WikiLink($page, 'auto', $label);
-	return $link->asXML();
+    if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+        if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+        return $label ? $label : $page->getName();
     }
+    $link = WikiLink($page, 'auto', $label);
+    return $link->asXML();
+    }
 
     function asString() {
         if (isset($this->_label))
@@ -417,54 +417,54 @@
 class Cached_WikiLinkIfKnown extends Cached_WikiLink
 {
     function Cached_WikiLinkIfKnown ($moniker) {
-	$this->_page = $moniker;
+    $this->_page = $moniker;
     }
 
     function expand($basepage, &$markup) {
-	global $WikiTheme;
-	if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
-	    if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
-		return HTML($label ? $label : $page->getName());
-	}
+    global $WikiTheme;
+    if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+        if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+        return HTML($label ? $label : $page->getName());
+    }
         return WikiLink($this->_page, 'if_known');
     }
-}  
+}
 
 class Cached_SpellCheck extends Cached_WikiLink
 {
     function Cached_SpellCheck ($word, $suggs) {
-	$this->_page = $word;
-	$this->suggestions = $suggs;
+    $this->_page = $word;
+    $this->suggestions = $suggs;
     }
 
     function expand($basepage, &$markup) {
         $link = HTML::a(array('class' => 'spell-wrong',
-			      'title' => 'SpellCheck: '.join(', ', $this->suggestions),
-			      'name' => $this->_page),
-			$this->_page);
+                  'title' => 'SpellCheck: '.join(', ', $this->suggestions),
+                  'name' => $this->_page),
+            $this->_page);
         return $link;
     }
-}  
-  
+}
+
 class Cached_PhpwikiURL extends Cached_DynamicContent
 {
     function Cached_PhpwikiURL ($url, $label) {
-	$this->_url = $url;
+    $this->_url = $url;
         if ($label)
             $this->_label = $label;
     }
 
     function isInlineElement() {
-	return true;
+    return true;
     }
 
     function expand($basepage, &$markup) {
-	global $WikiTheme;
+    global $WikiTheme;
         $label = isset($this->_label) ? $this->_label : false;
-	if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
-	    if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
-		return HTML($label ? $label : $page->getName());
-	}
+    if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+        if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+        return HTML($label ? $label : $page->getName());
+    }
         return LinkPhpwikiURL($this->_url, $label, $basepage);
     }
 
@@ -479,7 +479,7 @@
             return $this->_label;
         return $this->_url;
     }
-}  
+}
 
 /*
  * Relations (::) are named links to pages.
@@ -494,21 +494,21 @@
 class Cached_SemanticLink extends Cached_WikiLink {
 
     function Cached_SemanticLink ($url, $label=false) {
-	$this->_url = $url;
+    $this->_url = $url;
         if ($label && $label != $url)
             $this->_label = $label;
         $this->_expandurl($this->_url);
     }
 
     function isInlineElement() {
-	return true;
+    return true;
     }
 
     function getPagename($basepage) {
-	if (!isset($this->_page)) return false;
-	$page = new WikiPageName($this->_page, $basepage);
-	if ($page->isValid()) return $page->name;
-	else return false;
+    if (!isset($this->_page)) return false;
+    $page = new WikiPageName($this->_page, $basepage);
+    if ($page->isValid()) return $page->name;
+    else return false;
     }
 
     /* Add relation to the link table.
@@ -516,14 +516,14 @@
      */
     function getWikiPageLinks($basepage) {
         if ($basepage == '') return false;
-	if (!isset($this->_page) and isset($this->_attribute)) {
+    if (!isset($this->_page) and isset($this->_attribute)) {
             // An attribute: we store it in the basepage now, to fill the cache for page->save
             // TODO: side-effect free query
             $page = $GLOBALS['request']->getPage($basepage);
             $page->setAttribute($this->_relation, $this->_attribute);
             $this->_page = $basepage;
             return array(array('linkto' => '', 'relation' => $this->_relation));
-	}
+    }
         if ($link = $this->getPagename($basepage))
             return array(array('linkto' => $link, 'relation' => $this->_relation));
         else
@@ -535,67 +535,67 @@
         if (!preg_match('/^ ([^:]+) (:[:=]) (.+) $/x', $url, $m)) {
             return HTML::span(array('class' => 'error'), _("BAD semantic relation link"));
         }
-	$this->_relation = urldecode($m[1]);
+    $this->_relation = urldecode($m[1]);
         $is_attribute = ($m[2] == ':=');
         if ($is_attribute) {
             $this->_attribute = urldecode($m[3]);
-	    // since this stored in the markup cache, we are extra sensible
-	    // not to store false empty stuff.
-	    $units = new Units();
+        // since this stored in the markup cache, we are extra sensible
+        // not to store false empty stuff.
+        $units = new Units();
             if (!DISABLE_UNITS and !$units->errcode)
-	    {
-		$this->_attribute_base = $units->Definition($this->_attribute);
-		$this->_unit = $units->baseunit($this->_attribute);
-	    }
+        {
+        $this->_attribute_base = $units->Definition($this->_attribute);
+        $this->_unit = $units->baseunit($this->_attribute);
+        }
         } else {
-	    $this->_page = urldecode($m[3]);
+        $this->_page = urldecode($m[3]);
         }
-	return $m;
+    return $m;
     }
 
     function _expand($url, $label = false) {
-	global $WikiTheme;
-	$m = $this->_expandurl($url);
+    global $WikiTheme;
+    $m = $this->_expandurl($url);
         $class = 'wiki';
         // do not link to the attribute value, but to the attribute
         $is_attribute = ($m[2] == ':=');
-	if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
-	    if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS))
-		return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page));
-	}
-	if ($is_attribute)
-	    $title = isset($this->_attribute_base)
-		? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base)
-		: sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute);
+    if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+        if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS))
+        return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page));
+    }
+    if ($is_attribute)
+        $title = isset($this->_attribute_base)
+        ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base)
+        : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute);
         if ($label) {
             return HTML::span
-		(
-		 HTML::a(array('href'  => WikiURL($is_attribute ? $this->_relation : $this->_page),
-			       'class' => "wiki ".($is_attribute ? "attribute" : "relation"),
-			       'title' => $is_attribute
-			       ? $title
-			       : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)),
-			 $label)
-		 );
+        (
+         HTML::a(array('href'  => WikiURL($is_attribute ? $this->_relation : $this->_page),
+                   'class' => "wiki ".($is_attribute ? "attribute" : "relation"),
+                   'title' => $is_attribute
+                   ? $title
+                   : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)),
+             $label)
+         );
         } elseif ($is_attribute) {
             return HTML::span
-		(
-		 HTML::a(array('href'  => WikiURL($this->_relation),
-			       'class' => "wiki attribute",
-			       'title' => $title),
-			 $url)
-		 );
+        (
+         HTML::a(array('href'  => WikiURL($this->_relation),
+                   'class' => "wiki attribute",
+                   'title' => $title),
+             $url)
+         );
         } else {
             return HTML::span
-		(
-		 HTML::a(array('href'  => WikiURL($this->_relation),
-			       'class' => "wiki relation"),
-			 $this->_relation),
-		 HTML::span(array('class'=>'relation-symbol'), $m[2]),
-		 HTML::a(array('href'  => WikiURL($this->_page),
-			       'class' => "wiki"),
-			 $this->_page)
-		 );
+        (
+         HTML::a(array('href'  => WikiURL($this->_relation),
+                   'class' => "wiki relation"),
+             $this->_relation),
+         HTML::span(array('class'=>'relation-symbol'), $m[2]),
+         HTML::a(array('href'  => WikiURL($this->_page),
+                   'class' => "wiki"),
+             $this->_page)
+         );
         }
     }
 
@@ -623,8 +623,8 @@
 class Cached_SearchHighlight extends Cached_DynamicContent
 {
     function Cached_SearchHighlight ($word, $engine) {
-	$this->_word = $word;
-	$this->engine = $engine;
+    $this->_word = $word;
+    $this->engine = $engine;
     }
 
     function expand($basepage, &$markup) {
@@ -632,12 +632,12 @@
                                 'title' => _("Found by ") . $this->engine),
                           $this->_word);
     }
-}  
-  
+}
+
 class Cached_ExternalLink extends Cached_Link {
 
     function Cached_ExternalLink($url, $label=false) {
-	$this->_url = $url;
+    $this->_url = $url;
         if ($label && $label != $url)
             $this->_label = $label;
     }
@@ -645,17 +645,17 @@
     function _getType() {
         return 'external';
     }
-  
+
     function _getName($basepage) {
-	$label = isset($this->_label) ? $this->_label : false;
-	return ($label and is_string($label)) ? $label : $this->_url;
+    $label = isset($this->_label) ? $this->_label : false;
+    return ($label and is_string($label)) ? $label : $this->_url;
     }
 
     function expand($basepage, &$markup) {
         global $request;
 
-	$label = isset($this->_label) ? $this->_label : false;
-	$link = LinkURL($this->_url, $label);
+    $label = isset($this->_label) ? $this->_label : false;
+    $link = LinkURL($this->_url, $label);
 
         if (GOOGLE_LINKS_NOFOLLOW) {
             // Ignores nofollow when the user who saved the page was authenticated.
@@ -675,26 +675,26 @@
 }
 
 class Cached_InterwikiLink extends Cached_ExternalLink {
-  
+
     function Cached_InterwikiLink($link, $label=false) {
-	$this->_link = $link;
+    $this->_link = $link;
         if ($label)
             $this->_label = $label;
     }
 
     function getPagename($basepage) {
         list ($moniker, $page) = explode (":", $this->_link, 2);
-	$page = new WikiPageName($page, $basepage);
-	if ($page->isValid()) return $page->name;
-	else return false;
+    $page = new WikiPageName($page, $basepage);
+    if ($page->isValid()) return $page->name;
+    else return false;
     }
 
     function getWikiPageLinks($basepage) {
         if ($basepage == '') return false;
-	/* ":DontStoreLink" */
-	if (substr($this->_link,0,1) == ':') return false;
-	/* store only links to valid pagenames */
-	$dbi = $GLOBALS['request']->getDbh();
+    /* ":DontStoreLink" */
+    if (substr($this->_link,0,1) == ':') return false;
+    /* store only links to valid pagenames */
+    $dbi = $GLOBALS['request']->getDbh();
         if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) {
             return array(array('linkto' => $link));
         } else {
@@ -703,31 +703,31 @@
     }
 
     function _getName($basepage) {
-	$label = isset($this->_label) ? $this->_label : false;
-	return ($label and is_string($label)) ? $label : $this->_link;
+    $label = isset($this->_label) ? $this->_label : false;
+    return ($label and is_string($label)) ? $label : $this->_link;
     }
-  
+
     /* there may be internal interwiki links also */
     function _getType() {
         return $this->getPagename(false) ? 'internal' : 'external';
     }
 
     function _getURL($basepage) {
-	$link = $this->expand($basepage, $this);
-	return $link->getAttr('href');
+    $link = $this->expand($basepage, $this);
+    return $link->getAttr('href');
     }
 
     function expand($basepage, &$markup) {
-	global $WikiTheme;
-	$intermap = getInterwikiMap();
-	$label = isset($this->_label) ? $this->_label : false;
-	//FIXME: check Upload: inlined images
-	if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
-	    if (!in_array($this->_link, $WikiTheme->VALID_LINKS))
-		return HTML($label ? $label : $this->_link);
-	}
-	return $intermap->link($this->_link, $label);
+    global $WikiTheme;
+    $intermap = getInterwikiMap();
+    $label = isset($this->_label) ? $this->_label : false;
+    //FIXME: check Upload: inlined images
+    if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
+        if (!in_array($this->_link, $WikiTheme->VALID_LINKS))
+        return HTML($label ? $label : $this->_link);
     }
+    return $intermap->link($this->_link, $label);
+    }
 
     function asString() {
         if (isset($this->_label))
@@ -742,9 +742,9 @@
 class Cached_UserLink extends Cached_WikiLink {
     function expand($basepage, &$markup) {
         $label = isset($this->_label) ? $this->_label : false;
-	$anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+    $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
         $page = new WikiPageName($this->_page, $basepage, $anchor);
-	$link = WikiLink($page, 'auto', $label);
+    $link = WikiLink($page, 'auto', $label);
         // $link = HTML::a(array('href' => $PageName));
         $link->setContent(PossiblyGlueIconToText('wikiuser', $this->_page));
         $link->setAttr('class', 'wikiuser');
@@ -760,8 +760,8 @@
 class Cached_PluginInvocation extends Cached_DynamicContent {
 
     function Cached_PluginInvocation ($pi) {
-	$this->_pi = $pi;
-	$loader = $this->_getLoader();
+    $this->_pi = $pi;
+    $loader = $this->_getLoader();
         if (is_array($plugin_cmdline = $loader->parsePI($pi)) and $plugin_cmdline[1]) {
             $this->pi_name = $plugin_cmdline[0]; // plugin, plugin-form, plugin-list
             $this->name = $plugin_cmdline[1]->getName();
@@ -771,9 +771,9 @@
 
     function setTightness($top, $bottom) {
     }
-  
+
     function isInlineElement() {
-	return false;
+    return false;
     }
 
     function expand($basepage, &$markup) {
@@ -795,9 +795,9 @@
     function & _getLoader() {
         static $loader = false;
 
-	if (!$loader) {
+    if (!$loader) {
             include_once('lib/WikiPlugin.php');
-	    $loader = new WikiPluginLoader;
+        $loader = new WikiPluginLoader;
         }
         return $loader;
     }
@@ -809,5 +809,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/Captcha.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/Captcha.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/Captcha.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: Captcha.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: Captcha.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Session Captcha v1.0
  *   by Gavin M. Roy <gmr at bteg.net>
@@ -11,14 +11,14 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This File is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with This File; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -35,20 +35,20 @@
 
     function captchaword() {
         if ( ! $this->request->getSessionVar('captchaword')) {
-	    $this->request->setSessionVar('captchaword', $this->get_word());
-	}
+        $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;
     }
@@ -70,9 +70,9 @@
         return $el;
     }
 
-    function get_word () { 
+    function get_word () {
         if (USE_CAPTCHA_RANDOM_WORD)
-            return get_dictionary_word(); 
+            return get_dictionary_word();
         else
             return rand_ascii_readable($this->length); // lib/stdlib.php
     }
@@ -99,10 +99,10 @@
     // 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;  
+        $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;
@@ -121,7 +121,7 @@
     function image ( $word ) {
         $width  =& $this->width;
         $height =& $this->height;
-    
+
         // Create the Image
         $jpg = ImageCreate($width,$height);
         $bg  = ImageColorAllocate($jpg,255,255,255);
@@ -134,7 +134,7 @@
 
         $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);
@@ -145,8 +145,8 @@
             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")), 
+            imagettftext($jpg, $size, $angle, $x, $y, $tx,
+                         realpath(findfile("lib/captcha/Vera.ttf")),
                          $word[$i]);
         }
 
@@ -159,19 +159,19 @@
         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);
-	}
+    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);
     }
+    }
 
 }
 
@@ -181,5 +181,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/ADODB.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/ADODB.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/ADODB.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: ADODB.php 7641 2010-08-11 13:00:46Z vargenau $');
+<?php // $Id: ADODB.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005 $ThePhpWikiProgrammingTeam
  *
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/PDO.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/PDO.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/PDO.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: PDO.php 7417 2010-05-19 12:57:42Z vargenau $');
+<?php // $Id: PDO.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /** 
  * Db sessions for PDO, based on pear DB Sessions.

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/SQL.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/SQL.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/SQL.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: SQL.php 7417 2010-05-19 12:57:42Z vargenau $');
+<?php // $Id: SQL.php 8043 2011-04-13 13:10:09Z vargenau $
 
 /**
  * DB sessions for pear DB
@@ -107,8 +107,7 @@
             //if (preg_match('|^[a-zA-Z0-9/+=]+$|', $res))
             $res = base64_decode($res);
         if (strlen($res) > 4000) {
-            trigger_error("Overlarge session data! ".strlen($res).
-                        " gt. 4000", E_USER_WARNING);
+            // trigger_error("Overlarge session data! ".strlen($res). " gt. 4000", E_USER_WARNING);
             $res = preg_replace('/s:6:"_cache";O:12:"WikiDB_cache".+}$/',"",$res);
             $res = preg_replace('/s:12:"_cached_html";s:.+",s:4:"hits"/','s:4:"hits"',$res);
             if (strlen($res) > 4000) $res = '';

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/dba.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/dba.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession/dba.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: dba.php 7417 2010-05-19 12:57:42Z vargenau $');
+<?php // $Id: dba.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /** DBA Sessions
  *  session:

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/DbSession.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: DbSession.php 7449 2010-05-31 12:38:21Z vargenau $');
+<?php // $Id: DbSession.php 7964 2011-03-05 17:05:30Z vargenau $
 
 /**
  * Store sessions data in Pear DB / ADODB / dba / PDO, ....
@@ -29,7 +29,7 @@
         $db_type = $dbh->getParam('dbtype');
         if (isa($dbh, 'WikiDB')) {
             @include_once("lib/DbSession/".$db_type.".php");
-            
+
             $class = "DbSession_".$db_type;
             if (class_exists($class)) {
                 // dba has no ->_dbh, so this is used for the session link
@@ -43,7 +43,7 @@
                              $db_type), E_USER_WARNING);
         return false;
     }
-    
+
     function currentSessions() {
         return $this->_backend->currentSessions();
     }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/DbaDatabase.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/DbaDatabase.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/DbaDatabase.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: DbaDatabase.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: DbaDatabase.php 8034 2011-04-11 09:22:33Z vargenau $
 
 require_once('lib/ErrorManager.php');
 
@@ -14,14 +14,12 @@
         $this->_handler = $handler;
         $this->_timeout = DBA_DATABASE_DEFAULT_TIMEOUT;
         $this->_dbh = false;
-        if (function_exists("dba_handlers")) { // since php-4.3.0
-            if (!in_array($handler, dba_handlers()))
-                $this->_error(
-                    sprintf(
-                	    _("The DBA handler %s is unsupported!")."\n".
-                    	    _("Supported handlers are: %s"),
-                    	    $handler, join(",",dba_handlers())));
-        }
+        if (!in_array($handler, dba_handlers()))
+            $this->_error(
+                sprintf(
+                    _("The DBA handler %s is unsupported!")."\n".
+                        _("Supported handlers are: %s"),
+                         $handler, join(",",dba_handlers())));
         $this->readonly = false;
         if ($mode)
             $this->open($mode);
@@ -30,11 +28,11 @@
     function set_timeout($timeout) {
         $this->_timeout = $timeout;
     }
-  
+
     function open($mode = 'w') {
         if ($this->_dbh)
             return;             // already open.
-      
+
         $watchdog = $this->_timeout;
 
         global $ErrorManager;
@@ -53,9 +51,9 @@
         if ((strlen($mode) == 1)) {
             // PHP 4.3.x Windows lock bug workaround: http://bugs.php.net/bug.php?id=23975
             if (isWindows()) {
-                $mode .= "-"; 			// suppress locking, or
-            } elseif ($this->_handler != 'gdbm') { 	// gdbm does it internally
-            	$mode .= "d"; 			// else use internal locking
+                $mode .= "-";             // suppress locking, or
+            } elseif ($this->_handler != 'gdbm') {     // gdbm does it internally
+                $mode .= "d";             // else use internal locking
             }
         }
         while (($dbh = dba_open($this->_file, $mode, $this->_handler)) < 1) {
@@ -96,7 +94,7 @@
                 $this->readonly = true;
                 if (!file_exists($this->_file)) {
                     $ErrorManager->handleError($error);
-	            flush();
+                flush();
                 }
             }
             else {
@@ -116,7 +114,7 @@
     function exists($key) {
         return dba_exists($key, $this->_dbh);
     }
-  
+
     function fetch($key) {
         $val = dba_fetch($key, $this->_dbh);
         if ($val === false)
@@ -134,7 +132,7 @@
             return $this->_error("replace($key)");
     }
 
-  
+
     function firstkey() {
         return dba_firstkey($this->_dbh);
     }
@@ -182,7 +180,7 @@
             return $this->_error("optimize()");
         return 1;
     }
-  
+
     function _error($mes) {
         //trigger_error("DbaDatabase: $mes", E_USER_WARNING);
         //return false;
@@ -207,5 +205,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/DbaListSet.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/DbaListSet.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/DbaListSet.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: DbaListSet.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: DbaListSet.php 7964 2011-03-05 17:05:30Z vargenau $
 
 class DbaListSet
 {
@@ -52,7 +52,7 @@
         list( $prev , , ) = explode(':', $this->_dbh->fetch(intval($i)), 3);
         return intval($prev);
     }
-  
+
     function exists($i) {
         $i = intval($i);
         return $i && $this->_dbh->exists($i);
@@ -68,7 +68,7 @@
         list($prev, $next,) = explode(':', $dbh->fetch(intval($i)), 3);
         $dbh->replace($i, "$prev:$next:$data");
     }
-  
+
     function insert_before($i, $data) {
         assert(intval($i));
         return $this->_insert_before_nc($i, $data);
@@ -78,7 +78,7 @@
         assert(intval($i));
         return $this->_insert_after_nc($i, $data);
     }
-  
+
     function append($seq, $data) {
         $key = "s" . urlencode($seq);
         $this->_insert_before_nc($key, $data);
@@ -88,7 +88,7 @@
         $key = "s" . urlencode($seq);
         $this->_insert_after_nc($key, $data);
     }
-  
+
     function _insert_before_nc($i, &$data) {
         $newkey = $this->_new_key();
         $old_prev = $this->_setprev($i, $newkey);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/DbaPartition.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/DbaPartition.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/DbaPartition.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: DbaPartition.php 7417 2010-05-19 12:57:42Z vargenau $');
+<?php // $Id: DbaPartition.php 7964 2011-03-05 17:05:30Z vargenau $
 
 class DbaPartition
 {
@@ -10,11 +10,11 @@
     function open($mode = 'w') {
         $this->_h->open();
     }
-    
+
     function close() {
         $this->_h->close();
     }
-            
+
     function firstkey() {
         $dbh = &$this->_h;
         $prefix = &$this->_p;
@@ -40,7 +40,7 @@
     function exists($key) {
         return $this->_h->exists($this->_p . $key);
     }
-    
+
     function fetch($key) {
         return $this->_h->fetch($this->_p . $key);
     }
@@ -60,7 +60,7 @@
     function get($key) {
         return $this->_h->get($this->_p . $key);
     }
-    
+
     function set($key, $val) {
         return $this->_h->set($this->_p . $key, $val);
     }
@@ -82,4 +82,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/EditToolbar.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/EditToolbar.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/EditToolbar.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: EditToolbar.php 7696 2010-09-20 10:20:25Z rurban $');
+// $Id: EditToolbar.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright 2004-2010 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -24,7 +24,7 @@
  * EDIT Toolbar Initialization.
  * The default/themes/toolbar.js is from Mediawiki, this PHP is written from scratch.
  *
- * Features: 
+ * Features:
  * - save-preview and formatting buttons from mediawiki
  * - Search&Replace from walterzorn.de
  * - pageinsert popup by Reini Urban (TODO: should be a pulldown, use acdropdown)
@@ -40,10 +40,10 @@
         //FIXME: enable Undo button for all other buttons also, not only the search/replace button
         if (JS_SEARCHREPLACE) {
             $this->tokens['JS_SEARCHREPLACE'] = 1;
-            $undo_btn = $WikiTheme->getImageURL("ed_undo.png"); 
-            $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png"); 
+            $undo_btn = $WikiTheme->getImageURL("ed_undo.png");
+            $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
             // JS_SEARCHREPLACE from walterzorn.de
-	    $js = Javascript("
+        $js = Javascript("
 uri_undo_btn   = '".$undo_btn."'
 msg_undo_alt   = '"._("Undo")."'
 uri_undo_d_btn = '".$undo_d_btn."'
@@ -58,25 +58,25 @@
 msg_repl_close     = '"._("Close")."'
 ");
             if (empty($WikiTheme->_headers_printed)) {
-		$WikiTheme->addMoreHeaders($js);
-		$WikiTheme->addMoreAttr('body', "SearchReplace"," onload='define_f()'");
-	    } else { // from an actionpage: WikiBlog, AddComment, WikiForum
-		printXML($js);
-	    }
+        $WikiTheme->addMoreHeaders($js);
+        $WikiTheme->addMoreAttr('body', "SearchReplace"," onload='define_f()'");
+        } else { // from an actionpage: WikiBlog, AddComment, WikiForum
+        printXML($js);
+        }
         } else {
             $WikiTheme->addMoreAttr('body', "editfocus", "document.getElementById('edit-content]').editarea.focus()");
         }
-    
+
         if (ENABLE_EDIT_TOOLBAR) {
             $js = JavaScript('',array('src' => $WikiTheme->_findData("toolbar.js")));
             if (empty($WikiTheme->_headers_printed)) {
                 $WikiTheme->addMoreHeaders($js);
             }
-	    else { // from an actionpage: WikiBlog, AddComment, WikiForum
+        else { // from an actionpage: WikiBlog, AddComment, WikiForum
                 printXML($js);
                 printXML(JavaScript('define_f()'));
-	    }
         }
+        }
 
         require_once("lib/WikiPluginCached.php");
         $cache = WikiPluginCached::newCache();
@@ -98,7 +98,7 @@
         } else {
             $content = $this->_generate();
             // regenerate buttons every 1 hr/6 hrs
-            $cache->save($id, $content, DEBUG ? '+3600' : '+21600', 'toolbarcache'); 
+            $cache->save($id, $content, DEBUG ? '+3600' : '+21600', 'toolbarcache');
             $this->tokens['EDIT_TOOLBAR'] =& $content;
         }
     }
@@ -117,7 +117,7 @@
             if (FUSIONFORGE or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
                 $username = '[['.$username.']]';
             }
-	    $signature = " ––".$username." ".CTime();
+        $signature = " ––".$username." ".CTime();
             $toolarray = array(
                            array(
                                  "image"=>"ed_format_bold.png",
@@ -201,20 +201,20 @@
                                  "sample"=>_("Template Name"),
                                  "title"=>_("Template"))
                            );
-            $btn = new SubmitImageButton(_("Save"), "edit[save]", 'toolbar', 
+            $btn = new SubmitImageButton(_("Save"), "edit[save]", 'toolbar',
                                          $WikiTheme->getImageURL("ed_save.png"));
             $btn->addTooltip(_("Save"));
-	    $btn->setAccesskey("s");
+        $btn->setAccesskey("s");
             $toolbar .= ('document.writeln("'.addslashes($btn->asXml()).'");'."\n");
-	    // preview not supported yet on Wikiblog
+        // preview not supported yet on Wikiblog
             if (empty($WikiTheme->_headers_printed)) {
-		$btn = new SubmitImageButton(_("Preview"), "edit[preview]", 'toolbar', 
-					     $WikiTheme->getImageURL("ed_preview.png"));
-		$btn->addTooltip(_("Preview"));
-		$btn->setAccesskey("p");
-		$toolbar .= ('document.writeln("'.addslashes($btn->asXml()).'");'."\n");
-	    }
-    
+        $btn = new SubmitImageButton(_("Preview"), "edit[preview]", 'toolbar',
+                         $WikiTheme->getImageURL("ed_preview.png"));
+        $btn->addTooltip(_("Preview"));
+        $btn->setAccesskey("p");
+        $toolbar .= ('document.writeln("'.addslashes($btn->asXml()).'");'."\n");
+        }
+
             foreach ($toolarray as $tool) {
                 $image = $WikiTheme->getImageURL($tool["image"]);
                 $open  = $tool["open"];
@@ -230,14 +230,14 @@
             }
             /* Fails with Chrome */
             if (!isBrowserSafari()) {
-                $toolbar .= ("addInfobox('" 
-                             . addslashes( _("Click a button to get an example text") ) 
+                $toolbar .= ("addInfobox('"
+                             . addslashes( _("Click a button to get an example text") )
                              . "');\n");
             }
         }
 
         if (JS_SEARCHREPLACE) {
-            $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png"); 
+            $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
             //$redo_btn = $WikiTheme->getImageURL("ed_redo.png");
             $sr_btn   = $WikiTheme->getImageURL("ed_replace.png");
             //TODO: generalize the UNDO button and fix it for Search & Replace
@@ -260,8 +260,8 @@
             $sr_html = '';
         }
 
-        //TODO: Delegate this to run-time with showing an hidden input at the right, and do 
-	// a seperate moacdropdown and xmlrpc:titleSearch.
+        //TODO: Delegate this to run-time with showing an hidden input at the right, and do
+    // a seperate moacdropdown and xmlrpc:titleSearch.
 
         // Button to generate categories, display in extra window as popup and insert
         $sr_html = HTML($sr_html, $this->categoriesPulldown());
@@ -300,19 +300,19 @@
         if ($pages) {
             $categories = array();
             while ($p = $pages->next()) {
-		$page = $p->getName();
+        $page = $p->getName();
                 if (FUSIONFORGE) {
                     $categories[] = "['$page', '%0A----%0A%5B%5B".$page."%5D%5D']";
-		} else if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
-		    $categories[] = "['$page', '%0A%5B".$page."%5D']";
-		} else {
-		    $categories[] = "['$page', '%0A".$page."']";
+        } else if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
+            $categories[] = "['$page', '%0A%5B".$page."%5D']";
+        } else {
+            $categories[] = "['$page', '%0A".$page."']";
                 }
             }
             if (!$categories) return '';
-	    // Ensure this to be inserted at the very end. Hence we added the id to the function.
+        // Ensure this to be inserted at the very end. Hence we added the id to the function.
             $more_buttons = HTML::img(array('class'=> "toolbar",
-					    'id' => 'tb-categories',
+                        'id' => 'tb-categories',
                                             'src'  => $WikiTheme->getImageURL("ed_category.png"),
                                             'title'=>_("AddCategory"),
                                             'alt'=>"AddCategory", // to detect this at js
@@ -362,7 +362,7 @@
             }
             $plugin_js = substr($plugin_js, 1);
             $more_buttons = HTML::img(array('class'=>"toolbar",
-					    'id' => 'tb-plugins',
+                        'id' => 'tb-plugins',
                                             'src'  => $WikiTheme->getImageURL("ed_plugins.png"),
                                             'title'=>_("AddPlugin"),
                                             'alt'=>_("AddPlugin"),
@@ -385,14 +385,14 @@
             global $WikiTheme;
             $pages = array();
             while ($p = $page_iter->next()) {
-		$page = $p->getName();
-		if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page)))
-		    $pages[] = "['$page', '%5B".$page."%5D']";
-		else
-		    $pages[] = "['$page', '$page']";
+        $page = $p->getName();
+        if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page)))
+            $pages[] = "['$page', '%5B".$page."%5D']";
+        else
+            $pages[] = "['$page', '$page']";
             }
             return HTML("\n", HTML::img(array('class'=>"toolbar",
-					      'id' => 'tb-pages',
+                          'id' => 'tb-pages',
                                               'src'  => $WikiTheme->getImageURL("ed_pages.png"),
                                               'title'=>_("AddPageLink"),
                                               'alt'=>_("AddPageLink"),
@@ -430,7 +430,7 @@
             }
             $image_js = substr($image_js, 1);
             $more_buttons = HTML::img(array('class'=>"toolbar",
-					    'id' => 'tb-images',
+                        'id' => 'tb-images',
                                             'src'  => $WikiTheme->getImageURL("ed_image.png"),
                                             'title'=>_("Add Image or Video"),
                                             'alt'=>_("Add Image or Video"),
@@ -465,7 +465,7 @@
             if (!empty($pages_js))
                 return HTML("\n", HTML::img
                             (array('class'=>"toolbar",
-				   'id' => 'tb-templates',
+                   'id' => 'tb-templates',
                                    'src'  => $WikiTheme->getImageURL("ed_template.png"),
                                    'title'=>_("AddTemplate"),
                                    'alt'=>_("AddTemplate"),

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/ErrorManager.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/ErrorManager.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/ErrorManager.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: ErrorManager.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: ErrorManager.php 8031 2011-04-11 08:36:32Z vargenau $
 
 if (isset($GLOBALS['ErrorManager'])) return;
 
@@ -14,7 +14,7 @@
 */
 define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048 & ((check_php_version(5,3)) ? ~E_DEPRECATED : ~0));
 define ('EM_WARNING_ERRORS',
-	E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | ((check_php_version(5,3)) ? E_DEPRECATED : 0));
+    E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | ((check_php_version(5,3)) ? E_DEPRECATED : 0));
 define ('EM_NOTICE_ERRORS', E_NOTICE | E_USER_NOTICE);
 
 /* It is recommended to leave assertions on.
@@ -55,7 +55,7 @@
         $this->_postpone_mask = 0;
         $this->_postponed_errors = array();
 
-        set_error_handler('ErrorManager_errorHandler');
+        // set_error_handler('ErrorManager_errorHandler');
     }
 
     /**
@@ -97,14 +97,14 @@
         else
             echo $this->_flush_errors();
     }
-  
+
     /**
      * Get rid of all pending error messages in case of all non-html
      * - pdf or image - output.
      * @access public
      */
     function destroyPostponedErrors () {
-    	$this->_postponed_errors = array();
+        $this->_postponed_errors = array();
     }
 
     /**
@@ -130,13 +130,13 @@
         if ($worst_err->isNotice())
             return $flushed;
         $class = $worst_err->getHtmlClass();
-        $html = HTML::div(array('style' => 'border: none', 'class' => $class),
-                          HTML::h4(array('class' => 'errors'),
+        $html = HTML::div(array('class' => $class),
+                          HTML::div(array('class' => 'errors'),
                                    "PHP " . $worst_err->getDescription()));
         $html->pushContent($flushed);
         return $html;
     }
-  
+
     /**
      * Push a custom error handler on the handler stack.
      *
@@ -227,8 +227,8 @@
         // so display now all errors directly.
         if (!empty($GLOBALS['request']->_finishing)) {
             $this->_postpone_mask = 0;
-	}
-      
+    }
+
         $in_handler = true;
 
         foreach ($this->_handlers as $handler) {
@@ -262,7 +262,7 @@
             $this->_noCacheHeaders();
             echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
             echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n";
-	    echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+        echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
             echo "<html>\n";
             echo "<head>\n";
             echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n";
@@ -274,10 +274,9 @@
 
             if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
                 echo "error_reporting=",error_reporting(),"\n<br />";
-                if (function_exists("debug_backtrace")) // >= 4.3.0
-                    $error->printSimpleTrace(debug_backtrace());
+                $error->printSimpleTrace(debug_backtrace());
             }
-	    $this->_die($error);
+        $this->_die($error);
         }
         else if (($error->errno & error_reporting()) != 0) {
             if  (($error->errno & $this->_postpone_mask) != 0) {
@@ -299,8 +298,7 @@
                 $this->_noCacheHeaders();
                 if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
                     echo "error_reporting=",error_reporting(),"\n";
-                    if (function_exists("debug_backtrace")) // >= 4.3.0
-                        $error->printSimpleTrace(debug_backtrace());
+                    $error->printSimpleTrace(debug_backtrace());
                 }
                 $error->printXML();
             }
@@ -311,7 +309,7 @@
     function warning($msg, $errno = E_USER_NOTICE) {
         $this->handleError(new PhpWikiError($errno, $msg, '?', '?'));
     }
-  
+
     /**
      * @access private
      */
@@ -322,8 +320,8 @@
         PrintXML($this->_flush_errors());
         if ($this->_fatal_handler)
             $this->_fatal_handler->call($error);
-	if (!$WikiTheme->DUMP_MODE)
-	    exit -1;
+    if (!$WikiTheme->DUMP_MODE)
+        exit -1;
     }
 
     /**
@@ -355,7 +353,7 @@
             $request->_validators->_mtime = false;
         }
         if ($already) return;
-      
+
         // FIXME: Howto announce that to Request->cacheControl()?
         if (!headers_sent()) {
             header( "Cache-control: no-cache" );
@@ -461,7 +459,7 @@
             return 'errors';
         }
     }
-  
+
     function getDescription() {
         if ($this->isNotice()) {
             return 'Notice';
@@ -502,7 +500,7 @@
                          $this->getDescription(),
                          array_shift($lines));
         }
-      
+
         $html = HTML::div(array('class' => $this->getHtmlClass()), HTML::p($msg));
         // The class is now used for the div container.
         // $html = HTML::div(HTML::p($msg));
@@ -512,7 +510,7 @@
                 $list->pushContent(HTML::li($line));
             $html->pushContent($list);
         }
-      
+
         return $html;
     }
 
@@ -606,10 +604,10 @@
         }
         return $this->_count;
     }
-  
+
     function _getDetail($count=0) {
-    	if (!$count) $count = $this->_count;
-	$dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : substr(dirname(__FILE__),0,-4);
+        if (!$count) $count = $this->_count;
+    $dir = defined('PHPWIKI_DIR') ? PHPWIKI_DIR : substr(dirname(__FILE__),0,-4);
         if (substr(PHP_OS,0,3) == 'WIN') {
            $dir = str_replace('/','\\',$dir);
            $this->errfile = str_replace('/','\\',$this->errfile);
@@ -618,24 +616,24 @@
            $dir .= '/';
         $errfile = preg_replace('|^' . preg_quote($dir) . '|', '', $this->errfile);
         if (is_string($this->errstr))
-	        $lines = explode("\n", $this->errstr);
-	elseif (is_object($this->errstr))
-	        $lines = array($this->errstr->asXML());
+            $lines = explode("\n", $this->errstr);
+    elseif (is_object($this->errstr))
+            $lines = array($this->errstr->asXML());
         $errtype = (DEBUG & _DEBUG_VERBOSE) ? sprintf("%s[%d]", $this->getDescription(), $this->errno)
                                             : sprintf("%s", $this->getDescription());
         if ((DEBUG & _DEBUG_VERBOSE) or $this->isFatal()) {
-	    $msg = sprintf("%s:%d %s: %s %s",
+        $msg = sprintf("%s:%d %s: %s %s",
                        $errfile, $this->errline,
                        $errtype,
                        array_shift($lines),
                        $count > 1 ? sprintf(" (...repeated %d times)",$count) : ""
                        );
-	} else {
+    } else {
           $msg = sprintf("%s: \"%s\" %s",
-			 $errtype,
-			 array_shift($lines),
-			 $count > 1 ? sprintf(" (...repeated %d times)",$count) : "");
-	}
+             $errtype,
+             array_shift($lines),
+             $count > 1 ? sprintf(" (...repeated %d times)",$count) : "");
+    }
         $html = HTML::div(array('class' => $this->getHtmlClass()),
                           HTML::p($msg));
         if ($lines) {
@@ -644,7 +642,7 @@
                 $list->pushContent(HTML::li($line));
             $html->pushContent($list);
         }
-      
+
         return $html;
     }
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/ExternalReferrer.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/ExternalReferrer.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/ExternalReferrer.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: ExternalReferrer.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ExternalReferrer.php 7964 2011-03-05 17:05:30Z vargenau $
 
 /**
  * Detect external referrers
@@ -11,8 +11,8 @@
 if (!function_exists('isExternalReferrer')) { // also defined in stdlib.php
   function isExternalReferrer(&$request) {
     if ($referrer = $request->get('HTTP_REFERER')) {
-    	$home = SCRIPT_NAME; // was SERVER_URL, check sister wiki's: same host but other other script url
-    	if (substr(strtolower($referrer),0,strlen($home)) == strtolower($home)) return false;
+        $home = SCRIPT_NAME; // was SERVER_URL, check sister wiki's: same host but other other script url
+        if (substr(strtolower($referrer),0,strlen($home)) == strtolower($home)) return false;
         require_once("lib/ExternalReferrer.php");
         $se = new SearchEngines();
         return $se->parseSearchQuery($referrer);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/FileFinder.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/FileFinder.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/FileFinder.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,14 +1,14 @@
-<?php // rcs_id('$Id: FileFinder.php 7692 2010-09-17 11:32:55Z rurban $');
+<?php // $Id: FileFinder.php 7964 2011-03-05 17:05:30Z vargenau $
 
 require_once(dirname(__FILE__).'/stdlib.php');
 
 /**
  * A class for finding files.
- * 
- * This should really provided by pear. We don't want really to mess around 
+ *
+ * This should really provided by pear. We don't want really to mess around
  * with all the lousy systems. (WindowsNT, Win95, Mac, ...)
  * But pear has only System and File, which do nothing.
- * Anyway, in good PHP style we ignore the rest of the world and try to behave 
+ * Anyway, in good PHP style we ignore the rest of the world and try to behave
  * as on unix only. That means we use / as pathsep in all our constants.
  */
 class FileFinder
@@ -57,11 +57,11 @@
      * Force using '/' as path seperator.
      */
     function forcePathSlashes ($path, $sep='/') {
-    	if (is_array($path)) {
-    	    $result = array();
-    	    foreach ($path as $dir) { $result[] = $this->forcePathSlashes($dir,$sep); }
-    	    return $result;
-    	} else {
+        if (is_array($path)) {
+            $result = array();
+            foreach ($path as $dir) { $result[] = $this->forcePathSlashes($dir,$sep); }
+            return $result;
+        } else {
             if (isWindows() or $this->_isOtherPathsep()) {
                 if (isWindows()) $from = "\\";
                 else $from = "\\";
@@ -73,9 +73,9 @@
                         $path = '\\\\' . str_replace('\\\\','\\',substr($path,2));
                 }
                 return strtr($path, $from, $sep);
-            } else 
+            } else
                 return $path;
-    	}
+        }
     }
 
     /**
@@ -106,7 +106,7 @@
     }
 
     /**
-     * The system-dependent path-separator character. 
+     * The system-dependent path-separator character.
      * UNIX,WindowsNT,MacOSX: /
      * Windows95: \
      * Mac:       :
@@ -115,7 +115,7 @@
      * @return string path_separator.
      */
     function _get_syspath_separator () {
-    	if (!empty($this->_pathsep)) return $this->_pathsep;
+        if (!empty($this->_pathsep)) return $this->_pathsep;
         elseif (isWindowsNT()) return "/"; // we can safely use '/'
         elseif (isWindows()) return "\\";  // FAT might use '\'
         // VMS or LispM is really weird, we ignore it.
@@ -123,12 +123,12 @@
     }
 
     /**
-     * The path-separator character of the given path. 
+     * The path-separator character of the given path.
      * Windows accepts "/" also, but gets confused with mixed path_separators,
      * e.g "C:\Apache\phpwiki/locale/button"
-     * > dir "C:\Apache\phpwiki/locale/button" => 
+     * > dir "C:\Apache\phpwiki/locale/button" =>
      *       Parameterformat nicht korrekt - "locale"
-     * So if there's any '\' in the path, either fix them to '/' (not in Win95 or FAT?) 
+     * So if there's any '\' in the path, either fix them to '/' (not in Win95 or FAT?)
      * or use '\' for ours.
      *
      * @access private
@@ -148,13 +148,13 @@
      *
      * @access private
      * @param $path string Path.
-     * @return bool True if path is absolute. 
+     * @return bool True if path is absolute.
      */
     function _is_abs($path) {
         if (substr($path,0,1) == '/') {
             return true;
         } elseif (isWindows() and preg_match("/^[a-z]:/i", $path)
-                  and (substr($path,2,1) == "/" or substr($path,2,1) == "\\")) 
+                  and (substr($path,2,1) == "/" or substr($path,2,1) == "\\"))
         {
             return true;
         } else {
@@ -170,7 +170,7 @@
      * @return bool New path (destructive)
      */
     function _strip_last_pathchar(&$path) {
-        if (substr($path,-1) == '/' or substr($path,-1) == "\\") 
+        if (substr($path,-1) == '/' or substr($path,-1) == "\\")
             $path = substr($path,0,-1);
         return $path;
     }
@@ -203,12 +203,12 @@
         foreach ($this->_path as $dir) {
             // ensure we use the same pathsep
             if ($this->_isOtherPathsep()) {
-            	$dir = $this->slashifyPath($dir);
-            	$file = $this->slashifyPath($file);
+                $dir = $this->slashifyPath($dir);
+                $file = $this->slashifyPath($file);
                 if (file_exists($dir . $this->_pathsep . $file))
                     return $dir;
             } elseif (@file_exists($dir . $this->_pathsep . $file))
-               	return $dir;
+                   return $dir;
         }
         return false;
     }
@@ -224,7 +224,7 @@
      */
     function _get_ini_separator () {
         return isWindows() ? ';' : ':';
-        // return preg_match('/^Windows/', php_uname()) 
+        // return preg_match('/^Windows/', php_uname())
     }
 
     /**
@@ -322,7 +322,7 @@
             if (!empty($lang))
                 return $lang;
         }
-            
+
         foreach (array('LC_ALL', 'LC_MESSAGES', 'LC_RESPONSES', 'LANG') as $var) {
             $lang = getenv($var);
             if (!empty($lang))
@@ -462,14 +462,14 @@
     static $finder;
     if (!isset($finder)) {
         $finder = new FileFinder;
-    	// remove "/lib" from dirname(__FILE__)
-    	$wikidir = preg_replace('/.lib$/','',dirname(__FILE__));
+        // remove "/lib" from dirname(__FILE__)
+        $wikidir = preg_replace('/.lib$/','',dirname(__FILE__));
         // let the system favor its local pear?
-    	$finder->_append_to_include_path(dirname(__FILE__)."/pear");
-    	$finder->_prepend_to_include_path($wikidir);
+        $finder->_append_to_include_path(dirname(__FILE__)."/pear");
+        $finder->_prepend_to_include_path($wikidir);
         // Don't override existing INCLUDE_PATH config.
         if (!defined("INCLUDE_PATH"))
- 	    define("INCLUDE_PATH", implode($finder->_get_ini_separator(), $finder->_path));
+         define("INCLUDE_PATH", implode($finder->_get_ini_separator(), $finder->_path));
     }
     $s = $finder->findFile($file, $missing_okay);
     if ($slashify)
@@ -495,9 +495,9 @@
     return $buttonfinder->findFile($file, $missing_okay);
 }
 
-/** 
+/**
  * Prefixes with PHPWIKI_DIR and slashify.
- * For example to unify with 
+ * For example to unify with
  *   require_once dirname(__FILE__).'/lib/file.php'
  *   require_once 'lib/file.php' loading style.
  * Doesn't expand "~" or symlinks yet. truename would be perfect.
@@ -522,7 +522,7 @@
     }
 }
 
-/** 
+/**
  * Prefixes with DATA_PATH and slashify
  */
 function NormalizeWebFileName($file) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/Google.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/Google.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/Google.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -19,8 +19,8 @@
  Lesser General Public License for more details.
 
  You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ License along with this library; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  If you have any questions or comments, please email:
 
@@ -35,7 +35,7 @@
  */
 
 /*
- * Objectified, simplified, documented and added the two other queries 
+ * Objectified, simplified, documented and added the two other queries
  * by Reini Urban
  */
 
@@ -132,7 +132,7 @@
  *   resultElement that comes from that host contains the host name in
  *   this parameter.
  *
- *   <directoryCategory> - array with "fullViewableName" and 
+ *   <directoryCategory> - array with "fullViewableName" and
  *   "specialEncoding" keys.
  *
  *   <directoryTitle> - If the URL for this resultElement is contained
@@ -174,13 +174,13 @@
         return $this;
     }
 
-    /** 
+    /**
      * doGoogleSearch
      *
      * See http://www.google.com/help/features.html for examples of
      * advanced features.  Anything that works at the Google web site
      * will work as a query string in this method.
-     * 
+     *
      * You can use the start and maxResults parameters to page through
      * multiple pages of results. Note that 'maxResults' is currently
      * limited by Google to 10.  See the API reference for more
@@ -263,7 +263,7 @@
     /**
      * Get spelling suggestions from Google
      *
-     * @param  string phrase   word or phrase to spell-check 
+     * @param  string phrase   word or phrase to spell-check
      * @return string          text of any suggested replacement, or None
      */
     function doSpellingSuggestion($phrase) {
@@ -282,4 +282,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
-?>
\ No newline at end of file
+?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlElement.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlElement.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlElement.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: HtmlElement.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: HtmlElement.php 7964 2011-03-05 17:05:30Z vargenau $
 /**
  * Code for writing the HTML subset of XML.
  * @author: Jeff Dairiki
@@ -33,7 +33,7 @@
         assert(count($args) >= 1);
         assert(is_string($args[0]));
         $this->_tag = array_shift($args);
-      
+
         if ($args && is_array($args[0]))
             $this->_attr = array_shift($args);
         else {
@@ -56,7 +56,7 @@
             elseif ($args[0] === false)
                 array_shift($args);
         }
-      
+
         if (count($args) == 1 && is_array($args[0]))
             $args = $args[0];
         $this->_content = $args;
@@ -69,7 +69,7 @@
      */
     function addTooltip ($tooltip_text, $accesskey = null) {
         $this->setAttr('title', $tooltip_text);
-	if ($accesskey) $this->setAccesskey($accesskey);
+    if ($accesskey) $this->setAccesskey($accesskey);
 
         // FIXME: this should be initialized from title by an onLoad() function.
         //        (though, that may not be possible.)
@@ -81,26 +81,26 @@
     }
 
     function setAccesskey ($key) {
-	global $WikiTheme;
-	if (strlen($key) != 1) return;
-	$this->setAttr("accesskey", $key);
+    global $WikiTheme;
+    if (strlen($key) != 1) return;
+    $this->setAttr("accesskey", $key);
 
         if (!empty($this->_attr['title'])) {
-	    if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
-	    {
-		$this->_attr['title'] = preg_replace
+        if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
+        {
+        $this->_attr['title'] = preg_replace
                     ("/\[(alt-)?(.)\]$/",
                      "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]",
                      $this->_attr['title']);
-	    } else  {
-		$this->_attr['title'] .=
+        } else  {
+        $this->_attr['title'] .=
                     " [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
-	    }
-	} else {
-	    $this->_attr['title'] =
+        }
+    } else {
+        $this->_attr['title'] =
                 "[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
-	}
     }
+    }
 
     function emptyTag () {
         if (($this->_properties & HTMLTAG_EMPTY) == 0)
@@ -126,7 +126,7 @@
     function raw ($html_text) {
         return new RawXml($html_text);
     }
-  
+
     function getTagProperties($tag) {
         $props = &$GLOBALS['HTML_TagProperties'];
         return isset($props[$tag]) ? $props[$tag] : 0;
@@ -544,7 +544,7 @@
     }
     return HTML($html);
 }
-  
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlElement5.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlElement5.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlElement5.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: HtmlElement5.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: HtmlElement5.php 7964 2011-03-05 17:05:30Z vargenau $
 /**
  * Code for writing the HTML subset of XML.
  * @author: Jeff Dairiki
@@ -33,7 +33,7 @@
         assert(count($args) >= 1);
         assert(is_string($args[0]));
         $this->_tag = array_shift($args);
-      
+
         if ($args && is_array($args[0]))
             $this->_attr = array_shift($args);
         else {
@@ -56,7 +56,7 @@
             elseif ($args[0] === false)
                 array_shift($args);
         }
-      
+
         if (count($args) == 1 && is_array($args[0]))
             $args = $args[0];
         $this->_content = $args;
@@ -69,7 +69,7 @@
      */
     function addTooltip ($tooltip_text, $accesskey = null) {
         $this->setAttr('title', $tooltip_text);
-	if ($accesskey) $this->setAccesskey($accesskey);
+    if ($accesskey) $this->setAccesskey($accesskey);
 
         // FIXME: this should be initialized from title by an onLoad() function.
         //        (though, that may not be possible.)
@@ -81,26 +81,26 @@
     }
 
     function setAccesskey ($key) {
-	global $WikiTheme;
-	if (strlen($key) != 1) return;
-	$this->setAttr("accesskey", $key);
+    global $WikiTheme;
+    if (strlen($key) != 1) return;
+    $this->setAttr("accesskey", $key);
 
         if (!empty($this->_attr['title'])) {
-	    if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
-	    {
-		$this->_attr['title'] = preg_replace
+        if (preg_match("/\[(alt-)?(.)\]$/", $this->_attr['title'], $m))
+        {
+        $this->_attr['title'] = preg_replace
                     ("/\[(alt-)?(.)\]$/",
                      "[".$WikiTheme->tooltipAccessKeyPrefix()."-\\2]",
                      $this->_attr['title']);
-	    } else  {
-		$this->_attr['title'] .=
+        } else  {
+        $this->_attr['title'] .=
                     " [".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
-	    }
-	} else {
-	    $this->_attr['title'] =
+        }
+    } else {
+        $this->_attr['title'] =
                 "[".$WikiTheme->tooltipAccessKeyPrefix()."-$key]";
-	}
     }
+    }
 
     function emptyTag () {
         if (($this->_properties & HTMLTAG_EMPTY) == 0)
@@ -126,7 +126,7 @@
     public static function raw ($html_text) {
         return new RawXml($html_text);
     }
-  
+
     function getTagProperties($tag) {
         $props = &$GLOBALS['HTML_TagProperties'];
         return isset($props[$tag]) ? $props[$tag] : 0;
@@ -544,7 +544,7 @@
     }
     return HTML($html);
 }
-  
+
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlParser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlParser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/HtmlParser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: HtmlParser.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: HtmlParser.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * HtmlParser Class: Conversion HTML => wikimarkup
  * Requires XmlParser, XmlElement and the expat (or now the libxml) library. This is all in core.
@@ -21,7 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -50,7 +50,7 @@
      *  possible more dialects: MediaWiki, kwiki, c2
      */
     function HtmlParser($dialect = "PhpWiki2", $encoding = '') {
-    	$classname = "HtmlParser_".$dialect;
+        $classname = "HtmlParser_".$dialect;
         if (class_exists($classname))
             $this->dialect = new $classname;
         else {
@@ -58,8 +58,8 @@
         }
         $this->_handlers =& $this->dialect->_handlers;
         $this->XmlParser($encoding);
-	xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, 0);
-	xml_parser_set_option($this->_parser, XML_OPTION_SKIP_WHITE, 1);
+    xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, 0);
+    xml_parser_set_option($this->_parser, XML_OPTION_SKIP_WHITE, 1);
     }
 
     // The three callbacks, called on walking through the HTML tree.
@@ -75,8 +75,8 @@
     */
 
     function output () {
-    	if (is_null($this->root))
-    	    $this->root = $GLOBALS['xml_parser_root'];
+        if (is_null($this->root))
+            $this->root = $GLOBALS['xml_parser_root'];
         $output = $this->wikify( $this->root );
         return $output;
     }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/HttpClient.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/HttpClient.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/HttpClient.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: HttpClient.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: HttpClient.php 7964 2011-03-05 17:05:30Z vargenau $
 
 /**
    Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
@@ -65,21 +65,21 @@
         $this->path = $path;
         $this->method = 'POST';
         $this->postdata = $this->buildQueryString($data);
-    	return $this->doRequest();
+        return $this->doRequest();
     }
     function postfile($path, $filename) {
         $this->path = $path;
         $this->method = 'POST';
-	$boundary = $this->boundary; //"httpclient_boundary";
-	$headers[] = "Content-Type: multipart/form-data; boundary=\"$boundary\"";
-	$basename = basename($filename);
-	$this->postdata =
-	    "\r\n--$boundary\r\n"
-	    ."Content-Disposition: form-data; filename=\"$basename\"\r\n"
-	    ."Content-Type: application/octet-stream\r\n\r\n";
-	$this->postdata .= join("",file($filename));
-	$this->postdata .= "\r\n\r\n--$boundary--\r\n";
-    	return $this->doRequest();
+    $boundary = $this->boundary; //"httpclient_boundary";
+    $headers[] = "Content-Type: multipart/form-data; boundary=\"$boundary\"";
+    $basename = basename($filename);
+    $this->postdata =
+        "\r\n--$boundary\r\n"
+        ."Content-Disposition: form-data; filename=\"$basename\"\r\n"
+        ."Content-Type: application/octet-stream\r\n\r\n";
+    $this->postdata .= join("",file($filename));
+    $this->postdata .= "\r\n\r\n--$boundary--\r\n";
+        return $this->doRequest();
     }
     function buildQueryString($data) {
         $querystring = '';
@@ -95,10 +95,10 @@
                 }
             }
             $querystring = substr($querystring, 0, -1); // Eliminate unnecessary &
-    	} else {
-    	    $querystring = $data;
-    	}
-    	return $querystring;
+        } else {
+            $querystring = $data;
+        }
+        return $querystring;
     }
 
     function doRequest() {
@@ -122,75 +122,75 @@
             return false;
         }
         socket_set_timeout($fp, $this->timeout);
-	if ( $this->method == 'POST' and preg_match("/\<methodCall\>/", $this->postdata))
-	    $request = $this->buildRequest("text/xml"); //xmlrpc
-	else if ( $this->method == 'POST' and strstr("\r\nContent-Disposition: form-data; filename=",
-						     $this->postdata))
-	{
-	    //file upload
-	    $boundary = $this->boundary;
-	    $request = $this->buildRequest("multipart/form-data; boundary=\"$boundary\"");
-	} else
-	    $request = $this->buildRequest();
+    if ( $this->method == 'POST' and preg_match("/\<methodCall\>/", $this->postdata))
+        $request = $this->buildRequest("text/xml"); //xmlrpc
+    else if ( $this->method == 'POST' and strstr("\r\nContent-Disposition: form-data; filename=",
+                             $this->postdata))
+    {
+        //file upload
+        $boundary = $this->boundary;
+        $request = $this->buildRequest("multipart/form-data; boundary=\"$boundary\"");
+    } else
+        $request = $this->buildRequest();
         $this->debug('Request', $request);
         fwrite($fp, $request);
-    	// Reset all the variables that should not persist between requests
-    	$this->headers = array();
-    	$this->content = '';
-    	$this->errormsg = '';
-    	// Set a couple of flags
-    	$inHeaders = true;
-    	$atStart = true;
-    	// Now start reading back the response
-    	while (!feof($fp)) {
-    	    $line = fgets($fp, 4096);
-    	    if ($atStart) {
-    	        // Deal with first line of returned data
-    	        $atStart = false;
-    	        if ($line === false) {
-    	            $this->errormsg = "Empty ". $this->method. " response";
-    	            return false;
-    	        }
-    	        if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/', $line, $m)) {
-    	            $this->errormsg = "Status code line invalid: ".htmlentities($line);
-    	            $this->debug($this->errormsg);
-    	            return false;
-    	        }
-    	        $http_version = $m[1]; // not used
-    	        $this->status = $m[2];
-    	        $status_string = $m[3]; // not used
-    	        $this->debug(trim($line));
-    	        continue;
-    	    }
-    	    if ($inHeaders) {
-    	        if (trim($line) == '') {
-    	            $inHeaders = false;
-    	            $this->debug('Received Headers', $this->headers);
-    	            if ($this->headers_only) {
-    	                break; // Skip the rest of the input
-    	            }
-    	            continue;
-    	        }
-    	        if (!preg_match('/([^:]+):\\s*(.*)/', $line, $m)) {
-    	            // Skip to the next header
-    	            continue;
-    	        }
-    	        $key = strtolower(trim($m[1]));
-    	        $val = trim($m[2]);
-    	        // Deal with the possibility of multiple headers of same name
-    	        if (isset($this->headers[$key])) {
-    	            if (is_array($this->headers[$key])) {
-    	                $this->headers[$key][] = $val;
-    	            } else {
-    	                $this->headers[$key] = array($this->headers[$key], $val);
-    	            }
-    	        } else {
-    	            $this->headers[$key] = $val;
-    	        }
-    	        continue;
-    	    }
-    	    // We're not in the headers, so append the line to the contents
-    	    $this->content .= $line;
+        // Reset all the variables that should not persist between requests
+        $this->headers = array();
+        $this->content = '';
+        $this->errormsg = '';
+        // Set a couple of flags
+        $inHeaders = true;
+        $atStart = true;
+        // Now start reading back the response
+        while (!feof($fp)) {
+            $line = fgets($fp, 4096);
+            if ($atStart) {
+                // Deal with first line of returned data
+                $atStart = false;
+                if ($line === false) {
+                    $this->errormsg = "Empty ". $this->method. " response";
+                    return false;
+                }
+                if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/', $line, $m)) {
+                    $this->errormsg = "Status code line invalid: ".htmlentities($line);
+                    $this->debug($this->errormsg);
+                    return false;
+                }
+                $http_version = $m[1]; // not used
+                $this->status = $m[2];
+                $status_string = $m[3]; // not used
+                $this->debug(trim($line));
+                continue;
+            }
+            if ($inHeaders) {
+                if (trim($line) == '') {
+                    $inHeaders = false;
+                    $this->debug('Received Headers', $this->headers);
+                    if ($this->headers_only) {
+                        break; // Skip the rest of the input
+                    }
+                    continue;
+                }
+                if (!preg_match('/([^:]+):\\s*(.*)/', $line, $m)) {
+                    // Skip to the next header
+                    continue;
+                }
+                $key = strtolower(trim($m[1]));
+                $val = trim($m[2]);
+                // Deal with the possibility of multiple headers of same name
+                if (isset($this->headers[$key])) {
+                    if (is_array($this->headers[$key])) {
+                        $this->headers[$key][] = $val;
+                    } else {
+                        $this->headers[$key] = array($this->headers[$key], $val);
+                    }
+                } else {
+                    $this->headers[$key] = $val;
+                }
+                continue;
+            }
+            // We're not in the headers, so append the line to the contents
+            $this->content .= $line;
         }
         fclose($fp);
         // If data is compressed, uncompress it
@@ -246,7 +246,7 @@
 
     function buildRequest($ContentType = 'application/x-www-form-urlencoded') {
         $headers = array();
-	// Using 1.1 leads to all manner of problems, such as "chunked" encoding
+    // Using 1.1 leads to all manner of problems, such as "chunked" encoding
         $headers[] = "{$this->method} {$this->path} HTTP/1.0";
         $headers[] = "Host: {$this->host}";
         $headers[] = "User-Agent: {$this->user_agent}";
@@ -258,25 +258,25 @@
         if (!empty($this->referer)) {
             $headers[] = "Referer: {$this->referer}";
         }
-    	// Cookies
-    	if (!empty($this->cookies)) {
-    	    $cookie = 'Cookie: ';
-    	    foreach ($this->cookies as $key => $value) {
-    	        $cookie .= "$key=$value; ";
-    	    }
-    	    $headers[] = $cookie;
-    	}
-    	// Basic authentication
-    	if (!empty($this->username) && !empty($this->password)) {
-    	    $headers[] = 'Authorization: BASIC '.base64_encode($this->username.':'.$this->password);
-    	}
-    	// If this is a POST, set the content type and length
-    	if ($this->postdata) {
-	    $headers[] = 'Content-Type: ' . $ContentType;
-    	    $headers[] = 'Content-Length: '.strlen($this->postdata);
-    	}
-    	$request = implode("\r\n", $headers)."\r\n\r\n".$this->postdata;
-    	return $request;
+        // Cookies
+        if (!empty($this->cookies)) {
+            $cookie = 'Cookie: ';
+            foreach ($this->cookies as $key => $value) {
+                $cookie .= "$key=$value; ";
+            }
+            $headers[] = $cookie;
+        }
+        // Basic authentication
+        if (!empty($this->username) && !empty($this->password)) {
+            $headers[] = 'Authorization: BASIC '.base64_encode($this->username.':'.$this->password);
+        }
+        // If this is a POST, set the content type and length
+        if ($this->postdata) {
+        $headers[] = 'Content-Type: ' . $ContentType;
+            $headers[] = 'Content-Length: '.strlen($this->postdata);
+        }
+        $request = implode("\r\n", $headers)."\r\n\r\n".$this->postdata;
+        return $request;
     }
     function getStatus() {
         return $this->status;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/IniConfig.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/IniConfig.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/IniConfig.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: IniConfig.php 7693 2010-09-17 11:33:14Z rurban $');
+// $Id: IniConfig.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * A configurator intended to read its config from a PHP-style INI file,
  * instead of a PHP file.
@@ -29,7 +29,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -77,23 +77,23 @@
         $ignore["_".$key]++;
     }
     foreach (array("HTTP_POST_FILES","GLOBALS","RUNTIMER","ErrorManager",'LANG',
-    		   'HOME_PAGE','request','SCRIPT_NAME','VIRTUAL_PATH','SCRIPT_FILENAME') as $key)
-    	$ignore[$key]++;
+               'HOME_PAGE','request','SCRIPT_NAME','VIRTUAL_PATH','SCRIPT_FILENAME') as $key)
+        $ignore[$key]++;
     $fp = fopen($file, "wb");
     fwrite($fp,"<?php\n");
     fwrite($fp,"function wiki_configrestore(){\n");
     //TODO: optimize this by removing ignore, big serialized array and merge into existing GLOBALS
     foreach ($vars as $var => $val) {
-    	if (!$ignore[$var])
+        if (!$ignore[$var])
             fwrite($fp, "\$GLOBALS['".$var."']=unserialize(\""
-            		    .addslashes(serialize($val))."\");\n");
+                        .addslashes(serialize($val))."\");\n");
     }
     // cannot be optimized, maybe leave away predefined consts somehow
     foreach (get_defined_constants() as $var => $val) {
-    	if (substr($var,0,4) != "PHP_" and substr($var,0,2) != "E_"
-    	    and substr($var,0,2) != "T_"  and substr($var,0,2) != "M_")
+        if (substr($var,0,4) != "PHP_" and substr($var,0,2) != "E_"
+            and substr($var,0,2) != "T_"  and substr($var,0,2) != "M_")
             fwrite($fp, "if(!defined('".$var."')) define('".$var."',unserialize(\""
-            	        .addslashes(serialize($val))."\"));\n");
+                        .addslashes(serialize($val))."\"));\n");
     }
     fwrite($fp, "return 'noerr';}");
     fwrite($fp,"?>");
@@ -148,7 +148,7 @@
          'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR', /*'KEYWORDS',*/
          // extra logic:
          //'DATABASE_PREFIX', 'DATABASE_DSN', 'DATABASE_TYPE', 'DATABASE_DBHANDLER',
-	 'DATABASE_OPTIMISE_FREQUENCY',
+         'DATABASE_OPTIMISE_FREQUENCY',
          'INTERWIKI_MAP_FILE', 'COPYRIGHTPAGE_TITLE', 'COPYRIGHTPAGE_URL',
          'AUTHORPAGE_TITLE', 'AUTHORPAGE_URL',
          'WIKI_NAME_REGEXP',
@@ -158,7 +158,7 @@
          'WYSIWYG_BACKEND', 'PLUGIN_MARKUP_MAP',
          // extra logic:
          'SERVER_NAME','SERVER_PORT','SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH',
-	 'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR'
+         'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR'
          );
 
     // Optional values which need to be defined.
@@ -176,7 +176,7 @@
          'SESSION_SAVE_PATH',
          'TOOLBAR_PAGELINK_PULLDOWN', 'TOOLBAR_TEMPLATE_PULLDOWN', 'TOOLBAR_IMAGE_PULLDOWN',
          'EXTERNAL_LINK_TARGET', 'ACCESS_LOG_SQL', 'USE_EXTERNAL_HTML2PDF',
-	 'LOGIN_LOG','LDAP_SEARCH_FILTER'
+         'LOGIN_LOG','LDAP_SEARCH_FILTER'
          );
 
     // List of all valid config options to be define()d which take booleans.
@@ -201,7 +201,7 @@
          'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE',
          'ENABLE_MARKUP_MEDIAWIKI_TABLE',
          'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS',
-	 'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS',
+         'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS',
          'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
          'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC',
          'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES',
@@ -211,11 +211,11 @@
     $rs = @parse_ini_file($file);
     $rsdef = @parse_ini_file(dirname(__FILE__)."/../config/config-default.ini");
     foreach ($rsdef as $k => $v) {
-    	if (defined($k)) {
-    	    $rs[$k] = constant($k);
-    	} elseif (!isset($rs[$k])) {
-    	    $rs[$k] = $v;
-    	}
+        if (defined($k)) {
+            $rs[$k] = constant($k);
+        } elseif (!isset($rs[$k])) {
+            $rs[$k] = $v;
+        }
     }
     unset($k); unset($v);
 
@@ -293,13 +293,13 @@
 
     // Database
     global $DBParams;
-    foreach (array('DATABASE_TYPE' 	=> 'dbtype',
-    		   'DATABASE_DSN'  	=> 'dsn',
-    		   'DATABASE_SESSION_TABLE' => 'db_session_table',
-    		   'DATABASE_DBA_HANDLER'   => 'dba_handler',
-    	           'DATABASE_DIRECTORY' => 'directory',
-    	           'DATABASE_TIMEOUT'   => 'timeout',
-    	           'DATABASE_PREFIX'    => 'prefix')
+    foreach (array('DATABASE_TYPE'     => 'dbtype',
+               'DATABASE_DSN'      => 'dsn',
+               'DATABASE_SESSION_TABLE' => 'db_session_table',
+               'DATABASE_DBA_HANDLER'   => 'dba_handler',
+                   'DATABASE_DIRECTORY' => 'directory',
+                   'DATABASE_TIMEOUT'   => 'timeout',
+                   'DATABASE_PREFIX'    => 'prefix')
              as $item => $k)
     {
         if (defined($item)) {
@@ -350,18 +350,18 @@
     // Expiry stuff
     global $ExpireParams;
     foreach (array('major','minor','author') as $major) {
-    	foreach (array('max_age','min_age','min_keep','keep','max_keep') as $max) {
-    	    $item = strtoupper($major) . '_'. strtoupper($max);
+        foreach (array('max_age','min_age','min_keep','keep','max_keep') as $max) {
+            $item = strtoupper($major) . '_'. strtoupper($max);
             if (defined($item)) $val = constant($item);
             elseif (array_key_exists($item, $rs))
                 $val = $rs[$item];
-    	    elseif (array_key_exists($item, $rsdef))
+            elseif (array_key_exists($item, $rsdef))
                 $val = $rsdef[$item];
             if (!isset($ExpireParams[$major]))
                 $ExpireParams[$major] = array();
             $ExpireParams[$major][$max] = $val;
             unset($rs[$item]);
-    	}
+        }
     }
     unset($item); unset($major); unset($max);
 
@@ -409,34 +409,36 @@
 
     // TODO: Currently unsupported on non-SQL. Nice to have for RhNavPlugin
     // CHECKME: PDO
-    if (array_key_exists('ACCESS_LOG_SQL', $rs)) {
-    	// WikiDB_backend::isSql() not yet loaded
-        if (!in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')))
-            // override false config setting on no SQL WikiDB database.
-            define('ACCESS_LOG_SQL', 0);
+    if (!defined('ACCESS_LOG_SQL')) {
+        if (array_key_exists('ACCESS_LOG_SQL', $rs)) {
+            // WikiDB_backend::isSql() not yet loaded
+            if (!in_array(DATABASE_TYPE, array('SQL','ADODB','PDO'))) {
+                // override false config setting on no SQL WikiDB database.
+                define('ACCESS_LOG_SQL', 0);
+            }
+        // SQL defaults to ACCESS_LOG_SQL = 2
+        } else {
+            define('ACCESS_LOG_SQL',
+            in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')) ? 2 : 0);
+        }
     }
-    // SQL defaults to ACCESS_LOG_SQL = 2
-    else {
-        define('ACCESS_LOG_SQL',
-               in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')) ? 2 : 0);
-    }
 
     global $PLUGIN_MARKUP_MAP;
     $PLUGIN_MARKUP_MAP = array();
     if (defined('PLUGIN_MARKUP_MAP') and trim(PLUGIN_MARKUP_MAP) != "") {
-	$_map = preg_split('/\s+/', PLUGIN_MARKUP_MAP);
-	foreach ($_map as $v) {
-	    list($xml,$plugin) = explode(':', $v);
-	    if (!empty($xml) and !empty($plugin))
-	        $PLUGIN_MARKUP_MAP[$xml] = $plugin;
-	}
-	unset($_map); unset($xml); unset($plugin); unset($v);
+    $_map = preg_split('/\s+/', PLUGIN_MARKUP_MAP);
+    foreach ($_map as $v) {
+        list($xml,$plugin) = explode(':', $v);
+        if (!empty($xml) and !empty($plugin))
+            $PLUGIN_MARKUP_MAP[$xml] = $plugin;
     }
+    unset($_map); unset($xml); unset($plugin); unset($v);
+    }
 
     if (empty($rs['TEMP_DIR'])) {
-	$rs['TEMP_DIR'] = "/tmp";
-	if (getenv("TEMP"))
-	    $rs['TEMP_DIR'] = getenv("TEMP");
+    $rs['TEMP_DIR'] = "/tmp";
+    if (getenv("TEMP"))
+        $rs['TEMP_DIR'] = getenv("TEMP");
     }
     // optional values will be set to '' to simplify the logic.
     foreach ($_IC_OPTIONAL_VALUE as $item) {
@@ -445,7 +447,7 @@
             continue;
         }
         if (array_key_exists($item, $rs)) {
-	    _check_int_constant($rs[$item]);
+        _check_int_constant($rs[$item]);
             define($item, $rs[$item]);
             unset($rs[$item]);
         } else
@@ -453,7 +455,7 @@
     }
 
     if (USE_EXTERNAL_HTML2PDF) {
-	$item = 'EXTERNAL_HTML2PDF_PAGELIST';
+    $item = 'EXTERNAL_HTML2PDF_PAGELIST';
         if (defined($item)) {
             unset($rs[$item]);
         } elseif (array_key_exists($item, $rs)) {
@@ -461,8 +463,8 @@
             unset($rs[$item]);
         } elseif (array_key_exists($item, $rsdef)) {
             define($item, $rsdef[$item]);
-	}
     }
+    }
     unset($item);
 
     // LDAP bind options
@@ -541,7 +543,7 @@
         if (defined($item)) {
             continue;
         } else {
-	    _check_int_constant($v);
+        _check_int_constant($v);
             define($item, $v);
         }
     }
@@ -792,7 +794,7 @@
 
     // If user has not defined PHPWIKI_DIR, and we need it
     if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) {
-    	$themes_dir = FindFile("themes");
+        $themes_dir = FindFile("themes");
         define('PHPWIKI_DIR', dirname($themes_dir));
     }
 
@@ -823,7 +825,7 @@
 
     /*$configurator_link = HTML(HTML::br(), "=>",
                               HTML::a(array('href'=>DATA_PATH."/configurator.php"),
-    								  _("Configurator")));*/
+                                      _("Configurator")));*/
     // check whether the crypt() function is needed and present
     if (defined('ENCRYPTED_PASSWD') && !function_exists('crypt')) {
         $error = sprintf("Encrypted passwords cannot be used: %s.",
@@ -838,8 +840,8 @@
 
     // Basic configurator validation
     if (!defined('ADMIN_USER') or ADMIN_USER == '') {
-    	$error = sprintf("%s may not be empty. Please update your configuration.",
-       			 "ADMIN_USER");
+        $error = sprintf("%s may not be empty. Please update your configuration.",
+                    "ADMIN_USER");
         // protect against recursion
         if (!preg_match("/config\-(dist|default)\.ini$/", $file)
             and !defined("_PHPWIKI_INSTALL_RUNNING"))
@@ -854,9 +856,9 @@
         }
     }
     if (!defined('ADMIN_PASSWD') or ADMIN_PASSWD == '') {
-    	$error = sprintf("%s may not be empty. Please update your configuration.",
-       			 "ADMIN_PASSWD");
-    	// protect against recursion
+        $error = sprintf("%s may not be empty. Please update your configuration.",
+                    "ADMIN_PASSWD");
+        // protect against recursion
         if (!preg_match("/config\-(dist|default)\.ini$/", $file)
            and !defined("_PHPWIKI_INSTALL_RUNNING"))
         {
@@ -958,7 +960,7 @@
     }
     else {
         $chback = 0;
-    	if ($LANG != 'en') {
+        if ($LANG != 'en') {
 
             // Working around really weird gettext problems: (4.3.2, 4.3.6 win)
             // bindtextdomain() in returns the current domain path.
@@ -1096,12 +1098,14 @@
         }
     }
 
-    if (VIRTUAL_PATH != SCRIPT_NAME) {
-        // Apache action handlers are used.
-        define('PATH_INFO_PREFIX', VIRTUAL_PATH . '/');
+    if (!defined('PATH_INFO_PREFIX')) {
+        if (VIRTUAL_PATH != SCRIPT_NAME) {
+            // Apache action handlers are used.
+            define('PATH_INFO_PREFIX', VIRTUAL_PATH . '/');
+        } else {
+            define('PATH_INFO_PREFIX', '/');
+        }
     }
-    else
-        define('PATH_INFO_PREFIX', '/');
 
     define('PHPWIKI_BASE_URL',
            SERVER_URL . (USE_PATH_INFO ? VIRTUAL_PATH . '/' : SCRIPT_NAME));
@@ -1118,7 +1122,7 @@
         $SCRIPT_FILENAME = str_replace('\\\\','\\',strtr($SCRIPT_FILENAME, '/', '\\'));
     define('SCRIPT_FILENAME', $SCRIPT_FILENAME);
 
-    // Get remote host name, if apache hasn't done it for us
+    // Get remote host name, if Apache hasn't done it for us
     if (empty($HTTP_SERVER_VARS['REMOTE_HOST'])
         and !empty($HTTP_SERVER_VARS['REMOTE_ADDR'])
         and ENABLE_REVERSE_DNS)

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/InlineParser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/InlineParser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/InlineParser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: InlineParser.php 7726 2010-11-05 15:02:12Z vargenau $');
+// $Id: InlineParser.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki at dairiki.org>
  * Copyright (C) 2004-2010 Reini Urban
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**
@@ -147,28 +147,28 @@
         // sf.net: Fatal error: Allowed memory size of 8388608 bytes exhausted
         //         (tried to allocate 634 bytes)
         if (_INLINE_OPTIMIZATION) { // disabled, wrong
-	    // So we try to minize memory usage, by looping explicitly,
-	    // and storing only those regexp which actually match.
-	    // There may be more than one, so we have to find the longest,
-	    // and match inside until the shortest is empty.
-	    $matched = array(); $matched_ind = array();
-	    for ($i=0; $i<count($regexps); $i++) {
-		if (!trim($regexps[$i])) {
-		    trigger_error("empty regexp $i", E_USER_WARNING);
-		    continue;
-		}
-		$pat= "/ ( . $repeat ) ( " . $regexps[$i] . " ) /x";
-		if (preg_match($pat, $text, $_m)) {
-		    $m = $_m; // FIXME: prematch, postmatch is wrong
-		    $matched[] = $regexps[$i];
-		    $matched_ind[] = $i;
-		    $regexp_ind = $i;
-		}
-	    }
-	    // To overcome ANCHORED:
-	    // We could sort by longest match and iterate over these.
-	    if (empty($matched)) return false;
+        // So we try to minize memory usage, by looping explicitly,
+        // and storing only those regexp which actually match.
+        // There may be more than one, so we have to find the longest,
+        // and match inside until the shortest is empty.
+        $matched = array(); $matched_ind = array();
+        for ($i=0; $i<count($regexps); $i++) {
+        if (!trim($regexps[$i])) {
+            trigger_error("empty regexp $i", E_USER_WARNING);
+            continue;
         }
+        $pat= "/ ( . $repeat ) ( " . $regexps[$i] . " ) /x";
+        if (preg_match($pat, $text, $_m)) {
+            $m = $_m; // FIXME: prematch, postmatch is wrong
+            $matched[] = $regexps[$i];
+            $matched_ind[] = $i;
+            $regexp_ind = $i;
+        }
+        }
+        // To overcome ANCHORED:
+        // We could sort by longest match and iterate over these.
+        if (empty($matched)) return false;
+        }
         $match = new RegexpSet_match;
 
         // Optimization: if the matches are only "$" and another, then omit "$"
@@ -200,7 +200,7 @@
           if (!$_already_dumped) {
             var_dump($regexps);
             if (_INLINE_OPTIMIZATION)
-            	var_dump($matched);
+                var_dump($matched);
             var_dump($matched_ind);
           }
           $_already_dumped = 1;
@@ -338,11 +338,11 @@
     // Strip brackets and leading space
     // bug#1904088  Some brackets links on 2 lines cause the parser to crash
     preg_match('/(\#?) \[\s* (?: (.*?) \s* (?<!' . ESCAPE_CHAR . ')(\|) )? \s* (.+?) \s*\]/x',
-	       str_replace("\n", " ", $bracketlink), $matches);
+           str_replace("\n", " ", $bracketlink), $matches);
     if (count($matches) < 4) {
-    	// "[ personal\ninformation manager | PhpWiki:PersonalWiki ]"
-    	trigger_error(_("Invalid [] syntax ignored").": ".$bracketlink, E_USER_WARNING);
-    	return new Cached_Link;
+        // "[ personal\ninformation manager | PhpWiki:PersonalWiki ]"
+        trigger_error(_("Invalid [] syntax ignored")._(": ").$bracketlink, E_USER_WARNING);
+        return new Cached_Link;
     }
     list (, $hash, $label, $bar, $rawlink) = $matches;
 
@@ -396,9 +396,9 @@
      * Normally /Page links to the subpage /Page.
      */
     if (SUBPAGE_SEPARATOR == '/') {
-    	if (preg_match('/^\.\.\//', $link)) {
+        if (preg_match('/^\.\.\//', $link)) {
             return new Cached_ExternalLink($link, $label);
-    	}
+        }
     } else if (preg_match('/^(\.\.\/|\/)/', $link)) {
         return new Cached_ExternalLink($link, $label);
     }
@@ -524,18 +524,18 @@
 class Markup_spellcheck extends SimpleMarkup
 {
     function Markup_spellcheck () {
-	$this->suggestions = $GLOBALS['request']->getArg('suggestions');
+    $this->suggestions = $GLOBALS['request']->getArg('suggestions');
     }
     function getMatchRegexp () {
-    	if (empty($this->suggestions))
-    	    return "(?# false )";
-	$words = array_keys($this->suggestions);
+        if (empty($this->suggestions))
+            return "(?# false )";
+    $words = array_keys($this->suggestions);
         return "(?<= \W ) (?:" . join('|', $words) . ") (?= \W )";
     }
 
     function markup ($match) {
-    	if (empty($this->suggestions) or empty($this->suggestions[$match]))
-    	    return $match;
+        if (empty($this->suggestions) or empty($this->suggestions[$match]))
+            return $match;
         return new Cached_SpellCheck(UnWikiEscape($match), $this->suggestions[$match]);
     }
 }
@@ -679,6 +679,20 @@
     }
 }
 
+class Markup_wikicreole_underline extends BalancedMarkup
+{
+    var $_start_regexp = "\\_\\_";
+
+    function getEndRegexp ($match) {
+        return "\\_\\_";
+    }
+
+    function markup ($match, $body) {
+        $tag = 'u';
+        return new HtmlElement($tag, $body);
+    }
+}
+
 class Markup_wikicreole_superscript extends BalancedMarkup
 {
     var $_start_regexp = "\\^\\^";
@@ -709,14 +723,14 @@
 
 class Markup_old_emphasis  extends BalancedMarkup
 {
-    var $_start_regexp = "''|__";
+    var $_start_regexp = "''";
 
     function getEndRegexp ($match) {
         return $match;
     }
 
     function markup ($match, $body) {
-        $tag = $match == "''" ? 'em' : 'strong';
+        $tag = 'em';
         return new HtmlElement($tag, $body);
     }
 }
@@ -724,43 +738,43 @@
 class Markup_nestled_emphasis extends BalancedMarkup
 {
     function getStartRegexp() {
-	static $start_regexp = false;
+    static $start_regexp = false;
 
-	if (!$start_regexp) {
-	    // The three possible delimiters
+    if (!$start_regexp) {
+        // The three possible delimiters
             // (none of which can be followed by itself.)
-	    $i = "_ (?! _)";
-	    $b = "\\* (?! \\*)";
-	    $tt = "= (?! =)";
+        $i = "_ (?! _)";
+        $b = "\\* (?! \\*)";
+        $tt = "= (?! =)";
 
-	    $any = "(?: ${i}|${b}|${tt})"; // any of the three.
+        $any = "(?: ${i}|${b}|${tt})"; // any of the three.
 
-	    // Any of [_*=] is okay if preceded by space or one of [-"'/:]
-	    $start[] = "(?<= \\s|^|[-\"'\\/:]) ${any}";
+        // Any of [_*=] is okay if preceded by space or one of [-"'/:]
+        $start[] = "(?<= \\s|^|[-\"'\\/:]) ${any}";
 
-	    // _ or * is okay after = as long as not immediately followed by =
-	    $start[] = "(?<= =) (?: ${i}|${b}) (?! =)";
-	    // etc...
-	    $start[] = "(?<= _) (?: ${b}|${tt}) (?! _)";
-	    $start[] = "(?<= \\*) (?: ${i}|${tt}) (?! \\*)";
+        // _ or * is okay after = as long as not immediately followed by =
+        $start[] = "(?<= =) (?: ${i}|${b}) (?! =)";
+        // etc...
+        $start[] = "(?<= _) (?: ${b}|${tt}) (?! _)";
+        $start[] = "(?<= \\*) (?: ${i}|${tt}) (?! \\*)";
 
 
-	    // any delimiter okay after an opening brace ( [{<(] )
-	    // as long as it's not immediately followed by the matching closing
-	    // brace.
-	    $start[] = "(?<= { ) ${any} (?! } )";
-	    $start[] = "(?<= < ) ${any} (?! > )";
-	    $start[] = "(?<= \\( ) ${any} (?! \\) )";
-	
-	    $start = "(?:" . join('|', $start) . ")";
-	
-	    // Any of the above must be immediately followed by non-whitespace.
-	    $start_regexp = $start . "(?= \S)";
-	}
+        // any delimiter okay after an opening brace ( [{<(] )
+        // as long as it's not immediately followed by the matching closing
+        // brace.
+        $start[] = "(?<= { ) ${any} (?! } )";
+        $start[] = "(?<= < ) ${any} (?! > )";
+        $start[] = "(?<= \\( ) ${any} (?! \\) )";
 
-	return $start_regexp;
+        $start = "(?:" . join('|', $start) . ")";
+
+        // Any of the above must be immediately followed by non-whitespace.
+        $start_regexp = $start . "(?= \S)";
     }
 
+    return $start_regexp;
+    }
+
     function getEndRegexp ($match) {
         $chr = preg_quote($match);
         return "(?<= \S | ^ ) (?<! $chr) $chr (?! $chr) (?= \s | [-)}>\"'\\/:.,;!? _*=] | $)";
@@ -796,22 +810,22 @@
         "<(?: div|span )(?: \s[^>]*)?>";
 
     function getEndRegexp ($match) {
-    	if (substr($match,1,4) == 'span')
-    	    $tag = 'span';
-    	else
-    	    $tag = 'div';
+        if (substr($match,1,4) == 'span')
+            $tag = 'span';
+        else
+            $tag = 'div';
         return "<\\/" . $tag . '>';
     }
 
     function markup ($match, $body) {
-    	if (substr($match,1,4) == 'span')
-    	    $tag = 'span';
-    	else
-    	    $tag = 'div';
-    	$rest = substr($match,1+strlen($tag),-1);
-    	if (!empty($rest)) {
+        if (substr($match,1,4) == 'span')
+            $tag = 'span';
+        else
+            $tag = 'div';
+        $rest = substr($match,1+strlen($tag),-1);
+        if (!empty($rest)) {
             $args = parse_attributes($rest);
-    	} else {
+        } else {
             $args = array();
         }
         return new HtmlElement($tag, $args, $body);
@@ -826,18 +840,18 @@
     var $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>";
 
     function getEndRegexp ($match) {
-    	if (substr($match,1,4) == 'abbr')
-    	    $tag = 'abbr';
-    	else
-    	    $tag = 'acronym';
+        if (substr($match,1,4) == 'abbr')
+            $tag = 'abbr';
+        else
+            $tag = 'acronym';
         return "<\\/" . $tag . '>';
     }
 
     function markup ($match, $body) {
-    	if (substr($match,1,4) == 'abbr')
-    	    $tag = 'abbr';
-    	else
-    	    $tag = 'acronym';
+        if (substr($match,1,4) == 'abbr')
+            $tag = 'abbr';
+        else
+            $tag = 'acronym';
         $rest = substr($match,1+strlen($tag),-1);
         $attrs = parse_attributes($rest);
         // Remove attributes other than title and lang
@@ -861,7 +875,7 @@
     var $_end_regexp = "%%";
 
     function markup ($match, $body) {
-    	$color = strtolower(substr($match, 7, -1));
+        $color = strtolower(substr($match, 7, -1));
 
         $morecolors = array('beige' => '#f5f5dc',
                             'brown' => '#a52a2a',
@@ -928,7 +942,7 @@
     var $_match_regexp = '<\?plugin(?:-form)?\s[^\n]+?\?>';
 
     function markup ($match) {
-	return new Cached_PluginInvocation($match);
+    return new Cached_PluginInvocation($match);
     }
 }
 
@@ -940,7 +954,7 @@
     function markup ($match) {
         $pi = str_replace("<<", "<?plugin ", $match);
         $pi = str_replace(">>", " ?>", $pi);
-	return new Cached_PluginInvocation($pi);
+    return new Cached_PluginInvocation($pi);
     }
 }
 
@@ -952,21 +966,21 @@
     //var $_start_regexp = "<(?: ".join('|',PLUGIN_MARKUP_MAP)." )(?: \s[^>]*)>";
 
     function getStartRegexp () {
-	global $PLUGIN_MARKUP_MAP;
+    global $PLUGIN_MARKUP_MAP;
         static $_start_regexp;
         if ($_start_regexp) return $_start_regexp;
         if (empty($PLUGIN_MARKUP_MAP)) return '';
         //"<(?: html|search|extsearch|dot|toc|math|richtable|include|tex )(?: \s[^>]*)>"
-	$_start_regexp = "<(?: ".join('|',array_keys($PLUGIN_MARKUP_MAP))." )(?: \s[^>]*|\\/ )>";
+    $_start_regexp = "<(?: ".join('|',array_keys($PLUGIN_MARKUP_MAP))." )(?: \s[^>]*|\\/ )>";
         return $_start_regexp;
     }
     function getEndRegexp ($match) {
         return "<\\/" . $match . '>';
     }
     function markup ($match, $body) {
-	global $PLUGIN_MARKUP_MAP;
+    global $PLUGIN_MARKUP_MAP;
         $name = substr($match,2,-2);
-	$vars = '';
+    $vars = '';
         if (preg_match('/^(\S+)\|(.*)$/', $name, $_m)) {
             $name = $_m[1];
             $vars = $_m[2]; //str_replace(' ', '&', $_m[2]);
@@ -976,7 +990,7 @@
             return "";
         }
         $plugin = $PLUGIN_MARKUP_MAP[$name];
-	return new Cached_PluginInvocation("<"."?plugin $plugin $vars $body ?".">");
+    return new Cached_PluginInvocation("<"."?plugin $plugin $vars $body ?".">");
     }
 }
 
@@ -1079,11 +1093,16 @@
 
         // It's a video
         if (is_video($imagename)) {
-    	    $s = '<'.'?plugin Video file="' . $imagename . '" ?'.'>';
-	    return new Cached_PluginInvocation($s);
+            $s = '<'.'?plugin Video file="' . $imagename . '" ?'.'>';
+        return new Cached_PluginInvocation($s);
         }
 
         $page = str_replace("\n", "", $page);
+
+        // The argument value might contain a double quote (")
+        // We have to encode that.
+        $page = htmlspecialchars($page);
+
         $vars = '';
 
         if (preg_match('/^(\S+?)\|(.*)$/', $page, $_m)) {
@@ -1100,10 +1119,10 @@
         }
 
         if ($vars)
-    	    $s = '<'.'?plugin Template page="'.$page.'" '.$vars.' ?'.'>';
-    	else
-    	    $s = '<'.'?plugin Template page="' . $page . '" ?'.'>';
-	return new Cached_PluginInvocation($s);
+            $s = '<'.'?plugin Template page="'.$page.'" '.$vars.' ?'.'>';
+        else
+            $s = '<'.'?plugin Template page="' . $page . '" ?'.'>';
+    return new Cached_PluginInvocation($s);
     }
 }
 
@@ -1159,8 +1178,8 @@
 
     function InlineTransformer ($markup_types = false) {
         global $request;
-	// We need to extend the inline parsers by certain actions, like SearchHighlight,
-	// SpellCheck and maybe CreateToc.
+    // We need to extend the inline parsers by certain actions, like SearchHighlight,
+    // SpellCheck and maybe CreateToc.
         if (!$markup_types) {
             $non_default = false;
             $markup_types = array
@@ -1171,26 +1190,27 @@
                  'wikicreole_subscript',
                  'wikicreole_italics', 'wikicreole_bold',
                  'wikicreole_monospace',
+                 'wikicreole_underline',
                  'old_emphasis', 'nestled_emphasis',
                  'html_emphasis', 'html_abbr', 'plugin', 'plugin_wikicreole',
                  'isonumchars', 'isohexchars', /*'html_entities'*/
                  );
-	    if (DISABLE_MARKUP_WIKIWORD)
+        if (DISABLE_MARKUP_WIKIWORD)
                 $markup_types = array_remove($markup_types, 'wikiword');
 
-	    $action = $request->getArg('action');
-	    if ($action == 'SpellCheck' and $request->getArg('suggestions'))
-	    {   // insert it after url
-		array_splice($markup_types, 2, 1, array('url','spellcheck'));
-	    }
-	    if (isset($request->_searchhighlight))
-	    {   // insert it after url
-		array_splice($markup_types, 2, 1, array('url','searchhighlight'));
+        $action = $request->getArg('action');
+        if ($action == 'SpellCheck' and $request->getArg('suggestions'))
+        {   // insert it after url
+        array_splice($markup_types, 2, 1, array('url','spellcheck'));
+        }
+        if (isset($request->_searchhighlight))
+        {   // insert it after url
+        array_splice($markup_types, 2, 1, array('url','searchhighlight'));
                 //$request->setArg('searchhighlight', false);
-	    }
+        }
         } else {
             $non_default = true;
-	}
+    }
         foreach ($markup_types as $mtype) {
             $class = "Markup_$mtype";
             $this->_addMarkup(new $class);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/MailNotify.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/MailNotify.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/MailNotify.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: MailNotify.php 7666 2010-08-31 16:02:45Z vargenau $');
+// $Id: MailNotify.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2006-2007,2009 Reini Urban
  * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -28,7 +28,7 @@
  * We add WikiDB handlers and register ourself there:
  *   onChangePage, onDeletePage, onRenamePage
  * Administrative actions:
- *   [Watch] WatchPage - add a page, or delete watch handlers into the users 
+ *   [Watch] WatchPage - add a page, or delete watch handlers into the users
  *                       pref[notifyPages] slot.
  *   My WatchList      - view or edit list/regex of pref[notifyPages].
  *   EMailConfirm methods: send and verify
@@ -51,9 +51,9 @@
 class MailNotify {
 
     function MailNotify($pagename) {
-	$this->pagename = $pagename; /* which page */
+    $this->pagename = $pagename; /* which page */
         $this->emails  = array();    /* to which addresses */
-        $this->userids = array();    /* corresponding array of displayed names, 
+        $this->userids = array();    /* corresponding array of displayed names,
                                         don't display the email addresses */
         /* From: from whom the mail appears to be */
         $this->from = $this->fromId();
@@ -142,8 +142,8 @@
                         }
                     }
 
-                    if (!$user) { // handle the case for ModeratePage: 
-                        	  // no prefs, just userid's.
+                    if (!$user) { // handle the case for ModeratePage:
+                              // no prefs, just userid's.
                         $emails[] = $this->userEmail($userid, false);
                         $userids[] = $userid;
                     } else {
@@ -175,7 +175,7 @@
         $this->userids = array_unique($userids);
         return array($this->emails, $this->userids);
     }
-    
+
     function sendMail($subject,
                       $content,
                       $notice = false,
@@ -199,28 +199,29 @@
                    "Content-Transfer-Encoding: 8bit";
 
         $ok = mail(($to = array_shift($emails)),
-                   $encoded_subject, 
-		   $subject."\n".$content,
-		   $headers
-		   );
-	if (MAILER_LOG and is_writable(MAILER_LOG)) {
-	    $f = fopen(MAILER_LOG, "a");
-	    fwrite($f, "\n\nX-MailSentOK: " . $ok ? 'OK' : 'FAILED');
-	    if (!$ok) {
-		global $ErrorManager;
-		// get last error message
-		$last_err = 
-                    $ErrorManager->_postponed_errors[count($ErrorHandler->_postponed_errors)-1];
-		fwrite($f, "\nX-MailFailure: " . $last_err);
-	    }
-	    fwrite($f, "\nDate: " . CTime());
-	    fwrite($f, "\nSubject: $encoded_subject");
-	    fwrite($f, "\nFrom: $from");
-	    fwrite($f, "\nTo: $to");
-	    fwrite($f, "\nBcc: ".join(',', $emails));
-	    fwrite($f, "\n\n". $content);
-	    fclose($f);
-	}
+                   $encoded_subject,
+           $subject."\n".$content,
+           $headers
+           );
+    if (MAILER_LOG and is_writable(MAILER_LOG)) {
+        global $ErrorManager;
+
+        $f = fopen(MAILER_LOG, "a");
+        fwrite($f, "\n\nX-MailSentOK: " . $ok ? 'OK' : 'FAILED');
+
+        if (!$ok && isset($ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1])) {
+            // get last error message
+            $last_err = $ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1];
+            fwrite($f, "\nX-MailFailure: " . $last_err);
+        }
+        fwrite($f, "\nDate: " . CTime());
+        fwrite($f, "\nSubject: $encoded_subject");
+        fwrite($f, "\nFrom: $from");
+        fwrite($f, "\nTo: $to");
+        fwrite($f, "\nBcc: ".join(',', $emails));
+        fwrite($f, "\n\n". $content);
+        fclose($f);
+    }
         if ($ok) {
             if (!$silent)
                 trigger_error(sprintf($notice, $this->pagename)
@@ -231,13 +232,13 @@
         } else {
             trigger_error(sprintf($notice, $this->pagename)
                           . " "
-                          . sprintf(_("Error: Couldn't send %s to %s"), 
-                                   $subject."\n".$content, join(',',$this->userids)), 
+                          . sprintf(_("Error: Couldn't send %s to %s"),
+                                   $subject."\n".$content, join(',',$this->userids)),
                           E_USER_WARNING);
             return false;
         }
     }
-    
+
     /**
      * Send udiff for a changed page to multiple users.
      * See rename and remove methods also
@@ -246,9 +247,9 @@
 
         global $request;
 
-        if (@is_array($request->_deferredPageChangeNotification)) {
+        if (isset($request->_deferredPageChangeNotification)) {
             // collapse multiple changes (loaddir) into one email
-            $request->_deferredPageChangeNotification[] = 
+            $request->_deferredPageChangeNotification[] =
                 array($this->pagename, $this->emails, $this->userids);
             return;
         }
@@ -264,21 +265,21 @@
             if (empty($prevdata['%content']))
                 $prevdata = $backend->get_versiondata($this->pagename, $previous, true);
             $other_content = explode("\n", $prevdata['%content']);
-            
+
             include_once("lib/difflib.php");
             $diff2 = new Diff($other_content, $this_content);
             //$context_lines = max(4, count($other_content) + 1,
             //                     count($this_content) + 1);
             $fmt = new UnifiedDiffFormatter(/*$context_lines*/);
-            $content  = $this->pagename . " " . $previous . " " . 
+            $content  = $this->pagename . " " . $previous . " " .
                 Iso8601DateTime($prevdata['mtime']) . "\n";
-            $content .= $this->pagename . " " . $version . " " .  
+            $content .= $this->pagename . " " . $version . " " .
                 Iso8601DateTime($meta['mtime']) . "\n";
             $content .= $fmt->format($diff2);
-            
+
         } else {
             $difflink = WikiURL($this->pagename,array(),true);
-            $content = $this->pagename . " " . $version . " " .  
+            $content = $this->pagename . " " . $version . " " .
                 Iso8601DateTime($meta['mtime']) . "\n";
             $content .= _("New page");
             $content .= "\n\n";
@@ -286,25 +287,25 @@
         }
         $editedby = sprintf(_("Edited by: %s"), $this->from);
         $summary = sprintf(_("Summary: %s"), $meta['summary']);
-        $this->sendMail($subject, 
+        $this->sendMail($subject,
                         $editedby."\n".$summary."\n".$difflink."\n\n".$content);
     }
 
-    /** 
+    /**
      * Support mass rename / remove (not yet tested)
      */
     function sendPageRenameNotification ($to, &$meta) {
         global $request;
 
         if (@is_array($request->_deferredPageRenameNotification)) {
-            $request->_deferredPageRenameNotification[] = 
+            $request->_deferredPageRenameNotification[] =
                 array($this->pagename, $to, $meta, $this->emails, $this->userids);
         } else {
             $pagename = $this->pagename;
             $editedby = sprintf(_("Edited by: %s"), $this->from);
             $subject = sprintf(_("Page rename %s to %s"), $pagename, $to);
             $link = WikiURL($to, true);
-            $this->sendMail($subject, 
+            $this->sendMail($subject,
                             $editedby."\n".$link."\n\n"."Renamed $pagename to $to");
         }
     }
@@ -314,21 +315,21 @@
      */
     function onChangePage (&$wikidb, &$wikitext, $version, &$meta) {
         $result = true;
-	if (!isa($GLOBALS['request'],'MockRequest')) {
-	    $notify = $wikidb->get('notify');
+    if (!isa($GLOBALS['request'],'MockRequest')) {
+        $notify = $wikidb->get('notify');
             /* Generate notification emails? */
-	    if (!empty($notify) and is_array($notify)) {
+        if (!empty($notify) and is_array($notify)) {
                 if (empty($this->pagename))
                     $this->pagename = $meta['pagename'];
-		// TODO: Should be used for ModeratePage and RSS2 Cloud xml-rpc also.
+        // TODO: Should be used for ModeratePage and RSS2 Cloud xml-rpc also.
                 $this->getPageChangeEmails($notify);
                 if (!empty($this->emails)) {
                     $result = $this->sendPageChangeNotification($wikitext, $version, $meta);
                 }
-	    }
-	}
-	return $result;
+        }
     }
+    return $result;
+    }
 
     function onDeletePage (&$wikidb, $pagename) {
         $result = true;
@@ -349,20 +350,20 @@
 
     function onRenamePage (&$wikidb, $oldpage, $new_pagename) {
         $result = true;
-	if (!isa($GLOBALS['request'], 'MockRequest')) {
-	    $notify = $wikidb->get('notify');
-	    if (!empty($notify) and is_array($notify)) {
-		$this->getPageChangeEmails($notify);
-		if (!empty($this->emails)) {
-		    $newpage = $wikidb->getPage($new_pagename);
-		    $current = $newpage->getCurrentRevision();
-		    $meta = $current->_data;
+    if (!isa($GLOBALS['request'], 'MockRequest')) {
+        $notify = $wikidb->get('notify');
+        if (!empty($notify) and is_array($notify)) {
+        $this->getPageChangeEmails($notify);
+        if (!empty($this->emails)) {
+            $newpage = $wikidb->getPage($new_pagename);
+            $current = $newpage->getCurrentRevision();
+            $meta = $current->_data;
                     $this->pagename = $oldpage;
-		    $result = $this->sendPageRenameNotification($new_pagename, $meta);
-		}
-	    }
-	}
+            $result = $this->sendPageRenameNotification($new_pagename, $meta);
+        }
+        }
     }
+    }
 
     /**
      * Send mail to user and store the cookie in the db
@@ -387,10 +388,10 @@
 %s
 
 If this is *not* you, don't follow the link. This confirmation code
-will expire at %s.", 
-                       $ip, $userid, WIKI_NAME, WIKI_NAME, 
+will expire at %s.",
+                       $ip, $userid, WIKI_NAME, WIKI_NAME,
                        WikiURL(HOME_PAGE, array('action' => 'ConfirmEmail',
-                                                'id' => $id), 
+                                                'id' => $id),
                                true),
                        CTime($expire_date));
         $this->sendMail($subject, $content, "", true);
@@ -463,5 +464,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/PageList.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/PageList.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/PageList.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-//rcs_id('$Id: PageList.php 7710 2010-10-01 11:45:58Z vargenau $');
+//$Id: PageList.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -725,14 +725,14 @@
     }
 
     /**
-     * @param	caption	string or HTML
+     * @param    caption    string or HTML
      */
     function setCaption ($caption) {
         $this->_caption = $caption;
     }
 
     /**
-     * @param	caption	string or HTML
+     * @param    caption    string or HTML
      */
     function addCaption ($caption) {
         $this->_caption = HTML($this->_caption," ",$caption);
@@ -836,50 +836,50 @@
     /* ignore from, but honor limit */
     function addPages ($page_iter) {
         // TODO: if limit check max(strlen(pagename))
-	$limit = $page_iter->limit();
+    $limit = $page_iter->limit();
         $i = 0;
-	if ($limit) {
-	    list($from, $limit) = $this->limit($limit);
-	    $this->_options['slice'] = 0;
-	    $limit += $from;
+    if ($limit) {
+        list($from, $limit) = $this->limit($limit);
+        $this->_options['slice'] = 0;
+        $limit += $from;
             while ($page = $page_iter->next()) {
                 $i++;
                 if ($from and $i < $from)
                     continue;
-	        if (!$limit or ($limit and $i < $limit))
-		    $this->addPage($page);
+            if (!$limit or ($limit and $i < $limit))
+            $this->addPage($page);
             }
-	} else {
-	    $this->_options['slice'] = 0;
+    } else {
+        $this->_options['slice'] = 0;
             while ($page = $page_iter->next()) {
-		$this->addPage($page);
+        $this->addPage($page);
             }
-	}
-	if (! is_array($page_iter->_options) || ! array_key_exists('limit_by_db', $page_iter->_options) || ! $page_iter->_options['limit_by_db'])
-		$this->_options['slice'] = 1;
-	if ($i and empty($this->_options['count']))
-	    $this->_options['count'] = $i;
     }
+    if (! is_array($page_iter->_options) || ! array_key_exists('limit_by_db', $page_iter->_options) || ! $page_iter->_options['limit_by_db'])
+        $this->_options['slice'] = 1;
+    if ($i and empty($this->_options['count']))
+        $this->_options['count'] = $i;
+    }
 
     function addPageList (&$list) {
         if (empty($list)) return;  // Protect reset from a null arg
         if (isset($this->_options['limit'])) { // extract from,count from limit
-	    list($from, $limit) = WikiDB_backend::limit($this->_options['limit']);
-	    $limit += $from;
+        list($from, $limit) = WikiDB_backend::limit($this->_options['limit']);
+        $limit += $from;
         } else {
-	    $limit = 0;
+        $limit = 0;
         }
-	$this->_options['slice'] = 0;
+    $this->_options['slice'] = 0;
         $i = 0;
         foreach ($list as $page) {
             $i++;
             if ($from and $i < $from)
                 continue;
-	    if (!$limit or ($limit and $i < $limit)) {
+        if (!$limit or ($limit and $i < $limit)) {
                 if (is_object($page)) $page = $page->_pagename;
                 $this->addPage((string)$page);
-	    }
         }
+        }
     }
 
     function maxLen() {
@@ -1040,7 +1040,7 @@
         // expand wildcards from list of all pages
         if (preg_match('/[\?\*]/', $input) or substr($input,0,1) == "^") {
             include_once("lib/TextSearchQuery.php");
-            $search = new TextSearchQuery(str_replace(",", " ", $input), true,
+            $search = new TextSearchQuery(str_replace(",", " or ", $input), true,
                                          (substr($input,0,1) == "^") ? 'posix' : 'glob');
             $dbi = $GLOBALS['request']->getDbh();
             $iter = $dbi->titleSearch($search, $sortby, $limit, $exclude);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/PagePerm.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/PagePerm.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/PagePerm.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PagePerm.php 7659 2010-08-31 14:55:29Z vargenau $');
+// $Id: PagePerm.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -62,15 +62,15 @@
  */
 
 /* Symbolic special ACL groups. Untranslated to be stored in page metadata*/
-define('ACL_EVERY',	   '_EVERY');
-define('ACL_ANONYMOUS',	   '_ANONYMOUS');
-define('ACL_BOGOUSER',	   '_BOGOUSER');
+define('ACL_EVERY',       '_EVERY');
+define('ACL_ANONYMOUS',       '_ANONYMOUS');
+define('ACL_BOGOUSER',       '_BOGOUSER');
 define('ACL_HASHOMEPAGE',  '_HASHOMEPAGE');
-define('ACL_SIGNED',	   '_SIGNED');
+define('ACL_SIGNED',       '_SIGNED');
 define('ACL_AUTHENTICATED','_AUTHENTICATED');
-define('ACL_ADMIN',	   '_ADMIN');
-define('ACL_OWNER',	   '_OWNER');
-define('ACL_CREATOR',	   '_CREATOR');
+define('ACL_ADMIN',       '_ADMIN');
+define('ACL_OWNER',       '_OWNER');
+define('ACL_CREATOR',       '_CREATOR');
 
 // Return an page permissions array for this page.
 // To provide ui helpers to view and change page permissions:
@@ -90,7 +90,7 @@
         return array('page', $perm);
     // or no permissions defined; returned inherited permissions, to be displayed in gray
     } elseif ($pagename == '.') { // stop recursion in pathological case.
-    	// "." defined, without any acl
+        // "." defined, without any acl
         return array('default', new PagePermission());
     } else {
         return array('inherited', pagePermissions(getParentPage($pagename)));
@@ -106,9 +106,9 @@
         $perm = $perm_tree[1];
     elseif (is_array($perm_tree[1])) {
         $perm_tree = pagePermissionsSimpleFormat($perm_tree[1],$owner,$group);
-	if (isa($perm_tree[1],'pagepermission'))
-	    $perm = $perm_tree[1];
-	elseif (isa($perm_tree,'htmlelement'))
+    if (isa($perm_tree[1],'pagepermission'))
+        $perm = $perm_tree[1];
+    elseif (isa($perm_tree,'htmlelement'))
             return $perm_tree;
     }
     */
@@ -174,10 +174,10 @@
         return 'view';
 
     case 'dumpserial':
-	if (INSECURE_ACTIONS_LOCALHOST_ONLY and is_localhost())
-	    return 'dump';
-	else
-	    return 'view';
+    if (INSECURE_ACTIONS_LOCALHOST_ONLY and is_localhost())
+        return 'dump';
+    else
+        return 'view';
 
     // performance and security relevant
     case 'xmlrpc':
@@ -203,7 +203,7 @@
         break;
     case 'upload':
     case 'loadfile':
-	// probably create/edit but we cannot check all page permissions, can we?
+    // probably create/edit but we cannot check all page permissions, can we?
     case 'remove':
     case 'purge':
     case 'lock':
@@ -211,7 +211,7 @@
     case 'upgrade':
     case 'chown':
     case 'setacl':
-	return 'change';
+    return 'change';
     default:
         //Todo: Plugins should be able to override its access type
         if (isWikiWord($action))
@@ -237,10 +237,10 @@
 
     // Exceptions:
     if (FUSIONFORGE) {
-    	if ($pagename != '.' && isset($request->_user->_is_external) && $request->_user->_is_external && ! $page->get('external')) {
-    		$permcache[$pagename][$access] = 0;
-    		return 0;
-    	}
+        if ($pagename != '.' && isset($request->_user->_is_external) && $request->_user->_is_external && ! $page->get('external')) {
+            $permcache[$pagename][$access] = 0;
+            return 0;
+        }
     }
     if ((READONLY or $request->_dbi->readonly)
         and in_array($access, array('edit','create','change')))
@@ -260,7 +260,7 @@
         if ($pagename == '.') {
             $perm = new PagePermission();
             if ($perm->isAuthorized('change', $request->_user)) {
-            	// warn the user to set ACL of ".", if he has permissions to do so.
+                // warn the user to set ACL of ".", if he has permissions to do so.
                 trigger_error(". (dotpage == rootpage for inheriting pageperm ACLs) exists without any ACL!\n".
                               "Please do ?action=setacl&pagename=.", E_USER_WARNING);
             }
@@ -281,7 +281,7 @@
         $permcache[$pagename][$access] = $authorized;
         return $authorized;
     } elseif ($pagename == '.') {
-    	return false;
+        return false;
     } else {
         return _requiredAuthorityForPagename($access, getParentPage($pagename));
     }
@@ -372,7 +372,7 @@
      */
     function isAuthorized($access, $user) {
         $allow = -1;
-    	if (!empty($this->perm{$access})) {
+        if (!empty($this->perm{$access})) {
             foreach ($this->perm[$access] as $group => $bool) {
                 if ($this->isMember($user, $group)) {
                     return $bool;
@@ -456,29 +456,29 @@
             $perm['dump'] = array(ACL_ADMIN => true,
                                   ACL_OWNER => true);
         elseif (INSECURE_ACTIONS_LOCALHOST_ONLY) {
-	    if (is_localhost())
-		$perm['dump'] = array(ACL_EVERY => true);
-	    else
-		$perm['dump'] = array(ACL_ADMIN => true);
-	}
-	else
-	    $perm['dump'] = array(ACL_EVERY => true);
+        if (is_localhost())
+        $perm['dump'] = array(ACL_EVERY => true);
+        else
+        $perm['dump'] = array(ACL_ADMIN => true);
+    }
+    else
+        $perm['dump'] = array(ACL_EVERY => true);
         if (defined('REQUIRE_SIGNIN_BEFORE_EDIT') && REQUIRE_SIGNIN_BEFORE_EDIT)
             $perm['edit'] = array(ACL_SIGNED => true);
         // view:
         if (!ALLOW_ANON_USER) {
             if (!ALLOW_USER_PASSWORDS)
-            	$perm['view'] = array(ACL_SIGNED => true);
+                $perm['view'] = array(ACL_SIGNED => true);
             else
-            	$perm['view'] = array(ACL_AUTHENTICATED => true);
+                $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);
+                $perm['edit'] = array(ACL_SIGNED => true);
             else
-            	$perm['edit'] = array(ACL_AUTHENTICATED => true);
+                $perm['edit'] = array(ACL_AUTHENTICATED => true);
             $perm['edit'][ACL_BOGOUSER] = ALLOW_BOGO_LOGIN ? true : false;
             $perm['create'] = $perm['edit'];
         }
@@ -500,9 +500,9 @@
      * do a recursive comparison
      */
     function equal($otherperm) {
-    	// The equal function seems to be unable to detect removed perm.
-    	// Use case is when a rule is removed.
-    	return (print_r($this->perm, true) === print_r($otherperm, true));
+        // The equal function seems to be unable to detect removed perm.
+        // Use case is when a rule is removed.
+        return (print_r($this->perm, true) === print_r($otherperm, true));
     }
 
     /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/PageType.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/PageType.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/PageType.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PageType.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: PageType.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 1999,2000,2001,2002,2003,2004,2005,2006 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -34,18 +34,18 @@
      *        pagetype than that specified in its version meta-data.
      */
     function TransformedText($page, $text, $meta, $type_override=false) {
-    	$pagetype = false;
+        $pagetype = false;
         if ($type_override)
             $pagetype = $type_override;
         elseif (isset($meta['pagetype']))
             $pagetype = $meta['pagetype'];
-	$this->_type = PageType::GetPageType($pagetype);
-	$this->CacheableMarkup($this->_type->transform($page, $text, $meta),
+    $this->_type = PageType::GetPageType($pagetype);
+    $this->CacheableMarkup($this->_type->transform($page, $text, $meta),
                                $page->getName());
     }
 
     function getType() {
-	return $this->_type;
+    return $this->_type;
     }
 }
 
@@ -90,9 +90,9 @@
      * @return string  Page type name.
      */
     function getName() {
-	if (!preg_match('/^PageType_(.+)$/i', get_class($this), $m))
-	    trigger_error("Bad class name for formatter(?)", E_USER_ERROR);
-	return $m[1];
+    if (!preg_match('/^PageType_(.+)$/i', get_class($this), $m))
+        trigger_error("Bad class name for formatter(?)", E_USER_ERROR);
+    return $m[1];
     }
 
     /**
@@ -155,7 +155,7 @@
     }
 
     function GetMap ($pagetext = false) {
-    	/*PHP5 Fatal error: Using $this when not in object context */
+        /*PHP5 Fatal error: Using $this when not in object context */
         if (empty($this->_map)) {
             $map = new PageType_interwikimap($pagetext);
             return $map;
@@ -169,7 +169,7 @@
     }
 
     function link ($link, $linktext = false) {
-	global $WikiTheme;
+    global $WikiTheme;
         list ($moniker, $page) = explode (":", $link, 2);
 
         if (!isset($this->_map[$moniker])) {
@@ -178,26 +178,26 @@
         }
 
         $url = $this->_map[$moniker];
-	// localize Upload:links for WIKIDUMP
-	if (!empty($WikiTheme->DUMP_MODE) and $moniker == 'Upload') {
-	    global $request;
-	    include_once("lib/config.php");
-	    $url = getUploadFilePath();
-	    // calculate to a relative local path to /uploads for pdf images.
-	    $doc_root = $request->get("DOCUMENT_ROOT");
-    	    $ldir = NormalizeLocalFileName($url);
+    // localize Upload:links for WIKIDUMP
+    if (!empty($WikiTheme->DUMP_MODE) and $moniker == 'Upload') {
+        global $request;
+        include_once("lib/config.php");
+        $url = getUploadFilePath();
+        // calculate to a relative local path to /uploads for pdf images.
+        $doc_root = $request->get("DOCUMENT_ROOT");
+            $ldir = NormalizeLocalFileName($url);
             $wikiroot = NormalizeLocalFileName('');
             if (isWindows()) {
-            	$ldir = strtolower($ldir);
-            	$doc_root = strtolower($doc_root);
-            	$wikiroot = strtolower($wikiroot);
+                $ldir = strtolower($ldir);
+                $doc_root = strtolower($doc_root);
+                $wikiroot = strtolower($wikiroot);
             }
-    	    if (string_starts_with($ldir, $doc_root)) {
-        	$link_prefix = substr($url, strlen($doc_root));
-    	    } elseif (string_starts_with($ldir, $wikiroot)) {
-        	$link_prefix = NormalizeWebFileName(substr($url, strlen($wikiroot)));
-	    }
-	}
+            if (string_starts_with($ldir, $doc_root)) {
+            $link_prefix = substr($url, strlen($doc_root));
+            } elseif (string_starts_with($ldir, $wikiroot)) {
+            $link_prefix = NormalizeWebFileName(substr($url, strlen($wikiroot)));
+        }
+    }
 
         // Urlencode page only if it's a query arg.
         // FIXME: this is a somewhat broken heuristic.
@@ -214,7 +214,7 @@
 
         $link = HTML::a(array('href' => $url));
 
-	if (!$linktext) {
+    if (!$linktext) {
             $link->pushContent(PossiblyGlueIconToText('interwiki', "$moniker:"),
                                HTML::span(array('class' => 'wikipage'), $page));
             $link->setAttr('class', 'interwiki');
@@ -331,18 +331,18 @@
      */
     function PageFormatter(&$page, $meta) {
         $this->_page = $page;
-	$this->_meta = $meta;
-	if (!empty($meta['markup']))
-	    $this->_markup = $meta['markup'];
-	else
-	    $this->_markup = 2; // dump used old-markup as empty.
+    $this->_meta = $meta;
+    if (!empty($meta['markup']))
+        $this->_markup = $meta['markup'];
+    else
+        $this->_markup = 2; // dump used old-markup as empty.
         // FIXME: To be able to restore old plain-backups we should keep markup 1 as default.
         // New policy: default = new markup (old crashes quite often)
     }
 
     function _transform(&$text) {
-	include_once('lib/BlockParser.php');
-	return TransformText($text, $this->_markup);
+    include_once('lib/BlockParser.php');
+    return TransformText($text, $this->_markup);
     }
 
     /** Transform the page text.
@@ -358,26 +358,26 @@
 class PageFormatter_wikitext extends PageFormatter
 {
     function format(&$text) {
-	return HTML::div(array('class' => 'wikitext'),
-			 $this->_transform($text));
+    return HTML::div(array('class' => 'wikitext'),
+             $this->_transform($text));
     }
 }
 
 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) {
-	return preg_replace('/<verbatim>.*/s', '', $text);
+    return preg_replace('/<verbatim>.*/s', '', $text);
     }
 
     function _getFooter($text) {
-	return preg_replace('@.*?(</verbatim>|\Z)@s', '', $text, 1);
+    return preg_replace('@.*?(</verbatim>|\Z)@s', '', $text, 1);
     }
 
     function _getMap($pagetext) {
@@ -386,23 +386,23 @@
     }
 
     function _formatMap($pagetext) {
-	$map = $this->_getMap($pagetext);
-	if (!$map)
-	    return HTML::p("<No interwiki map found>"); // Shouldn't happen.
+    $map = $this->_getMap($pagetext);
+    if (!$map)
+        return HTML::p("<No interwiki map found>"); // Shouldn't happen.
 
         $mon_attr = array('class' => 'interwiki-moniker');
         $url_attr = array('class' => 'interwiki-url');
 
         $thead = HTML::thead(HTML::tr(HTML::th($mon_attr, _("Moniker")),
-				      HTML::th($url_attr, _("InterWiki Address"))));
-	foreach ($map as $moniker => $interurl) {
-	    $rows[] = HTML::tr(HTML::td($mon_attr, new Cached_WikiLinkIfKnown($moniker)),
-			       HTML::td($url_attr, HTML::tt($interurl)));
+                      HTML::th($url_attr, _("InterWiki Address"))));
+    foreach ($map as $moniker => $interurl) {
+        $rows[] = HTML::tr(HTML::td($mon_attr, new Cached_WikiLinkIfKnown($moniker)),
+                   HTML::td($url_attr, HTML::tt($interurl)));
         }
 
-	return HTML::table(array('class' => 'interwiki-map'),
-			   $thead,
-			   HTML::tbody(false, $rows));
+    return HTML::table(array('class' => 'interwiki-map'),
+               $thead,
+               HTML::tbody(false, $rows));
     }
 }
 
@@ -425,8 +425,8 @@
 
     // Display templated contents for wikiblog, comment and wikiforum
     function format($text) {
-    	if (empty($this->type))
-    	    trigger_error('PageFormatter_attach->format: $type missing');
+        if (empty($this->type))
+            trigger_error('PageFormatter_attach->format: $type missing');
         include_once('lib/Template.php');
         global $request;
         $tokens['CONTENT'] = $this->_transform($text);
@@ -466,10 +466,10 @@
 class PageFormatter_html extends PageFormatter
 {
     function _transform($text) {
-	return $text;
+    return $text;
     }
     function format($text) {
-    	return $text;
+        return $text;
     }
 }
 
@@ -480,8 +480,8 @@
 {
 
     function _transform($text) {
-	include_once('lib/BlockParser.php');
-	return TransformText($text, $this->_markup);
+    include_once('lib/BlockParser.php');
+    return TransformText($text, $this->_markup);
     }
 
     // one page or set of pages?
@@ -530,18 +530,18 @@
 class PageFormatter_MediaWiki extends PageFormatter
 {
     function _transform(&$text) {
-	include_once('lib/BlockParser.php');
-	// Expand leading tabs.
-	$text = expand_tabs($text);
+    include_once('lib/BlockParser.php');
+    // Expand leading tabs.
+    $text = expand_tabs($text);
 
         $input = new BlockParser_Input($text);
         $output = $this->ParsedBlock($input);
-	return new XmlContent($output->getContent());
+    return new XmlContent($output->getContent());
     }
 
     function format(&$text) {
-	return HTML::div(array('class' => 'wikitext'),
-			 $this->_transform($text));
+    return HTML::div(array('class' => 'wikitext'),
+             $this->_transform($text));
     }
 }
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/RSSWriter091.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/RSSWriter091.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/RSSWriter091.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -21,7 +21,7 @@
 // for outputting RecentChanges in RSS 0.91 format
 // ----------------------------------------------------------------------
 
-// rcs_id('$Id: RSSWriter091.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RSSWriter091.php 7964 2011-03-05 17:05:30Z vargenau $
 
 include_once("lib/RssWriter.php");
 class RSSWriter091 extends RSSWriter
@@ -38,13 +38,13 @@
     {
         if (isset($this->_finished))
             return;
-      
+
         $channel = &$this->_channel;
         $items = &$this->_items;
-    
+
         if ($items)
             {
-		foreach ($items as $i)
+        foreach ($items as $i)
                     $channel->pushContent($i);
             }
         $this->pushContent($channel);
@@ -56,7 +56,7 @@
      * Create a new RDF <em>typedNode</em>.
      */
     function __node($type, $properties, $uri = false) {
-	return new XmlElement($type, '',
+    return new XmlElement($type, '',
                               $this->__elementize($properties));
     }
 
@@ -66,8 +66,8 @@
     function __spew() {
         header("Content-Type: application/xml; charset=" . RSS_ENCODING);
         printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", RSS_ENCODING);
-		print("<!DOCTYPE rss PUBLIC \"-//Netscape Communications//DTD RSS 0.91//EN\"\n");
-		print("\"http://my.netscape.com/publish/formats/rss-0.91.dtd\">\n\n");
+        print("<!DOCTYPE rss PUBLIC \"-//Netscape Communications//DTD RSS 0.91//EN\"\n");
+        print("\"http://my.netscape.com/publish/formats/rss-0.91.dtd\">\n\n");
         $this->printXML();
     }
 
@@ -114,24 +114,24 @@
                      'language' => 'en-US');
 
         /* FIXME: language should come from $LANG (or other config variable). */
-      
-        /* FIXME: other things one might like in <channel>:                 
+
+        /* FIXME: other things one might like in <channel>:
          * managingEditor
          * webmaster
          * lastBuildDate
          * copyright
          */
     }
-  
-      
+
+
     function item_properties ($rev)
     {
         $page = $rev->getPage();
         $pagename = $page->getName();
-      
-        return array( 'title'		=> SplitPagename($pagename),
-                      'description'	=> $this->summary($rev),
-                      'link'		=> $this->pageURL($rev)                
+
+        return array( 'title'        => SplitPagename($pagename),
+                      'description'    => $this->summary($rev),
+                      'link'        => $this->pageURL($rev)
                       );
     }
 }
@@ -142,5 +142,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/Request.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/Request.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/Request.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,8 +1,8 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Request.php 7552 2010-06-19 22:08:10Z rurban $');
+// $Id: Request.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2002,2004,2005,2006,2009 $ThePhpWikiProgrammingTeam
- * 
+ *
  * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
@@ -16,16 +16,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 class Request {
-        
+
     function Request() {
         $this->_fix_magic_quotes_gpc();
         $this->_fix_multipart_form_data();
-        
+
         switch($this->get('REQUEST_METHOD')) {
         case 'GET':
         case 'HEAD':
@@ -38,14 +38,14 @@
             $this->args = array();
             break;
         }
-        
+
         $this->session = new Request_SessionVars;
         $this->cookies = new Request_CookieVars;
-        
+
         if (ACCESS_LOG or ACCESS_LOG_SQL) {
             $this->_accesslog = new Request_AccessLog(ACCESS_LOG, ACCESS_LOG_SQL);
         }
-        
+
         $GLOBALS['request'] = $this;
     }
 
@@ -84,14 +84,14 @@
     function getArgs () {
         return $this->args;
     }
-    
+
     function setArg($key, $val) {
         if ($val === false)
             unset($this->args[$key]);
         else
             $this->args[$key] = $val;
     }
-    
+
     // Well oh well. Do we really want to pass POST params back as GET?
     function getURLtoSelf($args = false, $exclude = array()) {
         $get_args = $this->args;
@@ -140,13 +140,13 @@
             return false;
         return (float) $m[1];
     }
-    
-    /* Redirects after edit may fail if no theme signature image is defined. 
+
+    /* Redirects after edit may fail if no theme signature image is defined.
      * Set DISABLE_HTTP_REDIRECT = true then.
      */
     function redirect($url, $noreturn = true) {
         $bogus = defined('DISABLE_HTTP_REDIRECT') && DISABLE_HTTP_REDIRECT;
-        
+
         if (!$bogus) {
             header("Location: $url");
             /*
@@ -175,7 +175,7 @@
         if ($noreturn) {
             $this->discardOutput(); // This might print the gzip headers. Not good.
             $this->buffer_output(false);
-            
+
             include_once('lib/Template.php');
             $tmpl = new Template('redirect', $this, array('REDIRECT_URL' => $url));
             $tmpl->printXML();
@@ -226,11 +226,11 @@
             $validator_set = new HTTP_ValidatorSet($validator_set);
         $this->_validators = $validator_set;
     }
-    
-    /** Append more validators for this response. 
+
+    /** Append more validators for this response.
      *  i.e dependencies on other pages mtimes
      *  now it may be called in init also to simplify client code.
-     */ 
+     */
     function appendValidators($validator_set) {
         if (!isset($this->_validators)) {
             $this->setValidators($validator_set);
@@ -238,7 +238,7 @@
         }
         $this->_validators->append($validator_set);
     }
-    
+
     /** Check validators and set headers in HTTP response
      *
      * This sets the appropriate "Last-Modified" and "ETag"
@@ -251,7 +251,7 @@
      */
     function checkValidators() {
         $validators = &$this->_validators;
-        
+
         // Set validator headers
         if (!empty($this->_is_buffering_output) or !headers_sent()) {
             if (($etag = $validators->getETag()) !== false)
@@ -265,7 +265,7 @@
 
         if (CACHE_CONTROL == 'NO_CACHE')
             return;             // don't check conditionals...
-        
+
         // Check conditional headers in request
         $status = $validators->checkConditionalRequest($this);
         if ($status) {
@@ -296,7 +296,7 @@
         header("Expires: " . Rfc1123DateTime(time() + $max_age));
         header("Vary: Cookie"); // FIXME: add more here?
     }
-    
+
     function setStatus($status) {
         if (preg_match('|^HTTP/.*?\s(\d+)|i', $status, $m)) {
             header($status);
@@ -333,19 +333,19 @@
         }
         elseif (isCGI()) // necessary?
             $compress = false;
-            
+
         if ($this->getArg('start_debug')) $compress = false;
         if ($this->getArg('nocache'))
             $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.
-        if ($compress 
-            and (!function_exists('ob_gzhandler') 
-                 or !function_exists('apache_note'))) 
+        if ($compress
+            and (!function_exists('ob_gzhandler')
+                 or !function_exists('apache_note')))
             $compress = false;
-            
+
         // "output handler 'ob_gzhandler' cannot be used twice"
         // http://www.php.net/ob_gzhandler
         if ($compress and ini_get("zlib.output_compression"))
@@ -358,21 +358,21 @@
                  or !strstr($this->get("HTTP_ACCEPT_ENCODING"), "gzip")))
             $compress = false;
 
-        // Most RSS clients are NOT(!) application/xml gzip compatible yet. 
+        // Most RSS clients are NOT(!) application/xml gzip compatible yet.
         // Even if they are sending the accept-encoding gzip header!
         // wget is, Mozilla, and MSIE no.
         // Of the RSS readers only MagpieRSS 0.5.2 is. http://www.rssgov.com/rssparsers.html
         // See also http://phpwiki.sourceforge.net/phpwiki/KnownBugs
-        if ($compress 
-            and $this->getArg('format') 
+        if ($compress
+            and $this->getArg('format')
             and strstr($this->getArg('format'), 'rss'))
             $compress = false;
 
         if ($compress) {
             ob_start('phpwiki_gzhandler');
-            
+
             // TODO: dont send a length or get the gzip'ed data length.
-            $this->_is_compressing_output = true; 
+            $this->_is_compressing_output = true;
             header("Content-Encoding: gzip");
             /*
              * Attempt to prevent Apache from doing the dreaded double-gzip.
@@ -405,18 +405,18 @@
         }
     }
 
-    /** 
+    /**
      * Longer texts need too much memory on tiny or memory-limit=8MB systems.
      * We might want to flush our buffer and restart again.
      * (This would be fine if php would release its memory)
-     * Note that this must not be called inside Template expansion or other 
+     * Note that this must not be called inside Template expansion or other
      * sections with ob_buffering.
      */
     function chunkOutput() {
-        if (!empty($this->_is_buffering_output) 
-	    or 
-            (function_exists('ob_get_level') and @ob_get_level())) 
-	{
+        if (!empty($this->_is_buffering_output)
+        or
+            (function_exists('ob_get_level') and @ob_get_level()))
+    {
             $this->_do_chunked_output = true;
             if (empty($this->_ob_get_length)) $this->_ob_get_length = 0;
             $this->_ob_get_length += ob_get_length();
@@ -427,7 +427,7 @@
     }
 
     function finish() {
-    	$this->_finishing = true;
+        $this->_finishing = true;
         if (!empty($this->_accesslog)) {
             $this->_accesslog->push($this);
             if (empty($this->_do_chunked_output) and empty($this->_ob_get_length))
@@ -439,11 +439,11 @@
             if (isset($this->_accesslog->logtable))
                 $this->_accesslog->write_sql();
         }
-        
+
         if (!empty($this->_is_buffering_output)) {
-            // if _is_compressing_output then ob_get_length() returns 
+            // 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) {
+        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)) {
@@ -454,7 +454,7 @@
             }
             $this->_is_buffering_output = false;
             ob_end_flush();
-	} elseif (function_exists('ob_get_level') and @ob_get_level()) {
+    } elseif (function_exists('ob_get_level') and @ob_get_level()) {
             ob_end_flush();
         }
         session_write_close();
@@ -506,19 +506,19 @@
     function deleteCookieVar($key) {
         return $this->cookies->delete($key);
     }
-    
+
     function getUploadedFile($key) {
         return Request_UploadedFile::getUploadedFile($key);
     }
-    
 
+
     function _fix_magic_quotes_gpc() {
         $needs_fix = array('HTTP_POST_VARS',
                            'HTTP_GET_VARS',
                            'HTTP_COOKIE_VARS',
                            'HTTP_SERVER_VARS',
                            'HTTP_POST_FILES');
-        
+
         // Fix magic quotes.
         if (get_magic_quotes_gpc()) {
             foreach ($needs_fix as $vars)
@@ -534,12 +534,12 @@
         elseif (is_string($var))
             $var = stripslashes($var);
     }
-    
+
     function _fix_multipart_form_data () {
         if (preg_match('|^multipart/form-data|', $this->get('CONTENT_TYPE')))
             $this->_strip_leading_nl($GLOBALS['HTTP_POST_VARS']);
     }
-    
+
     function _strip_leading_nl(&$var) {
         if (is_array($var)) {
             foreach ($var as $key => $val)
@@ -554,13 +554,13 @@
     function Request_SessionVars() {
         // Prevent cacheing problems with IE 5
         session_cache_limiter('none');
-                                        
+
         // Avoid to get a notice if session is already started,
         // for example if session.auto_start is activated
         if (!session_id())
             session_start();
     }
-    
+
     function get($key) {
         $vars = &$GLOBALS['HTTP_SESSION_VARS'];
         if (isset($vars[$key]))
@@ -569,7 +569,7 @@
             return $_SESSION[$key];
         return false;
     }
-    
+
     function set($key, $val) {
         $vars = &$GLOBALS['HTTP_SESSION_VARS'];
         if (!function_usable('get_cfg_var') or get_cfg_var('register_globals')) {
@@ -582,7 +582,7 @@
         if (!check_php_version(5,3))
             session_register($key);
     }
-    
+
     function delete($key) {
         $vars = &$GLOBALS['HTTP_SESSION_VARS'];
         if (!function_usable('ini_get') or ini_get('register_globals'))
@@ -597,7 +597,7 @@
 }
 
 class Request_CookieVars {
-    
+
     function get($key) {
         $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
         if (isset($vars[$key])) {
@@ -634,8 +634,8 @@
     }
 
     function set($key, $val, $persist_days = false, $path = false) {
-    	// if already defined, ignore
-    	if (defined('MAIN_setUser') and $key = getCookieName()) return;
+        // if already defined, ignore
+        if (defined('MAIN_setUser') and $key = getCookieName()) return;
         if (defined('WIKI_XMLRPC') and WIKI_XMLRPC) return;
 
         $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
@@ -656,16 +656,16 @@
         else
             @setcookie($key, $packedval, $expires);
     }
-    
+
     function delete($key) {
         static $deleted = array();
         if (isset($deleted[$key])) return;
         if (defined('WIKI_XMLRPC') and WIKI_XMLRPC) return;
-        
+
         $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
         if (!defined('COOKIE_DOMAIN'))
             @setcookie($key, '', 0);
-        else    
+        else
             @setcookie($key, '', 0, COOKIE_DOMAIN);
         unset($GLOBALS['HTTP_COOKIE_VARS'][$key]);
         unset($_COOKIE[$key]);
@@ -676,7 +676,7 @@
 /* Win32 Note:
    [\winnt\php.ini]
    You must set "upload_tmp_dir" = "/tmp/" or "C:/tmp/"
-   Best on the same drive as apache, with forward slashes 
+   Best on the same drive as apache, with forward slashes
    and with ending slash!
    Otherwise "\\" => "" and the uploaded file will not be found.
 */
@@ -689,7 +689,7 @@
             $HTTP_POST_FILES =& $_FILES;
         if (!isset($HTTP_POST_FILES[$postname]))
             return false;
-        
+
         $fileinfo =& $HTTP_POST_FILES[$postname];
         if ($fileinfo['error']) {
             // See https://sourceforge.net/forum/message.php?msg_id=3093651
@@ -725,20 +725,20 @@
                 /* ending slash in php.ini upload_tmp_dir is required. */
                 if (realpath(ereg_replace('/+', '/', $tmp_file)) != realpath($fileinfo['tmp_name'])) {
                     trigger_error(sprintf("Uploaded tmpfile illegal: %s != %s.",$tmp_file, $fileinfo['tmp_name']).
-                    	          "\n".
-                    	          "Probably illegal TEMP environment or upload_tmp_dir setting. ".
-                    	          "Esp. on WINDOWS be sure to set upload_tmp_dir in php.ini to use forward slashes and ".
-                    	          "end with a slash. upload_tmp_dir = \"C:/WINDOWS/TEMP/\" is good suggestion.",
+                                  "\n".
+                                  "Probably illegal TEMP environment or upload_tmp_dir setting. ".
+                                  "Esp. on WINDOWS be sure to set upload_tmp_dir in php.ini to use forward slashes and ".
+                                  "end with a slash. upload_tmp_dir = \"C:/WINDOWS/TEMP/\" is good suggestion.",
                                   E_USER_ERROR);
                     return false;
                 } else {
                     /*
                     trigger_error(sprintf("Workaround for PHP/Windows is_uploaded_file() problem for %s.",
                                           $fileinfo['tmp_name'])."\n".
-            	                  "Probably illegal TEMP environment or upload_tmp_dir setting.", 
-            	                  E_USER_NOTICE);
-            	    */
-            	    ;
+                                  "Probably illegal TEMP environment or upload_tmp_dir setting.",
+                                  E_USER_NOTICE);
+                    */
+                    ;
                 }
             } else {
               trigger_error(sprintf("Uploaded tmpfile %s not found.", $fileinfo['tmp_name'])."\n".
@@ -748,7 +748,7 @@
         }
         return new Request_UploadedFile($fileinfo);
     }
-    
+
     function Request_UploadedFile($fileinfo) {
         $this->_info = $fileinfo;
     }
@@ -828,7 +828,7 @@
         //$request->_accesslog =& $this;
         //if (empty($request->_accesslog->entries))
         register_shutdown_function("Request_AccessLogEntry_shutdown_function");
-        
+
         if ($do_sql) {
             global $DBParams;
             if (!in_array($DBParams['dbtype'], array('SQL','ADODB'))) {
@@ -901,7 +901,7 @@
     function get_host($host, $since_minutes=20) {
         if ($this->logtable) {
             // mysql specific only:
-            return $this->read_sql("request_host=".$this->_dbi->quote($host)." AND time_stamp > ". (time()-$since_minutes*60) 
+            return $this->read_sql("request_host=".$this->_dbi->quote($host)." AND time_stamp > ". (time()-$since_minutes*60)
                             ." ORDER BY time_stamp DESC");
         } else {
             $iter = new WikiDB_Array_generic_iter();
@@ -933,7 +933,7 @@
         if ($s = fgets($this->reader)) {
             $entry = new Request_AccessLogEntry($this);
             if (preg_match('/^(\S+)\s(\S+)\s(\S+)\s\[(.+?)\] "([^"]+)" (\d+) (\d+) "([^"]*)" "([^"]*)"$/',$s,$m)) {
-            	list(,$entry->host, $entry->ident, $entry->user, $entry->time,
+                list(,$entry->host, $entry->ident, $entry->user, $entry->time,
                      $entry->request, $entry->status, $entry->size,
                      $entry->referer, $entry->user_agent) = $m;
             }
@@ -959,7 +959,7 @@
 
     /* done in request->finish() before the db is closed */
     function write_sql() {
-    	$dbh =& $GLOBALS['request']->_dbi;
+        $dbh =& $GLOBALS['request']->_dbi;
         if (isset($this->entries) and $dbh and $dbh->isOpen())
             foreach ($this->entries as $entry) {
                 $entry->write_sql();
@@ -986,7 +986,7 @@
     /**
      * Constructor.
      *
-     * The log entry will be automatically appended to the log file or 
+     * The log entry will be automatically appended to the log file or
      * SQL table when the current request terminates.
      *
      * If you want to modify a Request_AccessLogEntry before it gets
@@ -1007,7 +1007,7 @@
         $this->logfile = $accesslog->logfile;
         $this->time = time();
         $this->status = 200;    // see setStatus()
-        $this->size = 0;	// see setSize()
+        $this->size = 0;    // see setSize()
     }
 
     /**
@@ -1038,7 +1038,7 @@
     function setStatus ($status) {
         $this->status = $status;
     }
-    
+
     /**
      * Set response size.
      *
@@ -1052,7 +1052,7 @@
         // Workaround:
         $this->duration = strtr(sprintf("%f", $seconds),",",".");
     }
-    
+
     /**
      * Get time zone offset.
      *
@@ -1121,8 +1121,8 @@
     /* This is better been done by apache mod_log_sql */
     /* If ACCESS_LOG_SQL & 2 we do write it by our own */
     function write_sql() {
-    	global $request;
-    	
+        global $request;
+
         $dbh =& $request->_dbi;
         if ($dbh and $dbh->isOpen() and $this->_accesslog->logtable) {
             //$log_tbl =& $this->_accesslog->logtable;
@@ -1136,7 +1136,7 @@
                 if (!empty($args['pref']['passwd2']))   $args['pref']['passwd2'] = '<not displayed>';
                 $this->request_args = substr(serialize($args),0,254); // if VARCHAR(255) is used.
             } else {
-          	$this->request_args = $request->get('QUERY_STRING'); 
+              $this->request_args = $request->get('QUERY_STRING');
             }
             $this->request_method = $request->get('REQUEST_METHOD');
             $this->request_uri = $request->get('REQUEST_URI');
@@ -1154,7 +1154,7 @@
  */
 function Request_AccessLogEntry_shutdown_function () {
     global $request;
-    
+
     if (isset($request->_accesslog->entries) and $request->_accesslog->logfile)
         foreach ($request->_accesslog->entries as $entry) {
             $entry->write_file();
@@ -1224,16 +1224,16 @@
 
 // Possible results from the HTTP_ValidatorSet::_check*() methods.
 // (Higher numerical values take precedence.)
-define ('_HTTP_VAL_PASS', 0);         	// Test is irrelevant
-define ('_HTTP_VAL_NOT_MODIFIED', 1); 	// Test passed, content not changed
-define ('_HTTP_VAL_MODIFIED', 2); 	// Test failed, content changed
-define ('_HTTP_VAL_FAILED', 3);   	// Precondition failed.
+define ('_HTTP_VAL_PASS', 0);             // Test is irrelevant
+define ('_HTTP_VAL_NOT_MODIFIED', 1);     // Test passed, content not changed
+define ('_HTTP_VAL_MODIFIED', 2);     // Test failed, content changed
+define ('_HTTP_VAL_FAILED', 3);       // Precondition failed.
 
 class HTTP_ValidatorSet {
     function HTTP_ValidatorSet($validators) {
         $this->_mtime = $this->_weak = false;
         $this->_tag = array();
-        
+
         foreach ($validators as $key => $val) {
             if ($key == '%mtime') {
                 $this->_mtime = $val;
@@ -1275,7 +1275,7 @@
     function getModificationTime() {
         return $this->_mtime;
     }
-    
+
     function checkConditionalRequest (&$request) {
         $result = max($this->_checkIfUnmodifiedSince($request),
                       $this->_checkIfModifiedSince($request),
@@ -1347,5 +1347,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/RssParser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/RssParser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/RssParser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RssParser.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: RssParser.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Simple RSSParser Class
  * Based on Duncan Gough RSSParser class
@@ -25,7 +25,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -78,7 +78,7 @@
                 $this->items = array();
                 $GLOBALS['rss_parser_items'] =& $this->items;
             } elseif (!empty($this->items[0]['link']) and $this->items[0]['title'] == '') {
-            	// override the initial <items> list with detailed <item>'s
+                // override the initial <items> list with detailed <item>'s
                 $this->items = array();
                 $GLOBALS['rss_parser_items'] =& $this->items;
             }
@@ -124,15 +124,15 @@
             if (empty($this->item[$current_tag]))
                 $this->item[$current_tag] = '';
             if ($current_tag == 'LINK') {
-            	if (trim($data))
-            	    $this->item[$current_tag] = trim($data);
+                if (trim($data))
+                    $this->item[$current_tag] = trim($data);
             } else {
                 $this->item[$current_tag] .= trim($data);
             }
         } elseif ($this->list_items) {
             if ($current_tag == 'RDF:LI') {
-            	// FIXME: avoid duplicates. cdata called back 4x per RDF:LI
-            	if ($this->items[count($this->items)-1]['link'] != @$current_attrs['RDF:RESOURCE'])
+                // FIXME: avoid duplicates. cdata called back 4x per RDF:LI
+                if ($this->items[count($this->items)-1]['link'] != @$current_attrs['RDF:RESOURCE'])
                     $this->items[] = array('link' => @$current_attrs['RDF:RESOURCE'],
                                            'title' => '');
             }
@@ -169,12 +169,12 @@
                           E_USER_WARNING);
         //OO workaround: parser object looses its params. we have to store them in globals
         if ($is_final) {
-    	    if (empty($this->items)) {
+            if (empty($this->items)) {
                 $this->items   = @$GLOBALS['rss_parser_items'];
                 $this->channel = @$GLOBALS['rss_parser_channel'];
-    	    }
-    	    unset($GLOBALS['rss_parser_items']);
-    	    unset($GLOBALS['rss_parser_channel']);
+            }
+            unset($GLOBALS['rss_parser_items']);
+            unset($GLOBALS['rss_parser_channel']);
         }
     }
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/RssWriter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/RssWriter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/RssWriter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: RssWriter.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: RssWriter.php 7964 2011-03-05 17:05:30Z vargenau $
 /*
  * Code for creating RSS 1.0.
  */
@@ -20,30 +20,30 @@
                           array('xmlns' => "http://purl.org/rss/1.0/",
                                 'xmlns:rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'));
 
-	$this->_modules = array(
+    $this->_modules = array(
             //Standards
-	    'content'	=> "http://purl.org/rss/1.0/modules/content/",
-	    'dc'	=> "http://purl.org/dc/elements/1.1/",
-	    'sy'	=> "http://purl.org/rss/1.0/modules/syndication/",
+        'content'    => "http://purl.org/rss/1.0/modules/content/",
+        'dc'    => "http://purl.org/dc/elements/1.1/",
+        'sy'    => "http://purl.org/rss/1.0/modules/syndication/",
             //Proposed
             'wiki'      => "http://purl.org/rss/1.0/modules/wiki/",
-	    'ag'	=> "http://purl.org/rss/1.0/modules/aggregation/",
-	    'annotate'	=> "http://purl.org/rss/1.0/modules/annotate/",
-	    'audio'	=> "http://media.tangent.org/rss/1.0/",
-	    'cp'	=> "http://my.theinfo.org/changed/1.0/rss/",
-	    'rss091'	=> "http://purl.org/rss/1.0/modules/rss091/",
-	    'slash'	=> "http://purl.org/rss/1.0/modules/slash/",
-	    'taxo'	=> "http://purl.org/rss/1.0/modules/taxonomy/",
-	    'thr'	=> "http://purl.org/rss/1.0/modules/threading/"
-	    );
+        'ag'    => "http://purl.org/rss/1.0/modules/aggregation/",
+        'annotate'    => "http://purl.org/rss/1.0/modules/annotate/",
+        'audio'    => "http://media.tangent.org/rss/1.0/",
+        'cp'    => "http://my.theinfo.org/changed/1.0/rss/",
+        'rss091'    => "http://purl.org/rss/1.0/modules/rss091/",
+        'slash'    => "http://purl.org/rss/1.0/modules/slash/",
+        'taxo'    => "http://purl.org/rss/1.0/modules/taxonomy/",
+        'thr'    => "http://purl.org/rss/1.0/modules/threading/"
+        );
 
-	$this->_uris_seen = array();
+    $this->_uris_seen = array();
         $this->_items = array();
     }
 
     function registerModule($alias, $uri) {
-	assert(!isset($this->_modules[$alias]));
-	$this->_modules[$alias] = $uri;
+    assert(!isset($this->_modules[$alias]));
+    $this->_modules[$alias] = $uri;
     }
 
     // Args should include:
@@ -53,7 +53,7 @@
     function channel($properties, $uri = false) {
         $this->_channel = $this->__node('channel', $properties, $uri);
     }
-  
+
     // Args should include:
     //  'title', 'link'
     // and can include:
@@ -94,24 +94,24 @@
                 $seq->pushContent($this->__ref('rdf:li', $item));
         }
         $channel->pushContent(new XmlElement('items', false, $seq));
-   
-	if (isset($this->_image)) {
+
+    if (isset($this->_image)) {
             $channel->pushContent($this->__ref('image', $this->_image));
-	    $items[] = $this->_image;
-	}
-	if (isset($this->_textinput)) {
+        $items[] = $this->_image;
+    }
+    if (isset($this->_textinput)) {
             $channel->pushContent($this->__ref('textinput', $this->_textinput));
-	    $items[] = $this->_textinput;
-	}
+        $items[] = $this->_textinput;
+    }
 
-	$this->pushContent($channel);
-	if ($items)
-	    $this->pushContent($items);
+    $this->pushContent($channel);
+    if ($items)
+        $this->pushContent($items);
 
         $this->__spew();
         $this->_finished = true;
     }
-          
+
     /**
      * Write output to HTTP client.
      */
@@ -121,16 +121,16 @@
         //printf("<!-- generator=\"PhpWiki-%s\" -->\n", PHPWIKI_VERSION);
         $this->printXML();
     }
-      
-  
+
+
     /**
      * Create a new RDF <em>typedNode</em>.
      */
     function __node($type, $properties, $uri = false) {
-	if (! $uri)
-	    $uri = $properties['link'];
-	$attr['rdf:about'] = $this->__uniquify_uri($uri);
-	return new XmlElement($type, $attr,
+    if (! $uri)
+        $uri = $properties['link'];
+    $attr['rdf:about'] = $this->__uniquify_uri($uri);
+    return new XmlElement($type, $attr,
                               $this->__elementize($properties));
     }
 
@@ -138,45 +138,45 @@
      * Check object URI for uniqueness, create a unique URI if needed.
      */
     function __uniquify_uri ($uri) {
-	if (!$uri || isset($this->_uris_seen[$uri])) {
-	    $n = count($this->_uris_seen);
-	    $uri = $this->_channel->getAttr('rdf:about') . "#uri$n";
-	    assert(!isset($this->_uris_seen[$uri]));
-	}
-	$this->_uris_seen[$uri] = true;
-	return $uri;
+    if (!$uri || isset($this->_uris_seen[$uri])) {
+        $n = count($this->_uris_seen);
+        $uri = $this->_channel->getAttr('rdf:about') . "#uri$n";
+        assert(!isset($this->_uris_seen[$uri]));
     }
+    $this->_uris_seen[$uri] = true;
+    return $uri;
+    }
 
     /**
      * Convert hash of RDF properties to <em>propertyElt</em>s.
      */
     function __elementize ($elements) {
-	$out = array();
+    $out = array();
         foreach ($elements as $prop => $val) {
-	    $this->__check_predicate($prop);
-	    if (is_array($val))
-	        $out[] = new XmlElement($prop, $val);
-	    elseif (is_object($val))  
-		    $out[] = $val;
-	    else
-	        $out[] = new XmlElement($prop, false, $val);
-	}
-	return $out;
+        $this->__check_predicate($prop);
+        if (is_array($val))
+            $out[] = new XmlElement($prop, $val);
+        elseif (is_object($val))
+            $out[] = $val;
+        else
+            $out[] = new XmlElement($prop, false, $val);
     }
+    return $out;
+    }
 
     /**
      * Check property predicates for XMLNS sanity.
      */
     function __check_predicate ($name) {
-	if (preg_match('/^([^:]+):[^:]/', $name, $m)) {
-	    $ns = $m[1];
-	    if (! $this->getAttr("xmlns:$ns")) {
-		if (!isset($this->_modules[$ns]))
-		    die("$name: unknown namespace ($ns)");
-		$this->setAttr("xmlns:$ns", $this->_modules[$ns]);
-	    }
-	}
+    if (preg_match('/^([^:]+):[^:]/', $name, $m)) {
+        $ns = $m[1];
+        if (! $this->getAttr("xmlns:$ns")) {
+        if (!isset($this->_modules[$ns]))
+            die("$name: unknown namespace ($ns)");
+        $this->setAttr("xmlns:$ns", $this->_modules[$ns]);
+        }
     }
+    }
 
     /**
      * Create a <em>propertyElt</em> which references another node in the RSS.
@@ -197,10 +197,10 @@
     // and can include:
     //  'URI'
     function feed($properties, $uri = false) {
-    	global $LANG;
-    	$attr = array('xmlns' => 'http://www.w3.org/2005/Atom',
-        	      'version' => '0.3', // or 1.0
-        	      'lang' => $LANG);
+        global $LANG;
+        $attr = array('xmlns' => 'http://www.w3.org/2005/Atom',
+                  'version' => '0.3', // or 1.0
+                  'lang' => $LANG);
         $this->_channel = $this->__node('feed', $attr, $properties, $uri);
     }
 
@@ -218,10 +218,10 @@
      * Create a new entry
      */
     function __node($type, $attr, $properties, $uri = false) {
-	if (! $uri)
-	    $uri = $properties['link'];
-	//$attr['rdf:about'] = $this->__uniquify_uri($uri);
-	return new XmlElement($type, $attr,
+    if (! $uri)
+        $uri = $properties['link'];
+    //$attr['rdf:about'] = $this->__uniquify_uri($uri);
+    return new XmlElement($type, $attr,
                               $this->__elementize($properties));
     }
 
@@ -242,9 +242,9 @@
 
         $channel = &$this->_channel;
         $items = &$this->_items;
-	if ($items)
-	    $channel->pushContent($items);
-	$this->pushContent($channel);
+    if ($items)
+        $channel->pushContent($items);
+    $this->pushContent($channel);
 
         $this->__spew();
         $this->_finished = true;
@@ -257,5 +257,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/RssWriter2.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/RssWriter2.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/RssWriter2.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: RssWriter2.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: RssWriter2.php 7964 2011-03-05 17:05:30Z vargenau $
 /*
  * Code for creating RSS 2.0
  * Author: Reini Urban for PhpWiki
@@ -22,23 +22,23 @@
                           array('version' => "2.0"));
 
         // not used. no namespaces should be used.
-	$this->_modules = array(
+    $this->_modules = array(
             //Standards
-	    'content'	=> "http://purl.org/rss/1.0/modules/content/",
-	    'dc'	=> "http://purl.org/dc/elements/1.1/",
-	    'sy'	=> "http://purl.org/rss/1.0/modules/syndication/",
+        'content'    => "http://purl.org/rss/1.0/modules/content/",
+        'dc'    => "http://purl.org/dc/elements/1.1/",
+        'sy'    => "http://purl.org/rss/1.0/modules/syndication/",
             //Proposed
             'wiki'      => "http://purl.org/rss/1.0/modules/wiki/",
-	    'ag'	=> "http://purl.org/rss/1.0/modules/aggregation/",
-	    'annotate'	=> "http://purl.org/rss/1.0/modules/annotate/",
-	    'audio'	=> "http://media.tangent.org/rss/1.0/",
-	    'cp'	=> "http://my.theinfo.org/changed/1.0/rss/",
-	    'rss091'	=> "http://purl.org/rss/1.0/modules/rss091/",
-	    'slash'	=> "http://purl.org/rss/1.0/modules/slash/",
-	    'taxo'	=> "http://purl.org/rss/1.0/modules/taxonomy/",
-	    'thr'	=> "http://purl.org/rss/1.0/modules/threading/"
-	    );
-	$this->_uris_seen = array();
+        'ag'    => "http://purl.org/rss/1.0/modules/aggregation/",
+        'annotate'    => "http://purl.org/rss/1.0/modules/annotate/",
+        'audio'    => "http://media.tangent.org/rss/1.0/",
+        'cp'    => "http://my.theinfo.org/changed/1.0/rss/",
+        'rss091'    => "http://purl.org/rss/1.0/modules/rss091/",
+        'slash'    => "http://purl.org/rss/1.0/modules/slash/",
+        'taxo'    => "http://purl.org/rss/1.0/modules/taxonomy/",
+        'thr'    => "http://purl.org/rss/1.0/modules/threading/"
+        );
+    $this->_uris_seen = array();
         $this->_items = array();
     }
 
@@ -81,5 +81,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/SemanticWeb.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/SemanticWeb.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/SemanticWeb.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: SemanticWeb.php 7663 2010-08-31 15:23:17Z vargenau $');
+<?php // $Id: SemanticWeb.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * What to do on ?format=rdf  What to do on ?format=owl
  *
@@ -99,7 +99,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -119,117 +119,117 @@
 class RdfWriter extends RssWriter // in fact it should be rewritten to be other way round.
 {
     function RdfWriter (&$request, &$pagelist) {
-	$this->_request =& $request;
-	$this->_pagelist =& $pagelist;
+    $this->_request =& $request;
+    $this->_pagelist =& $pagelist;
         $this->XmlElement('rdf:RDF',
                           array('xmlns' => "http://purl.org/rss/1.0/",
                                 'xmlns:rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'));
 
-	$this->_modules = array(
+    $this->_modules = array(
             //Standards
-	    'content'	=> "http://purl.org/rss/1.0/modules/content/",
-	    'dc'	=> "http://purl.org/dc/elements/1.1/",
-	    );
+        'content'    => "http://purl.org/rss/1.0/modules/content/",
+        'dc'    => "http://purl.org/dc/elements/1.1/",
+        );
 
-	$this->_uris_seen = array();
+    $this->_uris_seen = array();
         $this->_items = array();
 
-	$this->wiki_xmlns_xml = WikiURL(_("UriResolver")."?",false,true);
-	$this->wiki_xmlns_url = PHPWIKI_BASE_URL;
+    $this->wiki_xmlns_xml = WikiURL(_("UriResolver")."?",false,true);
+    $this->wiki_xmlns_url = PHPWIKI_BASE_URL;
 
-	$this->pre_ns_buffer =
-	    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" .
-	    "<!DOCTYPE rdf:RDF[\n" .
-	    "\t"."<!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n" .
-	    "\t"."<!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>\n" .
-	    "\t"."<!ENTITY owl 'http://www.w3.org/2002/07/owl#'>\n" .
-	    "\t"."<!ENTITY smw 'http://smw.ontoware.org/2005/smw#'>\n" .
-	    "\t"."<!ENTITY smwdt 'http://smw.ontoware.org/2005/smw-datatype#'>\n" .
-	    // A note on "wiki": this namespace is crucial as a fallback when it would be illegal to start e.g. with a number. In this case, one can always use wiki:... followed by "_" and possibly some namespace, since _ is legal as a first character.
-	    "\t"."<!ENTITY wiki '" . $this->wiki_xmlns_xml .  "'>\n" .
-	    "\t"."<!ENTITY relation '" . $this->wiki_xmlns_xml .
-	    $this->makeXMLExportId(urlencode(str_replace(' ', '_', _("Relation") . ':'))) .  "'>\n" .
-	    "\t"."<!ENTITY attribute '" . $this->wiki_xmlns_xml .
-	    $this->makeXMLExportId(urlencode(str_replace(' ', '_', _("Attribute") . ':'))) .  "'>\n" .
-	    "\t"."<!ENTITY wikiurl '" . $this->wiki_xmlns_url .  "'>\n" .
-	    "]>\n\n" .
-	    "<rdf:RDF\n" .
-	    "\t"."xmlns:rdf=\"&rdf;\"\n" .
-	    "\t"."xmlns:rdfs=\"&rdfs;\"\n" .
-	    "\t"."xmlns:owl =\"&owl;\"\n" .
-	    "\t"."xmlns:smw=\"&smw;\"\n" .
-	    "\t"."xmlns:wiki=\"&wiki;\"\n" .
-	    "\t"."xmlns:relation=\"&relation;\"\n" .
-	    "\t"."xmlns:attribute=\"&attribute;\"";
-	$this->post_ns_buffer =
-	    "\n\t<!-- reference to the Semantic MediaWiki schema -->\n" .
-	    "\t"."<owl:AnnotationProperty rdf:about=\"&smw;hasArticle\">\n" .
-	    "\t\t"."<rdfs:isDefinedBy rdf:resource=\"http://smw.ontoware.org/2005/smw\"/>\n" .
-	    "\t"."</owl:AnnotationProperty>\n" .
-	    "\t"."<owl:AnnotationProperty rdf:about=\"&smw;hasType\">\n" .
-	    "\t\t"."<rdfs:isDefinedBy rdf:resource=\"http://smw.ontoware.org/2005/smw\"/>\n" .
-	    "\t"."</owl:AnnotationProperty>\n" .
-	    "\t"."<owl:Class rdf:about=\"&smw;Thing\">\n" .
-	    "\t\t"."<rdfs:isDefinedBy rdf:resource=\"http://smw.ontoware.org/2005/smw\"/>\n" .
-	    "\t"."</owl:Class>\n" .
-	    "\t<!-- exported page data -->\n";
+    $this->pre_ns_buffer =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" .
+        "<!DOCTYPE rdf:RDF[\n" .
+        "\t"."<!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n" .
+        "\t"."<!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>\n" .
+        "\t"."<!ENTITY owl 'http://www.w3.org/2002/07/owl#'>\n" .
+        "\t"."<!ENTITY smw 'http://smw.ontoware.org/2005/smw#'>\n" .
+        "\t"."<!ENTITY smwdt 'http://smw.ontoware.org/2005/smw-datatype#'>\n" .
+        // A note on "wiki": this namespace is crucial as a fallback when it would be illegal to start e.g. with a number. In this case, one can always use wiki:... followed by "_" and possibly some namespace, since _ is legal as a first character.
+        "\t"."<!ENTITY wiki '" . $this->wiki_xmlns_xml .  "'>\n" .
+        "\t"."<!ENTITY relation '" . $this->wiki_xmlns_xml .
+        $this->makeXMLExportId(urlencode(str_replace(' ', '_', _("Relation") . ':'))) .  "'>\n" .
+        "\t"."<!ENTITY attribute '" . $this->wiki_xmlns_xml .
+        $this->makeXMLExportId(urlencode(str_replace(' ', '_', _("Attribute") . ':'))) .  "'>\n" .
+        "\t"."<!ENTITY wikiurl '" . $this->wiki_xmlns_url .  "'>\n" .
+        "]>\n\n" .
+        "<rdf:RDF\n" .
+        "\t"."xmlns:rdf=\"&rdf;\"\n" .
+        "\t"."xmlns:rdfs=\"&rdfs;\"\n" .
+        "\t"."xmlns:owl =\"&owl;\"\n" .
+        "\t"."xmlns:smw=\"&smw;\"\n" .
+        "\t"."xmlns:wiki=\"&wiki;\"\n" .
+        "\t"."xmlns:relation=\"&relation;\"\n" .
+        "\t"."xmlns:attribute=\"&attribute;\"";
+    $this->post_ns_buffer =
+        "\n\t<!-- reference to the Semantic MediaWiki schema -->\n" .
+        "\t"."<owl:AnnotationProperty rdf:about=\"&smw;hasArticle\">\n" .
+        "\t\t"."<rdfs:isDefinedBy rdf:resource=\"http://smw.ontoware.org/2005/smw\"/>\n" .
+        "\t"."</owl:AnnotationProperty>\n" .
+        "\t"."<owl:AnnotationProperty rdf:about=\"&smw;hasType\">\n" .
+        "\t\t"."<rdfs:isDefinedBy rdf:resource=\"http://smw.ontoware.org/2005/smw\"/>\n" .
+        "\t"."</owl:AnnotationProperty>\n" .
+        "\t"."<owl:Class rdf:about=\"&smw;Thing\">\n" .
+        "\t\t"."<rdfs:isDefinedBy rdf:resource=\"http://smw.ontoware.org/2005/smw\"/>\n" .
+        "\t"."</owl:Class>\n" .
+        "\t<!-- exported page data -->\n";
     }
 
     function format() {
-	header( "Content-type: application/rdf+xml; charset=UTF-8" );
-	echo $this->pre_ns_buffer;
-	echo ">\n";
+    header( "Content-type: application/rdf+xml; charset=UTF-8" );
+    echo $this->pre_ns_buffer;
+    echo ">\n";
 
-	$first = true;
-	$dbi =	$this->_request->_dbi;
-	/* Elements per page:
-	   out-links internal, out-links external
-	   backlinks
-	   relations
-	   attributes
-	*/
-	foreach ($this->_pagelist->_pages as $page) {
-	    $relation = new TextSearchQuery("*");
-	    foreach (array('linkto','linkfrom','relation','attribute') as $linktype) {
-		$linkiter = $dbi->linkSearch($pages, $search, $linktype, $relation);
-	    }
-	    while ($link = $linkiter->next()) {
-		if (mayAccessPage('view', $rev->_pagename)) {
-		    $linkto->addItem($this->item_properties($rev),
-				     $this->pageURI($rev));
-		    if ($first)
-			$this->setValidators($rev);
-		    $first = false;
-		}
-	    }
-	}
+    $first = true;
+    $dbi =    $this->_request->_dbi;
+    /* Elements per page:
+       out-links internal, out-links external
+       backlinks
+       relations
+       attributes
+    */
+    foreach ($this->_pagelist->_pages as $page) {
+        $relation = new TextSearchQuery("*");
+        foreach (array('linkto','linkfrom','relation','attribute') as $linktype) {
+        $linkiter = $dbi->linkSearch($pages, $search, $linktype, $relation);
+        }
+        while ($link = $linkiter->next()) {
+        if (mayAccessPage('view', $rev->_pagename)) {
+            $linkto->addItem($this->item_properties($rev),
+                     $this->pageURI($rev));
+            if ($first)
+            $this->setValidators($rev);
+            $first = false;
+        }
+        }
+    }
 
-	echo $this->post_ns_buffer;
-	echo "</rdf:RDF>\n";
+    echo $this->post_ns_buffer;
+    echo "</rdf:RDF>\n";
     }
 
     /** This function transforms a valid url-encoded URI into a string
      *  that can be used as an XML-ID. The mapping should be injective.
      */
     function makeXMLExportId($uri) {
-	$uri = str_replace( '-', '-2D', $uri);
-	//$uri = str_replace( ':', '-3A', $uri); //already done by PHP
-	//$uri = str_replace( '_', '-5F', $uri); //not necessary
-	$uri = str_replace( array('"',  '#',   '&', "'",  '+',  '=',  '%'),
-			    array('-22','-23','-26','-27','-2B','-3D','-'),
-			    $uri);
-	return $uri;
+    $uri = str_replace( '-', '-2D', $uri);
+    //$uri = str_replace( ':', '-3A', $uri); //already done by PHP
+    //$uri = str_replace( '_', '-5F', $uri); //not necessary
+    $uri = str_replace( array('"',  '#',   '&', "'",  '+',  '=',  '%'),
+                array('-22','-23','-26','-27','-2B','-3D','-'),
+                $uri);
+    return $uri;
     }
 
     /** This function transforms an XML-ID string into a valid
      *  url-encoded URI. This is the inverse to makeXMLExportID.
      */
     function makeURIfromXMLExportId($id) {
-	$id = str_replace( array('-22','-23','-26','-27','-2B','-3D','-'),
-			   array('"',  '#',  '&',  "'",  '+',  '=',  '%'),
-			   $id);
-	$id = str_replace( '-2D', '-', $id);
-	return $id;
+    $id = str_replace( array('-22','-23','-26','-27','-2B','-3D','-'),
+               array('"',  '#',  '&',  "'",  '+',  '=',  '%'),
+               $id);
+    $id = str_replace( '-2D', '-', $id);
+    return $id;
     }
 }
 
@@ -283,9 +283,9 @@
 {
     /*
     var $base_units = array('m'   => explode(',','km,miles,cm,dm,mm,ft,inch,inches,meter'),
-			    'm^2' => explode(',','km^2,ha,cm^2,mi^2'),
-			    'm^3' => explode(',','km^3,lit,cm^3,dm^3,gallons'),
-			    );
+                'm^2' => explode(',','km^2,ha,cm^2,mi^2'),
+                'm^3' => explode(',','km^3,lit,cm^3,dm^3,gallons'),
+                );
     */
 
     /**
@@ -293,9 +293,9 @@
      * population > 1 million
      */
     function SemanticAttributeSearchQuery($search_query, $placeholders, $unit = '') {
-	$this->NumericSearchQuery($search_query, $placeholders);
-	$this->_units = new Units();
-	$this->unit = $unit;
+    $this->NumericSearchQuery($search_query, $placeholders);
+    $this->_units = new Units();
+    $this->unit = $unit;
     }
 
     /**
@@ -310,33 +310,33 @@
      * @return string
      */
     function _bind($value, $x) {
-    	$ori_value = $value;
-	$value = preg_replace("/,/", "", $value);
-	$this->_bound[] = array('linkname'  => $x,
-	        		'linkvalue' => $value);
-	// We must ensure that the same baseunits are matched against.
-	// We cannot compare m^2 to m or ''
-	$val_base = $this->_units->basevalue($value);
+        $ori_value = $value;
+    $value = preg_replace("/,/", "", $value);
+    $this->_bound[] = array('linkname'  => $x,
+                    'linkvalue' => $value);
+    // We must ensure that the same baseunits are matched against.
+    // We cannot compare m^2 to m or ''
+    $val_base = $this->_units->basevalue($value);
         if (!DISABLE_UNITS and $this->_units->baseunit($value) != $this->unit) {
-	    // Poor user has selected an attribute, but no unit. assume he means the baseunit
-	    if (count($this->getVars() == 1) and $this->unit == '') {
-		;
-	    } else {
-		// non-matching units are silently ignored
-		$this->_workquery = '';
-		return '';
-	    }
+        // Poor user has selected an attribute, but no unit. assume he means the baseunit
+        if (count($this->getVars() == 1) and $this->unit == '') {
+        ;
+        } else {
+        // non-matching units are silently ignored
+        $this->_workquery = '';
+        return '';
         }
+        }
         $value = $val_base;
-	if (!is_numeric($value)) {
-	    $this->_workquery = ''; //must return false
-	    trigger_error("Cannot match against non-numeric attribute value $x := $ori_value",
-			  E_USER_NOTICE);
-	    return '';
-	}
+    if (!is_numeric($value)) {
+        $this->_workquery = ''; //must return false
+        trigger_error("Cannot match against non-numeric attribute value $x := $ori_value",
+              E_USER_NOTICE);
+        return '';
+    }
 
-	$this->_workquery = preg_replace("/\b".preg_quote($x,"/")."\b/", $value, $this->_workquery);
-	return $this->_workquery;
+    $this->_workquery = preg_replace("/\b".preg_quote($x,"/")."\b/", $value, $this->_workquery);
+    return $this->_workquery;
     }
 
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/SpamBlocklist.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/SpamBlocklist.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/SpamBlocklist.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: SpamBlocklist.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: SpamBlocklist.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2005 Reini Urban
  *
  * This file is part of PhpWiki.
@@ -8,18 +8,19 @@
  * 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
  */
 
-/** 
+/**
  * See http://www.surbl.org/
  *
  * Perform a name lookup (A) for any link tld against multi.surbl.org and bl.spamcop.net,
@@ -29,40 +30,40 @@
  */
 
 /*
- * Strip domain prefixes so that either the last two name parts are returned, 
+ * 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);
+    array_shift($host_elements);
     }
     $host_3_elements = implode('.', $host_elements);
     if (count($host_elements) > 2) {
-	array_shift($host_elements);
+    array_shift($host_elements);
     }
     $host_2_elements = implode('.', $host_elements);
     if (empty($twoleveltlds)) {
-	$data = @file(dirname(__FILE__)."/../config/two-level-tlds");
-	$twoleveltlds = $data ? array_flip($data) : array();
+    $data = @file(dirname(__FILE__)."/../config/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;
+    //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;
+    // 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" */
+                              /* "sbl-xbl.spamhaus.net" */
     static $whitelist = array();
     if (empty($whitelist)) { // list of domains
-	$data = @file(dirname(__FILE__)."/../config/whitelist");
-	$whitelist = $data ? array_flip($data) : array();
+    $data = @file(dirname(__FILE__)."/../config/whitelist");
+    $whitelist = $data ? array_flip($data) : array();
     }
 
     $parsed_uri = parse_url($uri);
@@ -71,27 +72,27 @@
     else
         $host = $parsed_uri['path'];
     if (array_key_exists($host, $whitelist))
-	return 0;
+    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;
+    $host = implode('.', array_reverse(explode('.', $host)));
+    $revip = 1;
     } else {
-	$revip = 0;
+    $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);
+    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;
 }
 
@@ -112,9 +113,9 @@
     $res = IsBlackListed($host);
     echo sprintf("%12s", $host), "\tis";
     if ($res)
-	echo " listed at $res[0] - $res[1]\n";
+    echo " listed at $res[0] - $res[1]\n";
     else
-	echo " not blacklisted.\n";
+    echo " not blacklisted.\n";
 }
 */
 
@@ -124,5 +125,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/Template.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/Template.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/Template.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: Template.php 7592 2010-07-02 08:24:28Z vargenau $');
+// $Id: Template.php 7964 2011-03-05 17:05:30Z vargenau $
 
 require_once("lib/ErrorManager.php");
 
@@ -30,9 +30,9 @@
             trigger_error("no template for $name found.", E_USER_WARNING);
             return;
         }
-        if (isset($oldname)) { 
-            $WikiTheme->_name = $oldname; 
-            $WikiTheme->_theme = $oldtheme; 
+        if (isset($oldname)) {
+            $WikiTheme->_name = $oldname;
+            $WikiTheme->_theme = $oldtheme;
         }
         $fp = fopen($file, "rb");
         if (!$fp) {
@@ -56,15 +56,15 @@
         // Convert < ?plugin expr ? > to < ?php $this->_printPluginPI("expr"); ? >
         $orig[] = '/<\?plugin.*?\?>/se';
         $repl[] = "\$this->_mungePlugin('\\0')";
-        
+
         // Convert < ?= expr ? > to < ?php $this->_print(expr); ? >
         $orig[] = '/<\?=(.*?)\?>/s';
         $repl[] = '<?php $this->_print(\1);?>';
-        
+
         // Convert < ?php echo expr ? > to < ?php $this->_print(expr); ? >
         $orig[] = '/<\?php echo (.*?)\?>/s';
         $repl[] = '<?php $this->_print(\1);?>';
-        
+
         return preg_replace($orig, $repl, $template);
     }
 
@@ -77,17 +77,17 @@
         return sprintf('<?php $this->_printPlugin(%s); ?>',
                        "'" . str_replace("'", "\'", $pi) . "'");
     }
-    
+
     function _printPlugin ($pi) {
-	include_once("lib/WikiPlugin.php");
-	static $loader;
+    include_once("lib/WikiPlugin.php");
+    static $loader;
 
         if (empty($loader))
             $loader = new WikiPluginLoader;
-        
+
         $this->_print($loader->expandPI($pi, $this->_request, $this, $this->_basepage));
     }
-    
+
     function _print ($val) {
         if (isa($val, 'Template')) {
             $this->_expandSubtemplate($val);
@@ -97,7 +97,7 @@
     }
 
     function _expandSubtemplate (&$template) {
-        // FIXME: big hack!        
+        // FIXME: big hack!
         //if (!$template->_request)
         //    $template->_request = &$this->_request;
         if (DEBUG) {
@@ -109,9 +109,9 @@
             echo "<!-- End $template->_name -->\n";
         }
     }
-        
+
     /**
-     * Substitute HTML replacement text for tokens in template. 
+     * Substitute HTML replacement text for tokens in template.
      *
      * Constructs a new WikiTemplate based upon the named template.
      *
@@ -125,7 +125,7 @@
         $this->_locals[$varname] = $value;
     }
 
-    
+
     function printExpansion ($defaults = false) {
         if (!is_array($defaults)) // HTML object or template object
             $defaults = array('CONTENT' => $defaults);
@@ -137,11 +137,11 @@
             $user = $request->getUser();
         if (!isset($page))
             $page = $request->getPage();
-	// Speedup. I checked all templates
-        if (!isset($revision)) 
-	    $revision = false;
+    // Speedup. I checked all templates
+        if (!isset($revision))
+        $revision = false;
 
-        global $WikiTheme, $charset; 
+        global $WikiTheme, $charset;
         //$this->_dump_template();
         $SEP = $WikiTheme->getButtonSeparator();
 
@@ -161,7 +161,7 @@
         ob_start();
         $this->printExpansion($defaults);
         $xml = ob_get_contents();
-        ob_end_clean(); 	// PHP problem: Doesn't release its memory?
+        ob_end_clean();     // PHP problem: Doesn't release its memory?
         return $xml;
     }
 
@@ -172,8 +172,8 @@
     function asXML () {
         return $this->getExpansion();
     }
-    
-            
+
+
     // Debugging:
     function _dump_template () {
         $lines = explode("\n", $this->_munge_input($this->_tmpl));
@@ -186,7 +186,7 @@
 
     function _errorHandler($error) {
         //if (!preg_match('/: eval\(\)\'d code$/', $error->errfile))
-	//    return false;
+    //    return false;
 
         if (preg_match('/: eval\(\)\'d code$/', $error->errfile)) {
             $error->errfile = "In template '$this->_name'";
@@ -201,7 +201,7 @@
             ; //return $error;
         }
         elseif (strstr($error->errfile, "In template '")) { // merge
-            $error->errfile = preg_replace("/'(\w+)'\)$/", "'\\1' < '$this->_name')", 
+            $error->errfile = preg_replace("/'(\w+)'\)$/", "'\\1' < '$this->_name')",
                                            $error->errfile);
         }
         else {
@@ -213,7 +213,7 @@
             if (isset($lines[$error->errline - 1]))
                 $error->errstr .= ":\n\t" . $lines[$error->errline - 1];
         }
-	return $error;
+    return $error;
     }
 };
 
@@ -235,7 +235,7 @@
     return !empty($request->_TemplatesProcessed[$name]) ? true : false;
 }
 /**
- * Make and expand the top-level template. 
+ * Make and expand the top-level template.
  *
  *
  * @param $content mixed html content to put into the page
@@ -247,17 +247,17 @@
  */
 function GeneratePage($content, $title, $page_revision = false, $args = false) {
     global $request;
-    
+
     if (!is_array($args))
         $args = array();
 
     $args['CONTENT'] = $content;
     $args['TITLE'] = $title;
     $args['revision'] = $page_revision;
-    
+
     if (!isset($args['HEADER']))
         $args['HEADER'] = $title;
-    
+
     printXML(new Template('html', $request, $args));
 }
 
@@ -268,7 +268,7 @@
  */
 function GeneratePageasXML($content, $title, $page_revision = false, $args = false) {
     global $request;
-    
+
     if (!is_array($args))
         $args = array();
 
@@ -276,18 +276,18 @@
     $args['CONTENT'] = $content;
     $args['TITLE'] = SplitPagename($title);
     $args['revision'] = $page_revision;
-    
+
     if (!isset($args['HEADER']))
         $args['HEADER'] = SplitPagename($title);
-    
+
     global $HIDE_TOOLBARS, $NO_BASEHREF, $WikiTheme;
     $HIDE_TOOLBARS = true;
     if (!$WikiTheme->DUMP_MODE)
-	$WikiTheme->DUMP_MODE = 'HTML';
+    $WikiTheme->DUMP_MODE = 'HTML';
 
     // FIXME: unfatal errors and login requirements
     $html = asXML(new Template('htmldump', $request, $args));
-    
+
     $HIDE_TOOLBARS = false;
     //$WikiTheme->DUMP_MODE = false;
     return $html;
@@ -299,5 +299,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/TextSearchQuery.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/TextSearchQuery.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/TextSearchQuery.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: TextSearchQuery.php 7417 2010-05-19 12:57:42Z vargenau $');
+<?php // $Id: TextSearchQuery.php 7964 2011-03-05 17:05:30Z vargenau $
 /**
  * A text search query, converting queries to PCRE and SQL matchers.
  *
@@ -11,7 +11,7 @@
  * <dt> wiki word or page
  *   <dd> Match strings containing the substring 'wiki' AND either the substring
  *        'word' OR the substring 'page'.
- * <dt> auto-detect regex hints, glob-style or regex-style, and converts them 
+ * <dt> auto-detect regex hints, glob-style or regex-style, and converts them
  *      to PCRE and SQL matchers:
  *   <dd> "^word$" => EXACT(phrase)
  *   <dd> "^word"  => STARTS_WITH(phrase)
@@ -45,11 +45,11 @@
  * double-up on the quote character: 'I''m hungry' is equivalent to
  * "I'm hungry".
  *
- * Force regex on "re:word" => posix-style, "/word/" => pcre-style 
+ * Force regex on "re:word" => posix-style, "/word/" => pcre-style
  * or use regex='glob' to use file wildcard-like matching. (not yet)
  *
- * The parsed tree is then converted to the needed PCRE (highlight, 
- * simple backends) or SQL functions. 
+ * The parsed tree is then converted to the needed PCRE (highlight,
+ * simple backends) or SQL functions.
  *
  * @author: Jeff Dairiki
  * @author: Reini Urban (case and regex detection, enhanced sql callbacks)
@@ -107,7 +107,7 @@
      * @see TextSearchQuery
      */
     function TextSearchQuery($search_query, $case_exact=false, $regex='auto') {
-        if ($regex == 'none' or !$regex) 
+        if ($regex == 'none' or !$regex)
             $this->_regex = 0;
         elseif (defined("TSQ_REGEX_".strtoupper($regex)))
             $this->_regex = constant("TSQ_REGEX_".strtoupper($regex));
@@ -115,25 +115,25 @@
             trigger_error(fmt("Unsupported argument: %s=%s", 'regex', $regex));
             $this->_regex = 0;
         }
-	$this->_regex_modifier = ($case_exact?'':'i').'sS';
+    $this->_regex_modifier = ($case_exact?'':'i').'sS';
         $this->_case_exact = $case_exact;
         if ($regex != 'pcre') {
-	    $parser = new TextSearchQuery_Parser;
-	    $this->_tree = $parser->parse($search_query, $case_exact, $this->_regex);
-	    $this->_optimize(); // broken under certain circumstances: "word -word -word"
-	    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)");
-	}
-	else {
-	    $this->_tree = new TextSearchQuery_node_regex_pcre($search_query);
-	    if (preg_match("/^\/(.*)\/(\w*)$/", $search_query, $m)) {
-	    	$this->_tree->word = $m[1];
-	    	$this->_regex_modifier = $m[2]; // overrides case_exact
-	    }
-	}
+        $parser = new TextSearchQuery_Parser;
+        $this->_tree = $parser->parse($search_query, $case_exact, $this->_regex);
+        $this->_optimize(); // broken under certain circumstances: "word -word -word"
+        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)");
     }
+    else {
+        $this->_tree = new TextSearchQuery_node_regex_pcre($search_query);
+        if (preg_match("/^\/(.*)\/(\w*)$/", $search_query, $m)) {
+            $this->_tree->word = $m[1];
+            $this->_regex_modifier = $m[2]; // overrides case_exact
+        }
+    }
+    }
 
     function getType() { return 'text'; }
 
@@ -146,7 +146,7 @@
      */
     function asRegexp() {
         if (!isset($this->_regexp)) {
-            if (!isset($this->_regex_modifier)) 
+            if (!isset($this->_regex_modifier))
                 $this->_regex_modifier = ($this->_case_exact?'':'i').'sS';
             if ($this->_regex)
                 $this->_regexp =  '/' . $this->_tree->regexp() . '/'.$this->_regex_modifier;
@@ -160,29 +160,29 @@
      * Match query against string.
      * EXACT ("Term") ignores the case_exact setting.
      *
-     * @param $string string The string to match. 
+     * @param $string string The string to match.
      * @return boolean True if the string matches the query.
      */
     function match($string) {
-    	if ($this->_tree->_op == TSQ_TOK_ALL)   return true;
-    	if ($this->_tree->_op == TSQ_TOK_EXACT) return $this->_tree->word == $string;
+        if ($this->_tree->_op == TSQ_TOK_ALL)   return true;
+        if ($this->_tree->_op == TSQ_TOK_EXACT) return $this->_tree->word == $string;
         return preg_match($this->asRegexp(), $string);
     }
 
     /* How good does it match? Returns a number */
     function score($string) {
-	$score = 0.0;
-	$i = 10;
-	foreach (array_unique($this->_tree->highlight_words()) as $word) {
-	    if ($nummatch = preg_match_all("/".preg_quote($word, '/')."/".
-	                                       $this->_regex_modifier, 
-	                                   $string, $out))
-	        $score += ($i-- * $nummatch);
-	}
-	return min(1.0, $score / 10.0);
+    $score = 0.0;
+    $i = 10;
+    foreach (array_unique($this->_tree->highlight_words()) as $word) {
+        if ($nummatch = preg_match_all("/".preg_quote($word, '/')."/".
+                                           $this->_regex_modifier,
+                                       $string, $out))
+            $score += ($i-- * $nummatch);
     }
+    return min(1.0, $score / 10.0);
+    }
 
-    
+
     /**
      * Get a regular expression suitable for highlighting matched words.
      *
@@ -199,7 +199,7 @@
             } else {
                 foreach ($words as $key => $word)
                     $words[$key] = preg_quote($word, '/');
-                $this->_hilight_regexp = '(?'.($this->_case_exact?'':'i').':' 
+                $this->_hilight_regexp = '(?'.($this->_case_exact?'':'i').':'
                                              . join('|', $words) . ')';
             }
         }
@@ -207,7 +207,7 @@
     }
 
     /**
-     * Make an SQL clause which matches the query. 
+     * Make an SQL clause which matches the query.
      * Deprecated, use makeSqlClauseObj instead.
      *
      * @param $make_sql_clause_cb WikiCallback
@@ -353,8 +353,8 @@
      * @see TextSearchQuery
      */
     function NullTextSearchQuery() {}
-    function asRegexp()		{ return '/^(?!a)a/x'; }
-    function match($string)	{ return false; }
+    function asRegexp()        { return '/^(?!a)a/x'; }
+    function match($string)    { return false; }
     function getHighlightRegexp() { return ""; }
     function makeSqlClause($make_sql_clause_cb) { return "(1 = 0)"; }
     function asString() { return "NullTextSearchQuery"; }
@@ -363,14 +363,14 @@
 /**
  * A simple algebraic matcher for numeric attributes.
  *  NumericSearchQuery can do ("population < 20000 and area > 1000000", array("population", "area"))
- *  ->match(array('population' => 100000, 'area' => 10000000)) 
+ *  ->match(array('population' => 100000, 'area' => 10000000))
  *
  * Supports all mathematical PHP comparison operators, plus ':=' for equality.
  *   "(x < 2000000 and x >= 10000) or (x >= 100 and x < 2000)"
  *   "x := 100000" is the same as "x == 100000"
  *
- * Since this is basic numerics only, we simply try to get away with 
- * replacing the variable values at the right positions and do an eval then. 
+ * Since this is basic numerics only, we simply try to get away with
+ * replacing the variable values at the right positions and do an eval then.
  *
  * @package NumericSearchQuery
  * @author Reini Urban
@@ -383,120 +383,120 @@
      *   NumericSearchQuery("population > 20000 or population < 200", "population")
      *   NumericSearchQuery("population < 20000 and area > 1000000", array("population", "area"))
      *
-     * With a single variable it is easy: The valid name must be matched elsewhere, just 
+     * With a single variable it is easy: The valid name must be matched elsewhere, just
      * replace the given number in match in the query.
      *   ->match(2000)
      *
      * With matching a struct we need strict names, no * as name is allowed.
-     * So always when the placeholder is an array, the names of the target struct must match 
+     * So always when the placeholder is an array, the names of the target struct must match
      * and all vars be defined. Use the method can_match($struct) therefore.
      *
      * @access public
      * @param $search_query string   A numerical query with placeholders as variable.
-     * @param $placeholders array or string  All placeholders in the query must be defined 
-     * 	here, and will be replaced by the matcher.
+     * @param $placeholders array or string  All placeholders in the query must be defined
+     *     here, and will be replaced by the matcher.
      */
     function NumericSearchQuery($search_query, $placeholders) {
-	// added some basic security checks against user input
+    // added some basic security checks against user input
         $this->_query = $search_query;
-	$this->_placeholders = $placeholders;
+    $this->_placeholders = $placeholders;
 
-	// we should also allow the M_ constants
-	$this->_allowed_functions = explode(':','abs:acos:acosh:asin:asinh:atan2:atan:atanh:base_convert:bindec:ceil:cos:cosh:decbin:dechex:decoct:deg2rad:exp:expm1:floor:fmod:getrandmax:hexdec:hypot:is_finite:is_infinite:is_nan:lcg_value:log10:log1p:log:max:min:mt_getrandmax:mt_rand:mt_srand:octdec:pi:pow:rad2deg:rand:round:sin:sinh:sqrt:srand:tan:tanh');
-	$this->_allowed_operators = explode(',', '-,<,<=,>,>=,==,!=,*,+,/,(,),%,and,or,xor,<<,>>,===,!==,&,^,|,&&,||');
-	$this->_parser_check = array();
-	// check should be fast, so make a hash
-	foreach ($this->_allowed_functions as $f)
-	    $this->_parser_check[$f] = 1;
-	foreach ($this->_allowed_operators as $f)
-	    $this->_parser_check[$f] = 1;
-	if (is_array($placeholders))
-	    foreach ($placeholders as $f)
-		$this->_parser_check[$f] = 1;
-	else $this->_parser_check[$placeholders] = 1;	
+    // we should also allow the M_ constants
+    $this->_allowed_functions = explode(':','abs:acos:acosh:asin:asinh:atan2:atan:atanh:base_convert:bindec:ceil:cos:cosh:decbin:dechex:decoct:deg2rad:exp:expm1:floor:fmod:getrandmax:hexdec:hypot:is_finite:is_infinite:is_nan:lcg_value:log10:log1p:log:max:min:mt_getrandmax:mt_rand:mt_srand:octdec:pi:pow:rad2deg:rand:round:sin:sinh:sqrt:srand:tan:tanh');
+    $this->_allowed_operators = explode(',', '-,<,<=,>,>=,==,!=,*,+,/,(,),%,and,or,xor,<<,>>,===,!==,&,^,|,&&,||');
+    $this->_parser_check = array();
+    // check should be fast, so make a hash
+    foreach ($this->_allowed_functions as $f)
+        $this->_parser_check[$f] = 1;
+    foreach ($this->_allowed_operators as $f)
+        $this->_parser_check[$f] = 1;
+    if (is_array($placeholders))
+        foreach ($placeholders as $f)
+        $this->_parser_check[$f] = 1;
+    else $this->_parser_check[$placeholders] = 1;
 
-	// This is a speciality: := looks like the attribute definition and is 
-	// therefore a dummy check for this definition.
-	// php-4.2.2 has a problem with /\b:=\b/ matching "population := 1223400"
-	$this->_query = preg_replace("/:=/", "==", $this->_query);
-	$this->_query = $this->check_query($this->_query);
+    // This is a speciality: := looks like the attribute definition and is
+    // therefore a dummy check for this definition.
+    // php-4.2.2 has a problem with /\b:=\b/ matching "population := 1223400"
+    $this->_query = preg_replace("/:=/", "==", $this->_query);
+    $this->_query = $this->check_query($this->_query);
     }
 
     function getType() { return 'numeric'; }
 
     /**
      * Check the symbolic definition query against unwanted functions and characters.
-     * "population < 20000 and area > 1000000" vs 
-     *   "area > 1000000 and mail($me,file("/etc/passwd"),...)" 
+     * "population < 20000 and area > 1000000" vs
+     *   "area > 1000000 and mail($me,file("/etc/passwd"),...)"
      * http://localhost/wikicvs/SemanticSearch?attribute=*&attr_op=<0 and find(1)>&s=-0.01&start_debug=1
      */
     function check_query ($query) {
-	$tmp = $query; // check for all function calls, in case the tokenizer is not available.
-    	while (preg_match("/([a-z][a-z0-9]+)\s*\((.*)$/i", $tmp, $m)) {
-	    if (!in_array($m[1], $this->_allowed_functions)
-		and !in_array($m[1], $this->_allowed_operators))
-	    {
-		trigger_error("Illegal function in query: ".$m[1], E_USER_WARNING);
-		return '';
-	    }
-	    $tmp = $m[2];
-	}
-	
-	// Strictly check for illegal functions and operators, which are no placeholders.
-	if (function_exists('token_get_all')) {
-	    $parsed = token_get_all("<?$query?>");
-	    foreach ($parsed as $x) { // flat, non-recursive array
-		if (is_string($x) and !isset($this->_parser_check[$x])) {
-		    // single char op or name
-		    trigger_error("Illegal string or operator in query: \"$x\"", E_USER_WARNING);
-		    $query = '';
-	        }
-		elseif (is_array($x)) {
-		    $n = token_name($x[0]);
-		    if ($n == 'T_OPEN_TAG' or $n == 'T_WHITESPACE' 
-		        or $n == 'T_CLOSE_TAG' or $n == 'T_LNUMBER'
-		        or $n == 'T_CONST' or $n == 'T_DNUMBER' ) continue;
-		    if ($n == 'T_VARIABLE') { // but we do allow consts
-			trigger_error("Illegal variable in query: \"$x[1]\"", E_USER_WARNING);
-			$query = '';
-		    }    
-		    if (is_string($x[1]) and !isset($this->_parser_check[$x[1]])) {
-			// multi-char char op or name
-			trigger_error("Illegal $n in query: \"$x[1]\"", E_USER_WARNING);
-			$query = '';
-		    }
-		}
-	    }
-	    //echo "$query <br>";
-	    //$this->_parse_token($parsed);
-	    //echo "<br>\n";
-	    //var_dump($parsed);
-	    /* 
-"_x > 0" => 
+    $tmp = $query; // check for all function calls, in case the tokenizer is not available.
+        while (preg_match("/([a-z][a-z0-9]+)\s*\((.*)$/i", $tmp, $m)) {
+        if (!in_array($m[1], $this->_allowed_functions)
+        and !in_array($m[1], $this->_allowed_operators))
+        {
+        trigger_error("Illegal function in query: ".$m[1], E_USER_WARNING);
+        return '';
+        }
+        $tmp = $m[2];
+    }
+
+    // Strictly check for illegal functions and operators, which are no placeholders.
+    if (function_exists('token_get_all')) {
+        $parsed = token_get_all("<?$query?>");
+        foreach ($parsed as $x) { // flat, non-recursive array
+        if (is_string($x) and !isset($this->_parser_check[$x])) {
+            // single char op or name
+            trigger_error("Illegal string or operator in query: \"$x\"", E_USER_WARNING);
+            $query = '';
+            }
+        elseif (is_array($x)) {
+            $n = token_name($x[0]);
+            if ($n == 'T_OPEN_TAG' or $n == 'T_WHITESPACE'
+                or $n == 'T_CLOSE_TAG' or $n == 'T_LNUMBER'
+                or $n == 'T_CONST' or $n == 'T_DNUMBER' ) continue;
+            if ($n == 'T_VARIABLE') { // but we do allow consts
+            trigger_error("Illegal variable in query: \"$x[1]\"", E_USER_WARNING);
+            $query = '';
+            }
+            if (is_string($x[1]) and !isset($this->_parser_check[$x[1]])) {
+            // multi-char char op or name
+            trigger_error("Illegal $n in query: \"$x[1]\"", E_USER_WARNING);
+            $query = '';
+            }
+        }
+        }
+        //echo "$query <br>";
+        //$this->_parse_token($parsed);
+        //echo "<br>\n";
+        //var_dump($parsed);
+        /*
+"_x > 0" =>
 { T_OPEN_TAG "<?"} { T_STRING "_x"} { T_WHITESPACE " "} ">" { T_WHITESPACE " "} { T_LNUMBER "0"} { T_CLOSE_TAG "?>"}
-	Interesting: on-char ops, as ">" are not tokenized.
+    Interesting: on-char ops, as ">" are not tokenized.
 "_x <= 0"
 { T_OPEN_TAG "< ?" } { T_STRING "_x" } { T_WHITESPACE " " } { T_IS_SMALLER_OR_EQUAL "<=" } { T_WHITESPACE " " } { T_LNUMBER "0" } { T_CLOSE_TAG "?>" }
-	     */
-	} else {
-	    // Detect illegal characters besides nums, words and ops. 
-	    // So attribute names can not be utf-8
-	    $c = "/([^\d\w.,\s".preg_quote(join("",$this->_allowed_operators),"/")."])/";
-	    if (preg_match($c, $query, $m)) {
-		trigger_error("Illegal character in query: ".$m[1], E_USER_WARNING);
-		return '';
-	    }
-	}
-	return $query;
+         */
+    } else {
+        // Detect illegal characters besides nums, words and ops.
+        // So attribute names can not be utf-8
+        $c = "/([^\d\w.,\s".preg_quote(join("",$this->_allowed_operators),"/")."])/";
+        if (preg_match($c, $query, $m)) {
+        trigger_error("Illegal character in query: ".$m[1], E_USER_WARNING);
+        return '';
+        }
     }
+    return $query;
+    }
 
     /**
      * Check the bound, numeric-only query against unwanted functions and sideeffects.
      * "4560000 < 20000 and 1456022 > 1000000"
      */
     function _live_check () {
-	// TODO: check $this->_workquery again?
-	return !empty($this->_workquery);
+    // TODO: check $this->_workquery again?
+    return !empty($this->_workquery);
     }
 
     /**
@@ -505,12 +505,12 @@
      * @return array The names as array of strings. => ('x', 'y') the placeholders.
      */
     function getVars() {
-	if(is_array($this->_placeholders)) return $this->_placeholders;
-	else return array($this->_placeholders);
+    if(is_array($this->_placeholders)) return $this->_placeholders;
+    else return array($this->_placeholders);
     }
 
     /**
-     * Strip non-numeric chars from the variable (as the groupseperator) and replace 
+     * Strip non-numeric chars from the variable (as the groupseperator) and replace
      * it in the symbolic query for evaluation.
      *
      * @access private
@@ -519,23 +519,23 @@
      * @return string
      */
     function _bind($value, $x) {
-	// TODO: check is_number, is_float, is_integer and do casting
-	$this->_bound[] = array('linkname'  => $x,
-	        		'linkvalue' => $value);
-	$value = preg_replace("/[^-+0123456789.,]/", "", $value);
-	//$c = "/\b".preg_quote($x,"/")."\b/";
-	$this->_workquery = preg_replace("/\b".preg_quote($x,"/")."\b/", $value, $this->_workquery);
-	// FIXME: do again a final check. now only numbers and some operators are allowed.
-	return $this->_workquery;
+    // TODO: check is_number, is_float, is_integer and do casting
+    $this->_bound[] = array('linkname'  => $x,
+                    'linkvalue' => $value);
+    $value = preg_replace("/[^-+0123456789.,]/", "", $value);
+    //$c = "/\b".preg_quote($x,"/")."\b/";
+    $this->_workquery = preg_replace("/\b".preg_quote($x,"/")."\b/", $value, $this->_workquery);
+    // FIXME: do again a final check. now only numbers and some operators are allowed.
+    return $this->_workquery;
     }
-    
+
     /* array of successfully bound vars, and in case of success, the resulting vars
      */
     function _bound() {
-    	return $this->_bound;
+        return $this->_bound;
     }
 
-    /** 
+    /**
      * With an array of placeholders we need a hash to check against, if all required names are given.
      * Purpose: Be silent about missing vars, just return false.
      `*
@@ -545,21 +545,21 @@
      * @return boolean
      */
     function can_match(&$variables) {
-    	if (empty($this->_query))
-    	    return false;
-	$p =& $this->_placeholders;
-	if (!is_array($variables) and !is_array($p))
-	    return $variables == $p; // This was easy.
-	// Check if all placeholders have definitions. can be overdefined but not underdefined.
-	if (!is_array($p)) {
-	    if (!isset($variables[$p])) return false;
-	} else {
-	    foreach ($p as $x) {
-		if (!isset($variables[$x])) return false;
-	    }
-	}
-	return true;
+        if (empty($this->_query))
+            return false;
+    $p =& $this->_placeholders;
+    if (!is_array($variables) and !is_array($p))
+        return $variables == $p; // This was easy.
+    // Check if all placeholders have definitions. can be overdefined but not underdefined.
+    if (!is_array($p)) {
+        if (!isset($variables[$p])) return false;
+    } else {
+        foreach ($p as $x) {
+        if (!isset($variables[$x])) return false;
+        }
     }
+    return true;
+    }
 
     /**
      * We can match against a single variable or against a hash of variables.
@@ -571,36 +571,36 @@
      * @return boolean
      */
     function match(&$variable) {
-	$p =& $this->_placeholders;
-	$this->_workquery = $this->_query;
-	if (!is_array($p)) {
-	    if (is_array($variable)) { // which var to match? we cannot decide this here
-		if (!isset($variable[$p]))
-		    trigger_error("Required NumericSearchQuery->match variable $x not defined.", E_USER_ERROR);
-		$this->_bind($variable[$p], $p);
-	    } else {
-		$this->_bind($variable, $p);
-	    }
-	} else {
-	    foreach ($p as $x) {
-		if (!isset($variable[$x]))
-		    trigger_error("Required NumericSearchQuery->match variable $x not defined.", E_USER_ERROR);
-		$this->_bind($variable[$x], $x);
-	    }
-	}
-    	if (!$this->_live_check()) // check returned an error
-    	    return false;
-    	$search = $this->_workquery;
-	$result = false;
-	//if (DEBUG & _DEBUG_VERBOSE)
-	//    trigger_error("\$result = (boolean)($search);", E_USER_NOTICE);
-	// We might have a numerical problem:
-	// php-4.2.2 eval'ed as module: "9.636e+08 > 1000" false; 
-	// php-5.1.2 cgi true, 4.2.2 cgi true
-	eval("\$result = (boolean)($search);");
-	if ($result and is_array($p)) {
-	    return $this->_bound();
-	}
+    $p =& $this->_placeholders;
+    $this->_workquery = $this->_query;
+    if (!is_array($p)) {
+        if (is_array($variable)) { // which var to match? we cannot decide this here
+        if (!isset($variable[$p]))
+            trigger_error("Required NumericSearchQuery->match variable $x not defined.", E_USER_ERROR);
+        $this->_bind($variable[$p], $p);
+        } else {
+        $this->_bind($variable, $p);
+        }
+    } else {
+        foreach ($p as $x) {
+        if (!isset($variable[$x]))
+            trigger_error("Required NumericSearchQuery->match variable $x not defined.", E_USER_ERROR);
+        $this->_bind($variable[$x], $x);
+        }
+    }
+        if (!$this->_live_check()) // check returned an error
+            return false;
+        $search = $this->_workquery;
+    $result = false;
+    //if (DEBUG & _DEBUG_VERBOSE)
+    //    trigger_error("\$result = (boolean)($search);", E_USER_NOTICE);
+    // We might have a numerical problem:
+    // php-4.2.2 eval'ed as module: "9.636e+08 > 1000" false;
+    // php-5.1.2 cgi true, 4.2.2 cgi true
+    eval("\$result = (boolean)($search);");
+    if ($result and is_array($p)) {
+        return $this->_bound();
+    }
         return $result;
     }
 }
@@ -647,7 +647,7 @@
     function sql()    { return $this->word; }
 
     function _sql_quote() {
-	global $request;
+    global $request;
         $word = preg_replace('/(?=[%_\\\\])/', "\\", $this->word);
         return $request->_dbi->_backend->qstr($word);
     }
@@ -661,7 +661,7 @@
 {
     var $op = "WORD";
     var $_op = TSQ_TOK_WORD;
-    
+
     function TextSearchQuery_node_word($word) {
         $this->word = $word;
     }
@@ -756,7 +756,7 @@
 {
     var $op = "NOT";
     var $_op = TSQ_TOK_NOT;
-    
+
     function TextSearchQuery_node_not($leaf) {
         $this->leaves = array($leaf);
     }
@@ -768,7 +768,7 @@
             return $leaf->leaves[0]; // ( NOT ( NOT x ) ) -> x
         return $this;
     }
-    
+
     function regexp() {
         $leaf = &$this->leaves[0];
         return '(?!' . $leaf->regexp() . ')';
@@ -828,7 +828,7 @@
 extends TextSearchQuery_node_binop
 {
     var $op = "AND";
-    
+
     function optimize() {
         $this->_flatten();
 
@@ -851,7 +851,7 @@
                       (new TextSearchQuery_node_or($nots)) );
             array_unshift($this->leaves, $node->optimize());
         }
-        
+
         assert(!empty($this->leaves));
         if (count($this->leaves) == 1)
             return $this->leaves[0];  // (AND x) -> x
@@ -882,7 +882,7 @@
     function regexp() {
         // We will combine any of our direct descendents which are WORDs
         // into a single (?=.*(?:word1|word2|...)) regexp.
-        
+
         $regexps = array();
         $words = array();
 
@@ -917,39 +917,39 @@
 //   op's (and, or, not) are forced to lowercase in the tokenizer.
 //
 ////////////////////////////////////////////////////////////////
-class TextSearchQuery_Parser 
+class TextSearchQuery_Parser
 {
     /*
      * This is a simple recursive descent parser, based on the following grammar:
      *
-     * toplist	:
-     *		| toplist expr
-     *		;
+     * toplist    :
+     *        | toplist expr
+     *        ;
      *
      *
-     * list	: expr
-     *		| list expr
-     *		;
+     * list    : expr
+     *        | list expr
+     *        ;
      *
-     * expr	: atom
-     *		| expr BINOP atom
-     *		;
+     * expr    : atom
+     *        | expr BINOP atom
+     *        ;
      *
-     * atom	: '(' list ')'
-     *		| NOT atom
-     *		| WORD
-     *		;
+     * atom    : '(' list ')'
+     *        | NOT atom
+     *        | WORD
+     *        ;
      *
      * The terminal tokens are:
      *
      *
-     * and|or		  BINOP
-     * -|not		  NOT
-     * (		  LPAREN
-     * )		  RPAREN
+     * and|or          BINOP
+     * -|not          NOT
+     * (          LPAREN
+     * )          RPAREN
      * /[^-()\s][^()\s]*  WORD
-     * /"[^"]*"/	  WORD
-     * /'[^']*'/	  WORD
+     * /"[^"]*"/      WORD
+     * /'[^']*'/      WORD
      *
      * ^WORD              TextSearchQuery_phrase_starts_with
      * WORD*              STARTS_WITH
@@ -968,7 +968,7 @@
         unset($this->lexer);
         return $tree;
     }
-    
+
     function get_list ($is_toplevel = false) {
         $list = array();
 
@@ -977,10 +977,10 @@
         $accept_as_words = TSQ_TOK_NOT | TSQ_TOK_BINOP;
         if ($is_toplevel)
             $accept_as_words |= TSQ_TOK_LPAREN | TSQ_TOK_RPAREN;
-        
+
         while ( ($expr = $this->get_expr())
                 || ($expr = $this->get_word($accept_as_words)) )
-	{
+    {
             $list[] = $expr;
         }
 
@@ -1002,14 +1002,14 @@
     function get_expr () {
         if ( ($expr = $this->get_atom()) === false ) // protect against '0'
             return false;
-        
+
         $savedpos = $this->lexer->tell();
         // Bug#1791564: allow string '0'
         while ( ($op = $this->lexer->get(TSQ_TOK_BINOP)) !== false) {
             if ( ! ($right = $this->get_atom()) ) {
                 break;
             }
-            
+
             if ($op == 'and')
                 $expr = new TextSearchQuery_node_and(array($expr, $right));
             else {
@@ -1023,8 +1023,8 @@
 
         return $expr;
     }
-    
 
+
     function get_atom() {
         if ($atom = $this->get_word(TSQ_ALLWORDS)) // Bug#1791564 not involved: '*'
             return $atom;
@@ -1034,9 +1034,9 @@
             if ( ($list = $this->get_list()) && $this->lexer->get(TSQ_TOK_RPAREN) ) {
                 return $list;
             } else {
-            	// Fix Bug#1792170
+                // Fix Bug#1792170
                 // Handle " ( " or "(test" without closing ")" as plain word
-		$this->lexer->seek($savedpos);
+        $this->lexer->seek($savedpos);
                 return new TextSearchQuery_node_word($this->lexer->get(-1));
             }
         }
@@ -1049,23 +1049,23 @@
     }
 
     function get_word($accept = TSQ_ALLWORDS) {
-    	// Performance shortcut for ( and ). This is always false
-	if (!empty($this->lexer->tokens[$this->lexer->pos])) {
-	    list ($type, $val) = $this->lexer->tokens[$this->lexer->pos];
-	    if ($type == TSQ_TOK_LPAREN or $type == TSQ_TOK_RPAREN)
-		return false;
-	}
+        // Performance shortcut for ( and ). This is always false
+    if (!empty($this->lexer->tokens[$this->lexer->pos])) {
+        list ($type, $val) = $this->lexer->tokens[$this->lexer->pos];
+        if ($type == TSQ_TOK_LPAREN or $type == TSQ_TOK_RPAREN)
+        return false;
+    }
         foreach (array("WORD","STARTS_WITH","ENDS_WITH","EXACT",
                        "REGEX","REGEX_GLOB","REGEX_PCRE","ALL") as $tok) {
             $const = constant("TSQ_TOK_".$tok);
             // Bug#1791564: allow word '0'
-            if ( $accept & $const and 
+            if ( $accept & $const and
                 (($word = $this->lexer->get($const)) !== false))
             {
                 // phrase or word level?
                 if ($tok == 'STARTS_WITH' and $this->lexer->query_str[0] == '^')
                     $classname = "TextSearchQuery_phrase_".strtolower($tok);
-                elseif ($tok == 'ENDS_WITH' and 
+                elseif ($tok == 'ENDS_WITH' and
                         string_ends_with($this->lexer->query_str,'$'))
                     $classname = "TextSearchQuery_phrase_".strtolower($tok);
                 else
@@ -1078,8 +1078,8 @@
 }
 
 class TextSearchQuery_Lexer {
-    function TextSearchQuery_Lexer ($query_str, $case_exact=false, 
-                                    $regex=TSQ_REGEX_AUTO) 
+    function TextSearchQuery_Lexer ($query_str, $case_exact=false,
+                                    $regex=TSQ_REGEX_AUTO)
     {
         $this->tokens = $this->tokenize($query_str, $case_exact, $regex);
         $this->query_str = $query_str;
@@ -1097,7 +1097,7 @@
     function eof() {
         return $this->pos == count($this->tokens);
     }
-    
+
     /**
      * TODO: support more regex styles, esp. prefer the forced ones over auto
      * re: and // stuff
@@ -1128,7 +1128,7 @@
                 $val = "%";
                 $type = TSQ_TOK_ALL;
             }
-            
+
             // ^word
             elseif ($regex & (TSQ_REGEX_AUTO|TSQ_REGEX_POSIX|TSQ_REGEX_PCRE)
                     and preg_match('/^\^([^-()][^()\s]*)\s*/', $buf, $m)) {
@@ -1167,7 +1167,7 @@
                 $val = strtolower($m[1]);
                 $type = TSQ_TOK_NOT;
             }
-            
+
             // "words "
             elseif (preg_match('/^ " ( (?: [^"]+ | "" )* ) " \s*/x', $buf, $m)) {
                 $val = str_replace('""', '"', $m[1]);
@@ -1191,27 +1191,27 @@
 
             /* refine the simple parsing from above: bla*bla, bla?bla, ...
             if ($regex and $type == TSQ_TOK_WORD) {
-            	if (substr($val,0,1) == "^")
-            	    $type = TSQ_TOK_STARTS_WITH;
-            	elseif (substr($val,0,1) == "*")
-            	    $type = TSQ_TOK_ENDS_WITH;
-            	elseif (substr($val,-1,1) == "*")
-            	    $type = TSQ_TOK_STARTS_WITH;
+                if (substr($val,0,1) == "^")
+                    $type = TSQ_TOK_STARTS_WITH;
+                elseif (substr($val,0,1) == "*")
+                    $type = TSQ_TOK_ENDS_WITH;
+                elseif (substr($val,-1,1) == "*")
+                    $type = TSQ_TOK_STARTS_WITH;
             }
             */
             $tokens[] = array($type, $val);
         }
         return $tokens;
     }
-    
+
     function get($accept) {
         if ($this->pos >= count($this->tokens))
             return false;
-        
+
         list ($type, $val) = $this->tokens[$this->pos];
         if (($type & $accept) == 0)
             return false;
-        
+
         $this->pos++;
         return $val;
     }
@@ -1223,5 +1223,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/Units.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/Units.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/Units.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: Units.php 7417 2010-05-19 12:57:42Z vargenau $');
+<?php // $Id: Units.php 7964 2011-03-05 17:05:30Z vargenau $
 /**
  *
  * Interface to man units(1), /usr/share/units.dat
@@ -8,7 +8,7 @@
  * $ units "372.0 mi2" m^2
  *         Definition: 9.6347558e+08 m^2
  *
- * Called by: 
+ * Called by:
  *    CachedMarkup.php: Cached_SemanticLink::_expandurl()
  *    SemanticWeb.php: class SemanticAttributeSearchQuery
  *
@@ -23,80 +23,80 @@
 
 class Units {
     function Units ($UNITSFILE = false) {
-    	if (DISABLE_UNITS)
-    	    $this->errcode = 1;
-    	elseif (defined("UNITS_EXE")) // ignore dynamic check
-	    $this->errcode = 0;
-	else
-    	    exec("units m2", $o, $this->errcode);
+        if (DISABLE_UNITS)
+            $this->errcode = 1;
+        elseif (defined("UNITS_EXE")) // ignore dynamic check
+        $this->errcode = 0;
+    else
+            exec("units m2", $o, $this->errcode);
     }
 
     /**
      * $this->_attribute_base = $units->Definition($this->_attribute);
      */
     function Definition ($query) {
-	static $Definitions = array();
-	if (isset($Definitions[$query])) return $Definitions[$query];
-	if ($this->errcode)
+    static $Definitions = array();
+    if (isset($Definitions[$query])) return $Definitions[$query];
+    if ($this->errcode)
             return $query;
-	$query = preg_replace("/,/","", $query);
-	if ($query == '' or $query == '*') 
-	    return ($Definitions[$query] = '');
-	// detect date values, currently only ISO: YYYY-MM-DD or YY-MM-DD
-	if (preg_match("/^(\d{2,4})-(\d{1,2})-(\d{1,2})$/",$query, $m)) {
-	    $date = mktime(0,0,0,$m[2],$m[3],$m[1]);
-	    return ($Definitions[$query] = "$date date");
-	}
-	if (preg_match("/^(\d{2,4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{2}):?(\d{2})?$/",$query, $m)) {
-	    $date = mktime($m[4],$m[5],@$m[6],$m[2],$m[3],$m[1]);
-	    return ($Definitions[$query] = "$date date");
-	}
-	$def = $this->_cmd("\"$query\"");
-	if (preg_match("/Definition: (.+)$/",$def,$m))
-	    return ($Definitions[$query] = $m[1]);
-	else {
-	    trigger_error("units: ". $def, E_USER_WARNING);
-	    return '';
-	}
+    $query = preg_replace("/,/","", $query);
+    if ($query == '' or $query == '*')
+        return ($Definitions[$query] = '');
+    // detect date values, currently only ISO: YYYY-MM-DD or YY-MM-DD
+    if (preg_match("/^(\d{2,4})-(\d{1,2})-(\d{1,2})$/",$query, $m)) {
+        $date = mktime(0,0,0,$m[2],$m[3],$m[1]);
+        return ($Definitions[$query] = "$date date");
     }
+    if (preg_match("/^(\d{2,4})-(\d{1,2})-(\d{1,2}) (\d{1,2}):(\d{2}):?(\d{2})?$/",$query, $m)) {
+        $date = mktime($m[4],$m[5],@$m[6],$m[2],$m[3],$m[1]);
+        return ($Definitions[$query] = "$date date");
+    }
+    $def = $this->_cmd("\"$query\"");
+    if (preg_match("/Definition: (.+)$/",$def,$m))
+        return ($Definitions[$query] = $m[1]);
+    else {
+        trigger_error("units: ". $def, E_USER_WARNING);
+        return '';
+    }
+    }
 
     /**
-     * We must ensure that the same baseunits are matched against. 
+     * We must ensure that the same baseunits are matched against.
      * We cannot compare m^2 to m or ''
      * $val_base = $this->_units->basevalue($value); // SemanticAttributeSearchQuery
      */
     function basevalue($query, $def = false) {
-	if (!$def) $def = $this->Definition($query);
-	if ($def) {
-	    if (is_numeric($def)) // e.g. "1 million"
-	        return $def;
-	    if (preg_match("/^([-0-9].*) \w.*$/",$def,$m))
-		return $m[1];
-	}
-	return '';
+    if (!$def) $def = $this->Definition($query);
+    if ($def) {
+        if (is_numeric($def)) // e.g. "1 million"
+            return $def;
+        if (preg_match("/^([-0-9].*) \w.*$/",$def,$m))
+        return $m[1];
     }
+    return '';
+    }
 
     /**
      * $this->_unit = $units->baseunit($this->_attribute);  // SemanticAttributeSearchQuery
      * and Cached_SemanticLink::_expandurl()
      */
     function baseunit($query, $def  = false) {
-	if (!$def) $def = $this->Definition($query);
-	if ($def) {
-	    if (preg_match("/ (.+)$/",$def,$m))
-		return $m[1];
-	}
-	return '';
+    if (!$def) $def = $this->Definition($query);
+    if ($def) {
+        if (preg_match("/ (.+)$/",$def,$m))
+        return $m[1];
     }
+    return '';
+    }
 
     function _cmd($args) {
-	if ($this->errcode) return $args;
-	if (defined("UNITS_EXE")) {
-	    $s = UNITS_EXE ." $args";
-	    $result = `$s`;
-	}
-	else 
-	    $result = `units $args`;
-	return trim($result);
+    if ($this->errcode) return $args;
+    if (defined("UNITS_EXE")) {
+        $s = UNITS_EXE ." $args";
+        $result = `$s`;
     }
+    else
+        $result = `units $args`;
+    return trim($result);
+    }
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiCallback.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiCallback.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiCallback.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: WikiCallback.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikiCallback.php 7964 2011-03-05 17:05:30Z vargenau $
 
 /**
  * A callback
@@ -36,7 +36,7 @@
         }
         trigger_error("WikiCallback::new: bad arg", E_USER_ERROR);
     }
-  
+
     /**
      * Call callback.
      *
@@ -161,5 +161,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/ADODB.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/ADODB.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/ADODB.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ADODB.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ADODB.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/PDO.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/PDO.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/PDO.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PDO.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PDO.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/SQL.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/SQL.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/SQL.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: SQL.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: SQL.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB.php');
 //require_once('lib/WikiDB/backend/PearDB.php');

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ADODB.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: ADODB.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mssql.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mssql.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mssql.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ADODB_mssql.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ADODB_mssql.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /**
  * MS SQL extensions for the ADODB DB backend.

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mssqlnative.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mssqlnative.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ADODB_mssqlnative.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ADODB_mssqlnative.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /**
  * MS SQL extensions for the ADODB DB backend.

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mysql.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_mysql.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ADODB_mysql.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ADODB_mysql.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend/ADODB.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ADODB_oci8po.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ADODB_oci8po.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /**
  * Oracle extensions for the ADODB DB backend.

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_postgres7.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_postgres7.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ADODB_postgres7.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ADODB_postgres7.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend/ADODB.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_sqlite.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_sqlite.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ADODB_sqlite.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ADODB_sqlite.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend/ADODB.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PDO.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: PDO.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 2005 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_mysql.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_mysql.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PDO_mysql.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: PDO_mysql.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 2005 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_oci8.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_oci8.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PDO_oci8.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: PDO_oci8.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 2007 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_pgsql.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PDO_pgsql.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PDO_pgsql.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: PDO_pgsql.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 2005 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PearDB.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PearDB.php 8042 2011-04-13 13:02:42Z vargenau $
 
 require_once('lib/WikiDB/backend.php');
 //require_once('lib/FileFinder.php');
@@ -395,7 +395,7 @@
         unset($data['mtime']);
         assert(!empty($mtime));
 
-        @$content = (string) $data['%content'];
+        $content = isset($data['%content']) ? (string)$data['%content'] : '';
         unset($data['%content']);
 
         unset($data['%pagedata']);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_ffpgsql.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_ffpgsql.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PearDB_ffpgsql.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PearDB_ffpgsql.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright (C) 2001-2009 $ThePhpWikiProgrammingTeam
@@ -18,9 +18,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source
@@ -110,8 +110,12 @@
             $this->_get_pageid($pagename, true); // Creates page record
         }
       
-        @$hits = (int)$data['hits'];
-        unset($data['hits']);
+        if (isset($data['hits'])) {
+             $hits = (int)$data['hits'];
+             unset($data['hits']);
+        } else {
+             $hits = 0;
+        }
 
         foreach ($newdata as $key => $val) {
             if ($key == 'hits')
@@ -319,6 +323,9 @@
         else
             $exclude='';
 
+        // Horrible hack
+        $include_empty=false;
+
         if (strstr($orderby, 'mtime ')) { // multiple columns possible
             if ($include_empty) {
                 $sql = "SELECT "

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_mysql.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_mysql.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PearDB_mysql.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PearDB_mysql.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend/PearDB.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PearDB_oci8.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PearDB_oci8.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /**
  * Oracle extensions for the Pear DB backend.

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_pgsql.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_pgsql.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PearDB_pgsql.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PearDB_pgsql.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/ErrorManager.php');
 require_once('lib/WikiDB/backend/PearDB.php');

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_sqlite.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_sqlite.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_sqlite.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -8,7 +8,7 @@
  * sqlite -init /tmp/phpwiki-sqlite.db
  * sqlite /tmp/phpwiki-sqlite.db < schemas/sqlite.sql
  */
-// rcs_id('$Id: PearDB_sqlite.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PearDB_sqlite.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend/PearDB.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/cvs.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/cvs.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/cvs.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: cvs.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: cvs.php 7956 2011-03-03 17:08:31Z vargenau $
 /**
  * Backend for handling CVS repository.
  *

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dba.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dba.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dba.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: dba.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: dba.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend/dbaBase.php');
 require_once('lib/DbaDatabase.php');

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dbaBase.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dbaBase.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dbaBase.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: dbaBase.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: dbaBase.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/AllRevisionsIter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: AllRevisionsIter.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: AllRevisionsIter.php 7956 2011-03-03 17:08:31Z vargenau $
   
 /**
  * An iterator which returns all revisions of page.

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/BackLinkIter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/BackLinkIter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: BackLinkIter.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: BackLinkIter.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/LinkSearchIter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/LinkSearchIter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: LinkSearchIter.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: LinkSearchIter.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/MostPopularIter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/MostPopularIter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: MostPopularIter.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: MostPopularIter.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/MostRecentIter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/MostRecentIter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: MostRecentIter.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: MostRecentIter.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB/backend.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/TextSearchIter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/TextSearchIter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: TextSearchIter.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: TextSearchIter.php 7956 2011-03-03 17:08:31Z vargenau $
 
 class WikiDB_backend_dumb_TextSearchIter
 extends WikiDB_backend_iterator

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/WantedPagesIter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/dumb/WantedPagesIter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WantedPagesIter.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WantedPagesIter.php 7956 2011-03-03 17:08:31Z vargenau $
 
 //require_once('lib/WikiDB/backend.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/file.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/file.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/file.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: file.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: file.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /**
  * Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/flatfile.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/flatfile.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend/flatfile.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: flatfile.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: flatfile.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /**
  * Copyright 1999,2005,2006 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/backend.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,24 @@
-<?php // -*-php-*-
-// rcs_id('$Id: backend.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php
+// $Id: backend.php 8071 2011-05-18 14:56:14Z vargenau $
+/*
+ * Copyright 2004-2010 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.,
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 
 /*
   Pagedata
@@ -183,7 +202,7 @@
     }
 
     /**
-     * Delete page (and all it's revisions) from the database.
+     * Delete page (and all its revisions) from the database.
      *
      */
     function purge_page($pagename) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/cvs.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/cvs.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/cvs.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
 <?php
 
-// rcs_id( '$Id: cvs.php 7417 2010-05-19 12:57:42Z vargenau $' );
+// $Id: cvs.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once( 'lib/WikiDB.php' );
 require_once( 'lib/WikiDB/backend/cvs.php' );

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/dba.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/dba.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/dba.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: dba.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: dba.php 7956 2011-03-03 17:08:31Z vargenau $
 
 require_once('lib/WikiDB.php');
 require_once('lib/WikiDB/backend/dba.php');

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/file.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/file.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/file.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
 <?php
 
-// rcs_id( '$Id: file.php 7641 2010-08-11 13:00:46Z vargenau $' );
+// $Id: file.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /**
  * Copyright 1999, 2000, 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/flatfile.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/flatfile.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB/flatfile.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id( '$Id: flatfile.php 7641 2010-08-11 13:00:46Z vargenau $' );
+// $Id: flatfile.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /**
  * Copyright 1999, 2005 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiDB.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php //rcs_id('$Id: WikiDB.php 7614 2010-07-15 15:56:21Z vargenau $');
+<?php //$Id: WikiDB.php 8063 2011-05-04 10:22:51Z vargenau $
 require_once('lib/PageType.php');
 
 /**
@@ -17,7 +17,7 @@
 if (!defined('WIKIDB_FORCE_CREATE'))
     define('WIKIDB_FORCE_CREATE', -1);
 
-/** 
+/**
  * Abstract base class for the database used by PhpWiki.
  *
  * A <tt>WikiDB</tt> is a container for <tt>WikiDB_Page</tt>s which in
@@ -62,7 +62,7 @@
      *   <dt> dba
      *     <dd> Dba based backend. The default and by far the fastest.
      *   <dt> cvs
-     *     <dd> 
+     *     <dd>
      *   <dt> file
      *     <dd> flat files
      *   </dl>
@@ -79,9 +79,9 @@
      *      Which directory db files reside in.
      *
      * <dt> timeout
-     * <dd> Used only by the dba backend so far. 
+     * <dd> Used only by the dba backend so far.
      *      And: When optimizing mysql it closes timed out mysql processes.
-     *      otherwise only used for dba: Timeout in seconds for opening (and 
+     *      otherwise only used for dba: Timeout in seconds for opening (and
      *      obtaining lock) on the dbm file.
      *
      * <dt> dba_handler
@@ -100,7 +100,7 @@
     function open ($dbparams) {
         $dbtype = $dbparams{'dbtype'};
         include_once("lib/WikiDB/$dbtype.php");
-				
+
         $class = 'WikiDB_' . $dbtype;
         return new $class ($dbparams);
     }
@@ -116,22 +116,22 @@
         $this->_backend =& $backend;
         // don't do the following with the auth_dsn!
         if (isset($dbparams['auth_dsn'])) return;
-        
+
         $this->_cache = new WikiDB_cache($backend);
         if (!empty($GLOBALS['request'])) $GLOBALS['request']->_dbi = $this;
 
         // If the database doesn't yet have a timestamp, initialize it now.
         if ($this->get('_timestamp') === false)
             $this->touch();
-        
+
         // devel checking.
         if ((int)DEBUG & _DEBUG_SQL) {
             $this->_backend->check();
-	}
+    }
         // might be changed when opening the database fails
         $this->readonly = defined("READONLY") ? READONLY : false;
     }
-    
+
     /**
      * Close database connection.
      *
@@ -147,7 +147,7 @@
         $this->_backend->close();
         $this->_cache->close();
     }
-    
+
     /**
      * Get a WikiDB_Page from a WikiDB.
      *
@@ -202,12 +202,12 @@
     }
 
     /**
-     * Delete page from the WikiDB. 
+     * Delete page from the WikiDB.
      *
      * Deletes the page from the WikiDB with the possibility to revert and diff.
      * //Also resets all page meta-data to the default values.
      *
-     * Note: purgePage() effectively destroys all revisions of the page from the WikiDB. 
+     * Note: purgePage() effectively destroys all revisions of the page from the WikiDB.
      *
      * @access public
      * @param string $pagename Name of page to delete.
@@ -215,10 +215,10 @@
      */
     function deletePage($pagename) {
         if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
-    	// don't create empty revisions of already purged pages.
+        // don't create empty revisions of already purged pages.
         if ($this->_backend->get_latest_version($pagename))
             $result = $this->_cache->delete_page($pagename);
-        else 
+        else
             $result = -1;
 
         /* Generate notification emails */
@@ -252,7 +252,7 @@
         $this->deletePage($pagename); // just for the notification
         return $result;
     }
-    
+
     /**
      * Retrieve all pages.
      *
@@ -264,21 +264,21 @@
      * recent revision has empty content are considered to be
      * non-existant. Unless $include_defaulted is set to true, those
      * pages will not be returned.
-     * @param string or false $sortby Optional. "+-column,+-column2". 
-     *		If false the result is faster in natural order.
+     * @param string or false $sortby Optional. "+-column,+-column2".
+     *        If false the result is faster in natural order.
      * @param string or false $limit Optional. Encoded as "$offset,$count".
-     * 		$offset defaults to 0.
-     * @param string $exclude: Optional comma-seperated list of pagenames. 
+     *         $offset defaults to 0.
+     * @param string $exclude: Optional comma-seperated list of pagenames.
      *
      * @return WikiDB_PageIterator A WikiDB_PageIterator which contains all pages
      *     in the WikiDB which have non-default contents.
      */
-    function getAllPages($include_empty=false, $sortby='', $limit='', $exclude='') 
+    function getAllPages($include_empty=false, $sortby='', $limit='', $exclude='')
     {
-        $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit, 
+        $result = $this->_backend->get_all_pages($include_empty, $sortby, $limit,
                                                  $exclude);
-        return new WikiDB_PageIterator($this, $result, 
-                                       array('include_empty' => $include_empty, 
+        return new WikiDB_PageIterator($this, $result,
+                                       array('include_empty' => $include_empty,
                                              'exclude' => $exclude,
                                              'limit_by_db' => $result->_options['limit_by_db'],
                                              'limit' => $result->limit()));
@@ -288,13 +288,13 @@
      * @access public
      *
      * @param boolean $include_empty If true include also empty pages
-     * @param string $exclude: comma-seperated list of pagenames. 
-     * 			TBD: array of pagenames
+     * @param string $exclude: comma-seperated list of pagenames.
+     *             TBD: array of pagenames
      * @return integer
-     * 
+     *
      */
     function numPages($include_empty=false, $exclude='') {
-    	if (method_exists($this->_backend, 'numPages'))
+        if (method_exists($this->_backend, 'numPages'))
             // FIXME: currently are all args ignored.
             $count = $this->_backend->numPages($include_empty, $exclude);
         else {
@@ -305,7 +305,7 @@
         }
         return (int)$count;
     }
-    
+
     /**
      * Title search.
      *
@@ -318,11 +318,11 @@
      *
      * @access public
      * @param TextSearchQuery $search A TextSearchQuery object
-     * @param string or false $sortby Optional. "+-column,+-column2". 
-     *		If false the result is faster in natural order.
+     * @param string or false $sortby Optional. "+-column,+-column2".
+     *        If false the result is faster in natural order.
      * @param string or false $limit Optional. Encoded as "$offset,$count".
-     * 		$offset defaults to 0.
-     * @param string $exclude: Optional comma-seperated list of pagenames. 
+     *         $offset defaults to 0.
+     * @param string $exclude: Optional comma-seperated list of pagenames.
      * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages.
      * @see TextSearchQuery
      */
@@ -348,11 +348,11 @@
      * @access public
      *
      * @param TextSearchQuery $search A TextSearchQuery object.
-     * @param string or false $sortby Optional. "+-column,+-column2". 
-     *		If false the result is faster in natural order.
+     * @param string or false $sortby Optional. "+-column,+-column2".
+     *        If false the result is faster in natural order.
      * @param string or false $limit Optional. Encoded as "$offset,$count".
-     * 		$offset defaults to 0.
-     * @param string $exclude: Optional comma-seperated list of pagenames. 
+     *         $offset defaults to 0.
+     * @param string $exclude: Optional comma-seperated list of pagenames.
      * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages.
      * @see TextSearchQuery
      */
@@ -375,8 +375,8 @@
      * @param integer $limit The maximum number of pages to return.
      * Set $limit to zero to return all pages.  If $limit < 0, pages will
      * be sorted in decreasing order of popularity.
-     * @param string or false $sortby Optional. "+-column,+-column2". 
-     *		If false the result is faster in natural order.
+     * @param string or false $sortby Optional. "+-column,+-column2".
+     *        If false the result is faster in natural order.
      *
      * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching
      * pages.
@@ -396,11 +396,11 @@
      * @param hash $params This hash is used to specify various optional
      *   parameters:
      * <dl>
-     * <dt> limit 
+     * <dt> limit
      *    <dd> (integer) At most this many revisions will be returned.
      * <dt> since
-     *    <dd> (integer) Only revisions since this time (unix-timestamp) 
-     *		will be returned. 
+     *    <dd> (integer) Only revisions since this time (unix-timestamp)
+     *        will be returned.
      * <dt> include_minor_revisions
      *    <dd> (boolean) Also include minor revisions.  (Default is not to.)
      * <dt> exclude_major_revisions
@@ -412,7 +412,7 @@
      *         for each page.
      * </dl>
      *
-     * @return WikiDB_PageRevisionIterator A WikiDB_PageRevisionIterator 
+     * @return WikiDB_PageRevisionIterator A WikiDB_PageRevisionIterator
      * containing the matching revisions.
      */
     function mostRecent($params = false) {
@@ -423,12 +423,12 @@
     /**
      * @access public
      *
-     * @param string or false $sortby Optional. "+-column,+-column2". 
-     *		If false the result is faster in natural order.
+     * @param string or false $sortby Optional. "+-column,+-column2".
+     *        If false the result is faster in natural order.
      * @param string or false $limit Optional. Encoded as "$offset,$count".
-     * 		$offset defaults to 0.
-     * @return Iterator A generic iterator containing rows of 
-     * 		(duplicate) pagename, wantedfrom.
+     *         $offset defaults to 0.
+     * @return Iterator A generic iterator containing rows of
+     *         (duplicate) pagename, wantedfrom.
      */
     function wantedPages($exclude_from='', $exclude='', $sortby='', $limit='') {
         return $this->_backend->wanted_pages($exclude_from, $exclude, $sortby, $limit);
@@ -436,7 +436,7 @@
     }
 
     /**
-     * Generic interface to the link table. Esp. useful to search for rdf triples as in 
+     * Generic interface to the link table. Esp. useful to search for rdf triples as in
      * SemanticSearch and ListRelations.
      *
      * @access public
@@ -451,22 +451,22 @@
      * <dt> "linkfrom"
      *    <dd> in-links, i.e BackLinks
      * <dt> "relation"
-     *    <dd> the first part in a <>::<> link 
+     *    <dd> the first part in a <>::<> link
      * <dt> "attribute"
-     *    <dd> the first part in a <>:=<> link 
+     *    <dd> the first part in a <>:=<> link
      * </dl>
-     * @param $relation object An optional TextSearchQuery to match the 
+     * @param $relation object An optional TextSearchQuery to match the
      * relation name. Ignored on simple in-out links.
      *
      * @return Iterator A generic iterator containing links to pages or values.
-     *                  hash of "pagename", "linkname", "linkvalue. 
+     *                  hash of "pagename", "linkname", "linkvalue.
      */
     function linkSearch($pages, $search, $linktype, $relation=false) {
         return $this->_backend->link_search($pages, $search, $linktype, $relation);
     }
 
     /**
-     * Return a simple list of all defined relations (and attributes), mainly 
+     * Return a simple list of all defined relations (and attributes), mainly
      * for the SemanticSearch autocompletion.
      *
      * @access public
@@ -476,24 +476,24 @@
     function listRelations($also_attributes=false, $only_attributes=false, $sorted=true) {
         if (method_exists($this->_backend, "list_relations"))
             return $this->_backend->list_relations($also_attributes, $only_attributes, $sorted);
-	// dumb, slow fallback. no iter, so simply define it here.
+    // dumb, slow fallback. no iter, so simply define it here.
         $relations = array();
         $iter = $this->getAllPages();
         while ($page = $iter->next()) {
             $reliter = $page->getRelations();
             $names = array();
             while ($rel = $reliter->next()) {
-		// if there's no pagename it's an attribute
+        // if there's no pagename it's an attribute
                 $names[] = $rel->getName();
             }
             $relations = array_merge($relations, $names);
             $reliter->free();
         }
         $iter->free();
-	if ($sorted) {
-	    sort($relations);
-	    reset($relations);
-	}
+    if ($sorted) {
+        sort($relations);
+        reset($relations);
+    }
         return $relations;
     }
 
@@ -517,27 +517,27 @@
             //update all WikiLinks in existing pages
             //non-atomic! i.e. if rename fails the links are not undone
             if ($updateWikiLinks) {
-		$lookbehind = "/(?<=[\W:])\Q";
-		$lookahead = "\E(?=[\W:])/";
+        $lookbehind = "/(?<=[\W:])\Q";
+        $lookahead = "\E(?=[\W:])/";
                 require_once('lib/plugin/WikiAdminSearchReplace.php');
                 $links = $oldpage->getBackLinks();
                 while ($linked_page = $links->next()) {
                     WikiPlugin_WikiAdminSearchReplace::replaceHelper
-			($this,
-			 $linked_page->getName(),
-			 $lookbehind.$from.$lookahead, $to, 
-			 true, true);
+            ($this,
+             $linked_page->getName(),
+             $lookbehind.$from.$lookahead, $to,
+             true, true);
                 }
-                // FIXME: Disabled to avoid recursive modification when renaming 
+                // FIXME: Disabled to avoid recursive modification when renaming
                 // a page like 'PageFoo to 'PageFooTwo'
                 if (0) {
                   $links = $newpage->getBackLinks();
                   while ($linked_page = $links->next()) {
                     WikiPlugin_WikiAdminSearchReplace::replaceHelper
-			($this,
-			 $linked_page->getName(),
-			 $lookbehind.$from.$lookahead, $to, 
-			 true, true);
+            ($this,
+             $linked_page->getName(),
+             $lookbehind.$from.$lookahead, $to,
+             true, true);
                   }
                 }
             }
@@ -549,7 +549,7 @@
                     $meta = $current->_data;
                     $version = $current->getVersion();
                     $meta['summary'] = sprintf(_("renamed from %s"), $from);
-		    unset($meta['mtime']); // force new date
+            unset($meta['mtime']); // force new date
                     $page->save($current->getPackedContent(), $version + 1, $meta);
                 }
             } elseif (!$oldpage->getCurrentRevision(false) and !$newpage->exists()) {
@@ -587,7 +587,7 @@
         $ts = $this->get('_timestamp');
         return sprintf("%d %d", $ts[0], $ts[1]);
     }
-    
+
     /**
      * Update the database timestamp.
      *
@@ -606,7 +606,7 @@
     function set_db_version($ver) {
         return $this->set('_db_version', (float)$ver);
     }
-        
+
     /**
      * Access WikiDB global meta-data.
      *
@@ -656,7 +656,7 @@
         if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
         if (!$key || $key[0] == '%')
             return;
-        
+
         $gd = $this->getPage('global_data');
         $data = $gd->get('__global');
         if ($data === false)
@@ -675,9 +675,7 @@
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
     function genericSqlQuery($sql, $args=false) {
-        if (function_exists('debug_backtrace')) { // >= 4.3.0
-            echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
-        }
+        echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
         trigger_error("no SQL database", E_USER_ERROR);
         return false;
     }
@@ -685,13 +683,11 @@
     // SQL iter: for simple select or create/update queries
     // returns the generic iterator object (count,next)
     function genericSqlIter($sql, $field_list = NULL) {
-        if (function_exists('debug_backtrace')) { // >= 4.3.0
-            echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
-        }
+        echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
         trigger_error("no SQL database", E_USER_ERROR);
         return false;
     }
-    
+
     // see backend upstream methods
     // ADODB adds surrounding quotes, SQL not yet!
     function quote ($s) {
@@ -701,7 +697,7 @@
     function isOpen () {
         global $request;
         if (!$request->_dbi) return false;
-        else return false; /* so far only needed for sql so false it. 
+        else return false; /* so far only needed for sql so false it.
                             later we have to check dba also */
     }
 
@@ -729,7 +725,7 @@
  * A WikiDB_Page contains a number (at least one) of
  * WikiDB_PageRevisions.
  */
-class WikiDB_Page 
+class WikiDB_Page
 {
     function WikiDB_Page(&$wikidb, $pagename) {
         $this->_wikidb = &$wikidb;
@@ -738,7 +734,7 @@
             if (!(is_string($pagename) and $pagename != '')) {
                 if (function_exists("xdebug_get_function_stack")) {
                     echo "xdebug_get_function_stack(): "; var_dump(xdebug_get_function_stack());
-                } elseif (function_exists("debug_backtrace")) { // >= 4.3.0
+                } else {
                     printSimpleTrace(debug_backtrace());
                 }
                 trigger_error("empty pagename", E_USER_WARNING);
@@ -759,9 +755,9 @@
     function getName() {
         return $this->_pagename;
     }
-    
+
     // To reduce the memory footprint for larger sets of pagelists,
-    // we don't cache the content (only true or false) and 
+    // we don't cache the content (only true or false) and
     // we purge the pagedata (_cached_html) also
     function exists() {
         if (isset($this->_wikidb->_cache->_id_cache[$this->_pagename])) return true;
@@ -876,13 +872,13 @@
         $backend->unlock(array('version'));
     }
 
-    
+
     /**
      * Create a new revision of a {@link WikiDB_Page}.
      *
      * @access public
      *
-     * @param int $version Version number for new revision.  
+     * @param int $version Version number for new revision.
      * To ensure proper serialization of edits, $version must be
      * exactly one higher than the current latest version.
      * (You can defeat this check by setting $version to
@@ -904,7 +900,7 @@
         $cache = &$this->_wikidb->_cache;
         $pagename = &$this->_pagename;
         $cache->invalidate_cache($pagename);
-        
+
         $backend->lock(array('version','page','recent','link','nonempty'));
 
         $latestversion = $backend->get_latest_version($pagename);
@@ -917,16 +913,16 @@
         }
 
         $data = $metadata;
-        
+
         foreach ($data as $key => $val) {
             if (empty($val) || $key[0] == '_' || $key[0] == '%')
                 unset($data[$key]);
         }
-			
+
         assert(!empty($data['author']));
         if (empty($data['author_id']))
             @$data['author_id'] = $data['author'];
-		
+
         if (empty($data['mtime']))
             $data['mtime'] = time();
 
@@ -940,9 +936,9 @@
                 $data['orig_mtime'] = $data['mtime'];
                 $data['mtime'] = $pdata['mtime'];
             }
-            
-	    // FIXME: use (possibly user specified) 'mtime' time or
-	    // time()?
+
+        // FIXME: use (possibly user specified) 'mtime' time or
+        // time()?
             $cache->update_versiondata($pagename, $latestversion,
                                        array('_supplanted' => $data['mtime']));
         }
@@ -953,7 +949,7 @@
 
         //$cache->update_pagedata($pagename, array(':latestversion' => $newversion,
         //':deleted' => empty($content)));
-        
+
         $backend->set_links($pagename, $links);
 
         $backend->unlock(array('version','page','recent','link','nonempty'));
@@ -969,7 +965,7 @@
      *
      * @param string $wikitext  The page content.
      *
-     * @param int $version Version number for new revision.  
+     * @param int $version Version number for new revision.
      * To ensure proper serialization of edits, $version must be
      * exactly one higher than the current latest version.
      * (You can defeat this check by setting $version to
@@ -979,11 +975,11 @@
      */
     function save($wikitext, $version, $meta, $formatted = null) {
         if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
-	if (is_null($formatted))
-	    $formatted = new TransformedText($this, $wikitext, $meta);
+    if (is_null($formatted))
+        $formatted = new TransformedText($this, $wikitext, $meta);
         $type = $formatted->getType();
-	$meta['pagetype'] = $type->getName();
-	$links = $formatted->getWikiPageLinks(); // linkto => relation
+    $meta['pagetype'] = $type->getName();
+    $links = $formatted->getWikiPageLinks(); // linkto => relation
         $attributes = array();
         foreach ($links as $link) {
             if ($link['linkto'] === "" and !empty($link['relation'])) {
@@ -992,18 +988,18 @@
         }
         $meta['attribute'] = $attributes;
 
-	$backend = &$this->_wikidb->_backend;
-	$newrevision = $this->createRevision($version, $wikitext, $meta, $links);
-	if ($newrevision and !WIKIDB_NOCACHE_MARKUP)
+    $backend = &$this->_wikidb->_backend;
+    $newrevision = $this->createRevision($version, $wikitext, $meta, $links);
+    if ($newrevision and !WIKIDB_NOCACHE_MARKUP)
             $this->set('_cached_html', $formatted->pack());
 
-	// FIXME: probably should have some global state information
-	// in the backend to control when to optimize.
+    // FIXME: probably should have some global state information
+    // in the backend to control when to optimize.
         //
         // We're doing this here rather than in createRevision because
         // postgresql can't optimize while locked.
         if (((int)DEBUG & _DEBUG_SQL)
-	    or (DATABASE_OPTIMISE_FREQUENCY > 0 and 
+        or (DATABASE_OPTIMISE_FREQUENCY > 0 and
                 (time() % DATABASE_OPTIMISE_FREQUENCY == 0))) {
             if ($backend->optimize()) {
                 if ((int)DEBUG)
@@ -1015,20 +1011,20 @@
         if (ENABLE_MAILNOTIFY and isa($newrevision, 'WikiDB_PageRevision')) {
             // Save didn't fail because of concurrent updates.
             $notify = $this->_wikidb->get('notify');
-            if (!empty($notify) 
-		and is_array($notify) 
-		and !isa($GLOBALS['request'],'MockRequest')) 
-	    {
+            if (!empty($notify)
+        and is_array($notify)
+        and !isa($GLOBALS['request'],'MockRequest'))
+        {
                 include_once("lib/MailNotify.php");
                 $MailNotify = new MailNotify($newrevision->getName());
-		$MailNotify->onChangePage ($this->_wikidb, $wikitext, $version, $meta);
+        $MailNotify->onChangePage ($this->_wikidb, $wikitext, $version, $meta);
             }
             $newrevision->_transformedContent = $formatted;
         }
         // more pagechange callbacks: (in a hackish manner for now)
-        if (ENABLE_RECENTCHANGESBOX 
+        if (ENABLE_RECENTCHANGESBOX
             and empty($meta['is_minor_edit'])
-            and !in_array($GLOBALS['request']->getArg('action'), 
+            and !in_array($GLOBALS['request']->getArg('action'),
                           array('loadfile','upgrade')))
         {
             require_once("lib/WikiPlugin.php");
@@ -1036,7 +1032,7 @@
             $p = $w->getPlugin("RecentChangesCached", false);
             $p->box_update(false, $GLOBALS['request'], $this->_pagename);
         }
-	return $newrevision;
+    return $newrevision;
     }
 
     /**
@@ -1044,17 +1040,17 @@
      *
      * @access public
      *
-     * @return WikiDB_PageRevision The current WikiDB_PageRevision object. 
+     * @return WikiDB_PageRevision The current WikiDB_PageRevision object.
      */
     function getCurrentRevision ($need_content=true) {
         $backend = &$this->_wikidb->_backend;
         $cache = &$this->_wikidb->_cache;
         $pagename = &$this->_pagename;
-        
+
         // Prevent deadlock in case of memory exhausted errors
         // Pure selection doesn't really need locking here.
         //   sf.net bug#927395
-        // I know it would be better to lock, but with lots of pages this deadlock is more 
+        // I know it would be better to lock, but with lots of pages this deadlock is more
         // severe than occasionally get not the latest revision.
         // In spirit to wikiwiki: read fast, edit slower.
         //$backend->lock();
@@ -1080,9 +1076,10 @@
     function getRevision ($version, $need_content=true) {
         $cache = &$this->_wikidb->_cache;
         $pagename = &$this->_pagename;
-        
-        if (! $version or $version == -1) // 0 or false
+
+        if ((!$version) or ($version == 0) or ($version == -1)) { // 0 or false
             return new WikiDB_PageRevision($this->_wikidb, $pagename, 0);
+        }
 
         assert($version > 0);
         $vdata = $cache->get_versiondata($pagename, $version, $need_content);
@@ -1142,11 +1139,11 @@
         $revs = $backend->get_all_revisions($this->_pagename);
         return new WikiDB_PageRevisionIterator($this->_wikidb, $revs);
     }
-    
+
     /**
      * Find pages which link to or are linked from a page.
-     * relations: $backend->get_links is responsible to add the relation to the pagehash 
-     * as 'linkrelation' key as pagename. See WikiDB_PageIterator::next 
+     * relations: $backend->get_links is responsible to add the relation to the pagehash
+     * as 'linkrelation' key as pagename. See WikiDB_PageIterator::next
      *   if (isset($next['linkrelation']))
      *
      * @access public
@@ -1156,17 +1153,17 @@
      * @return WikiDB_PageIterator A WikiDB_PageIterator containing
      * all matching pages.
      */
-    function getLinks ($reversed=true, $include_empty=false, $sortby='', 
-                       $limit='', $exclude='', $want_relations=false) 
+    function getLinks ($reversed=true, $include_empty=false, $sortby='',
+                       $limit='', $exclude='', $want_relations=false)
     {
         $backend = &$this->_wikidb->_backend;
-        $result =  $backend->get_links($this->_pagename, $reversed, 
+        $result =  $backend->get_links($this->_pagename, $reversed,
                                        $include_empty, $sortby, $limit, $exclude,
                                        $want_relations);
-        return new WikiDB_PageIterator($this->_wikidb, $result, 
+        return new WikiDB_PageIterator($this->_wikidb, $result,
                                        array('include_empty' => $include_empty,
-                                             'sortby'        => $sortby, 
-                                             'limit'         => $limit, 
+                                             'sortby'        => $sortby,
+                                             'limit'         => $limit,
                                              'exclude'       => $exclude,
                                              'want_relations'=> $want_relations));
     }
@@ -1174,37 +1171,37 @@
     /**
      * All Links from other pages to this page.
      */
-    function getBackLinks($include_empty=false, $sortby='', $limit='', $exclude='', 
-                          $want_relations=false) 
+    function getBackLinks($include_empty=false, $sortby='', $limit='', $exclude='',
+                          $want_relations=false)
     {
         return $this->getLinks(true, $include_empty, $sortby, $limit, $exclude);
     }
     /**
      * Forward Links: All Links from this page to other pages.
      */
-    function getPageLinks($include_empty=false, $sortby='', $limit='', $exclude='', 
-                          $want_relations=false) 
+    function getPageLinks($include_empty=false, $sortby='', $limit='', $exclude='',
+                          $want_relations=false)
     {
         return $this->getLinks(false, $include_empty, $sortby, $limit, $exclude);
     }
     /**
-     * Relations: All links from this page to other pages with relation <> 0. 
+     * Relations: All links from this page to other pages with relation <> 0.
      * is_a:=page or population:=number
      */
     function getRelations($sortby='', $limit='', $exclude='') {
         $backend = &$this->_wikidb->_backend;
         $result =  $backend->get_links($this->_pagename, false, true,
-                                       $sortby, $limit, $exclude, 
+                                       $sortby, $limit, $exclude,
                                        true);
         // we do not care for the linked page versiondata, just the pagename and linkrelation
-        return new WikiDB_PageIterator($this->_wikidb, $result, 
+        return new WikiDB_PageIterator($this->_wikidb, $result,
                                        array('include_empty' => true,
-                                             'sortby'        => $sortby, 
-                                             'limit'         => $limit, 
+                                             'sortby'        => $sortby,
+                                             'limit'         => $limit,
                                              'exclude'       => $exclude,
                                              'want_relations'=> true));
     }
-    
+
     /**
      * possibly faster link existance check. not yet accelerated.
      */
@@ -1229,11 +1226,11 @@
        => "At the page San Diego there is a relation link of 'is a' to the page 'city'."
      */
 
-    /* Semantic attributes for a page. 
+    /* Semantic attributes for a page.
        [San Diego] population:=1,305,736
        Attributes are links with the relation pointing to another page.
     */
-            
+
     /**
      * Access WikiDB_Page non version-specific meta-data.
      *
@@ -1251,7 +1248,7 @@
      * <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 
+     * <dt>'perm'  <dd> Permission flag to authorize read/write/execution of
      *                  page-headers and content.
      + <dt>'moderation'<dd> ModeratedPage data. Handled by plugin/ModeratedPage
      * <dt>'rating' <dd> Page rating. Handled by plugin/RateIt
@@ -1267,8 +1264,8 @@
             return false;
         // several new SQL backends optimize this.
         if (!WIKIDB_NOCACHE_MARKUP
-            and $key == '_cached_html' 
-            and method_exists($backend, 'get_cached_html')) 
+            and $key == '_cached_html'
+            and method_exists($backend, 'get_cached_html'))
         {
             return $backend->get_cached_html($this->_pagename);
         }
@@ -1305,12 +1302,12 @@
         $cache = &$this->_wikidb->_cache;
         $backend = &$this->_wikidb->_backend;
         $pagename = &$this->_pagename;
-        
+
         assert($key && $key[0] != '%');
 
         // several new SQL backends optimize this.
-        if (!WIKIDB_NOCACHE_MARKUP 
-            and $key == '_cached_html' 
+        if (!WIKIDB_NOCACHE_MARKUP
+            and $key == '_cached_html'
             and method_exists($backend, 'set_cached_html'))
         {
             if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
@@ -1328,7 +1325,10 @@
                 return;         // values identical, skip update.
         }
 
-        if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+        if (isset($this->_wikidb->readonly) and ($this->_wikidb->readonly)) {
+            trigger_error("readonly database", E_USER_WARNING);
+            return;
+        }
         $cache->update_pagedata($pagename, array($key => $newval));
     }
 
@@ -1411,7 +1411,7 @@
         for ($v=1; $v <= $latestversion; $v++) {
             $rev = $this->getRevision($v,false);
             if ($rev and $owner = $rev->get('author_id')) {
-            	return $owner;
+                return $owner;
             }
         }
         return '';
@@ -1433,20 +1433,20 @@
      * todo: unify with some unit knowledge
      */
     function setAttribute($relation, $value) {
-    	$attr = $this->get('attributes');
-    	if (empty($attr))
-    	    $attr = array($relation => $value);
-    	else
-    	    $attr[$relation] = $value;
-    	$this->set('attributes', $attr);
+        $attr = $this->get('attributes');
+        if (empty($attr))
+            $attr = array($relation => $value);
+        else
+            $attr[$relation] = $value;
+        $this->set('attributes', $attr);
     }
 
     function getAttribute($relation) {
-    	$meta = $this->get('attributes');
-    	if (empty($meta))
-    	    return '';
-    	else
-    	    return $meta[$relation];
+        $meta = $this->get('attributes');
+        if (empty($meta))
+            return '';
+        else
+            return $meta[$relation];
     }
 
 };
@@ -1462,9 +1462,9 @@
 class WikiDB_PageRevision
 {
     //var $_transformedContent = false; // set by WikiDB_Page::save()
-    
-    function WikiDB_PageRevision(&$wikidb, $pagename, $version, 
-                                 $versiondata = false) 
+
+    function WikiDB_PageRevision(&$wikidb, $pagename, $version,
+                                 $versiondata = false)
     {
         $this->_wikidb = &$wikidb;
         $this->_pagename = $pagename;
@@ -1472,7 +1472,7 @@
         $this->_data = $versiondata ? $versiondata : array();
         $this->_transformedContent = false; // set by WikiDB_Page::save()
     }
-    
+
     /**
      * Get the WikiDB_Page which this revision belongs to.
      *
@@ -1494,7 +1494,7 @@
     function getVersion() {
         return $this->_version;
     }
-    
+
     /**
      * Determine whether this revision has defaulted content.
      *
@@ -1527,7 +1527,7 @@
     function getContent() {
         return explode("\n", $this->getPackedContent());
     }
-	
+
    /**
      * Get the pagename of the revision.
      *
@@ -1567,18 +1567,18 @@
      * contents.
      */
     function getTransformedContent($pagetype_override=false) {
-	$backend = &$this->_wikidb->_backend;
-        
-	if ($pagetype_override) {
-	    // Figure out the normal page-type for this page.
+    $backend = &$this->_wikidb->_backend;
+
+    if ($pagetype_override) {
+        // Figure out the normal page-type for this page.
             $type = PageType::GetPageType($this->get('pagetype'));
-	    if ($type->getName() == $pagetype_override)
-		$pagetype_override = false; // Not really an override...
-	}
+        if ($type->getName() == $pagetype_override)
+        $pagetype_override = false; // Not really an override...
+    }
 
         if ($pagetype_override) {
             // Overriden page type, don't cache (or check cache).
-	    return new TransformedText($this->getPage(),
+        return new TransformedText($this->getPage(),
                                        $this->getPackedContent(),
                                        $this->getMetaData(),
                                        $pagetype_override);
@@ -1590,7 +1590,7 @@
             if (WIKIDB_NOCACHE_MARKUP == 'purge') {
                 // flush cache for this page.
                 $page = $this->getPage();
-                $page->set('_cached_html', ''); // ignored with !USECACHE 
+                $page->set('_cached_html', ''); // ignored with !USECACHE
             }
             $possibly_cache_results = false;
         }
@@ -1604,14 +1604,14 @@
                 $possibly_cache_results = false;
             }
             //$backend->unlock();
-	}
-        
+    }
+
         if (!$this->_transformedContent) {
             $this->_transformedContent
                 = new TransformedText($this->getPage(),
                                       $this->getPackedContent(),
                                       $this->getMetaData());
-            
+
             if ($possibly_cache_results and !WIKIDB_NOCACHE_MARKUP) {
                 // If we're still the current version, cache the transfomed page.
                 //$backend->lock();
@@ -1635,7 +1635,7 @@
      */
     function getPackedContent() {
         $data = &$this->_data;
-        
+
         if (empty($data['%content'])
             || (!$this->_wikidb->isWikiPage($this->_pagename)
                 && $this->isCurrent())) {
@@ -1643,32 +1643,32 @@
 
             // A feature similar to taglines at http://www.wlug.org.nz/
             // Lib from http://www.aasted.org/quote/
-            if (defined('FORTUNE_DIR') 
-                and is_dir(FORTUNE_DIR) 
-                and in_array($GLOBALS['request']->getArg('action'), 
+            if (defined('FORTUNE_DIR')
+                and is_dir(FORTUNE_DIR)
+                and in_array($GLOBALS['request']->getArg('action'),
                              array('create','edit')))
             {
                 include_once("lib/fortune.php");
                 $fortune = new Fortune();
-		$quote = $fortune->quoteFromDir(FORTUNE_DIR);
-		if ($quote != -1)
-		    $quote = "<verbatim>\n"
-			. str_replace("\n<br>","\n", $quote)
-			. "</verbatim>\n\n";
-		else 
-		    $quote = "";
+        $quote = $fortune->quoteFromDir(FORTUNE_DIR);
+        if ($quote != -1)
+            $quote = "<verbatim>\n"
+            . str_replace("\n<br>","\n", $quote)
+            . "</verbatim>\n\n";
+        else
+            $quote = "";
                 return $quote
-		    . sprintf(_("Describe %s here."), 
-			      "[" . WikiEscape($this->_pagename) . "]");
+            . sprintf(_("Describe %s here."),
+                  "[" . WikiEscape($this->_pagename) . "]");
             }
             // Replace empty content with default value.
-            return sprintf(_("Describe %s here."), 
+            return sprintf(_("Describe %s here."),
                            "[" . WikiEscape($this->_pagename) . "]");
         }
 
         // There is (non-default) content.
         assert($this->_version > 0);
-        
+
         if (!is_string($data['%content'])) {
             // Content was not provided to us at init time.
             // (This is allowed because for some backends, fetching
@@ -1679,7 +1679,7 @@
             $data['%content'] = $this->_get_content();
             assert(is_string($data['%content']));
         }
-        
+
         return $data['%content'];
     }
 
@@ -1689,7 +1689,7 @@
         $version = $this->_version;
 
         assert($version > 0);
-        
+
         $newdata = $cache->get_versiondata($pagename, $version, true);
         if ($newdata) {
             assert(is_string($newdata['%content']));
@@ -1764,8 +1764,8 @@
         }
         return $meta;
     }
-    
-            
+
+
     /**
      * Return a string representation of the revision.
      *
@@ -1790,7 +1790,7 @@
 /**
  * Class representing a sequence of WikiDB_Pages.
  * TODO: Enhance to php5 iterators
- * TODO: 
+ * TODO:
  *   apply filters for options like 'sortby', 'limit', 'exclude'
  *   for simple queries like titleSearch, where the backend is not ready yet.
  */
@@ -1801,7 +1801,7 @@
         $this->_wikidb = &$wikidb;
         $this->_options = $options;
      }
-    
+
     function count () {
         return $this->_iter->count();
     }
@@ -1821,25 +1821,25 @@
             return false;
 
         $pagename = &$next['pagename'];
-	if (!is_string($pagename)) { // Bug #1327912 fixed by Joachim Lous
-	    /*if (is_array($pagename) && isset($pagename['linkto'])) {
-		$pagename = $pagename['linkto'];
-	    }
+    if (!is_string($pagename)) { // Bug #1327912 fixed by Joachim Lous
+        /*if (is_array($pagename) && isset($pagename['linkto'])) {
+        $pagename = $pagename['linkto'];
+        }
             $pagename = strval($pagename);*/
             trigger_error("WikiDB_PageIterator->next pagename", E_USER_WARNING);
-	}
+    }
         if (!$pagename) {
-            if (isset($next['linkrelation']) 
-                or isset($next['pagedata']['linkrelation'])) return false;	
+            if (isset($next['linkrelation'])
+                or isset($next['pagedata']['linkrelation'])) return false;
             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);
-        // cache existing page id's since we iterate over all links in GleanDescription 
+        // cache existing page id's since we iterate over all links in GleanDescription
         // and need them later for LinkExistingWord
         } elseif ($this->_options and array_key_exists('include_empty', $this->_options)
                   and !$this->_options['include_empty'] and isset($next['id'])) {
@@ -1872,13 +1872,13 @@
         $this->_iter->reset();
     }
     function asArray() {
-    	$result = array();
-    	while ($page = $this->next())
+        $result = array();
+        while ($page = $this->next())
             $result[] = $page;
         $this->reset();
         return $result;
     }
-    
+
     /**
      * Apply filters for options like 'sortby', 'limit', 'exclude'
      * for simple queries like titleSearch, where the backend is not ready yet.
@@ -1895,12 +1895,12 @@
             $this->_doSort($array, $options['sortby']);
         }
         /* the rest is not destructive.
-         * reconstruct a new iterator 
+         * reconstruct a new iterator
          */
         $pagenames = array(); $i = 0;
         if (isset($options['limit']))
             $limit = $options['limit'];
-        else 
+        else
             $limit = 0;
         if (isset($options['exclude']))
             $exclude = $options['exclude'];
@@ -1940,7 +1940,7 @@
         $this->_wikidb = &$wikidb;
         $this->_options = $options;
     }
-    
+
     function count () {
         return $this->_revisions->count();
     }
@@ -1997,13 +1997,13 @@
      *
      * @access public
      */
-    function free() { 
+    function free() {
         $this->_revisions->free();
     }
 
     function asArray() {
-    	$result = array();
-    	while ($rev = $this->next())
+        $result = array();
+        while ($rev = $this->next())
             $result[] = $rev;
         $this->free();
         return $result;
@@ -2029,7 +2029,7 @@
         return count($this->_pages);
     }
     function reset() {
-    	reset($this->_pages);
+        reset($this->_pages);
     }
     function free() {}
     function asArray() {
@@ -2061,7 +2061,7 @@
         return count($this->_array);
     }
     function reset() {
-    	reset($this->_array);
+        reset($this->_array);
     }
     function free() {}
     function asArray() {
@@ -2078,7 +2078,7 @@
  *
  * @access private
  */
-class WikiDB_cache 
+class WikiDB_cache
 {
     // FIXME: beautify versiondata cache.  Cache only limited data?
 
@@ -2094,7 +2094,7 @@
         if (isset($GLOBALS['request']->_dbi))
             $this->readonly = $GLOBALS['request']->_dbi->readonly;
     }
-    
+
     function close() {
         $this->_pagedata_cache = array();
         $this->_versiondata_cache = array();
@@ -2116,21 +2116,21 @@
             return $this->_backend->get_pagedata($pagename);
         }
     }
-    
+
     function update_pagedata($pagename, $newdata) {
         assert(is_string($pagename) && $pagename != '');
         if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
-       
+
         $this->_backend->update_pagedata($pagename, $newdata);
 
         if (USECACHE) {
-            if (!empty($this->_pagedata_cache[$pagename]) 
-                and is_array($this->_pagedata_cache[$pagename])) 
+            if (!empty($this->_pagedata_cache[$pagename])
+                and is_array($this->_pagedata_cache[$pagename]))
             {
                 $cachedata = &$this->_pagedata_cache[$pagename];
                 foreach($newdata as $key => $val)
                     $cachedata[$key] = $val;
-            } else 
+            } else
                 $this->_pagedata_cache[$pagename] = $newdata;
         }
     }
@@ -2142,7 +2142,7 @@
         unset ($this->_id_cache[$pagename]);
         //unset ($this->_backend->_page_data);
     }
-    
+
     function delete_page($pagename) {
         if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
         $result = $this->_backend->delete_page($pagename);
@@ -2159,41 +2159,41 @@
 
     // FIXME: ugly and wrong. may overwrite full cache with partial cache
     function cache_data($data) {
-    	;
+        ;
         //if (isset($data['pagedata']))
         //    $this->_pagedata_cache[$data['pagename']] = $data['pagedata'];
     }
-    
+
     function get_versiondata($pagename, $version, $need_content = false) {
         //  FIXME: Seriously ugly hackage
         $readdata = false;
-	if (USECACHE) {   //temporary - for debugging
+    if (USECACHE) {   //temporary - for debugging
             assert(is_string($pagename) && $pagename != '');
             // There is a bug here somewhere which results in an assertion failure at line 105
             // of ArchiveCleaner.php  It goes away if we use the next line.
             //$need_content = true;
             $nc = $need_content ? '1':'0';
             $cache = &$this->_versiondata_cache;
-            if (!isset($cache[$pagename][$version][$nc]) 
-                || !(is_array ($cache[$pagename])) 
-                || !(is_array ($cache[$pagename][$version]))) 
+            if (!isset($cache[$pagename][$version][$nc])
+                || !(is_array ($cache[$pagename]))
+                || !(is_array ($cache[$pagename][$version])))
             {
-                $cache[$pagename][$version][$nc] = 
+                $cache[$pagename][$version][$nc] =
                     $this->_backend->get_versiondata($pagename, $version, $need_content);
                 $readdata = true;
-                // If we have retrieved all data, we may as well set the cache for 
+                // If we have retrieved all data, we may as well set the cache for
                 // $need_content = false
                 if ($need_content){
                     $cache[$pagename][$version]['0'] =& $cache[$pagename][$version]['1'];
                 }
             }
             $vdata = $cache[$pagename][$version][$nc];
-	} else {
+    } else {
             $vdata = $this->_backend->get_versiondata($pagename, $version, $need_content);
             $readdata = true;
-	}
+    }
         if ($readdata && is_array($vdata) && !empty($vdata['%pagedata'])) {
-            if (empty($this->_pagedata_cache)) 
+            if (empty($this->_pagedata_cache))
                 $this->_pagedata_cache = array();
             /* PHP Fatal error:  Cannot create references to/from string offsets nor overloaded objects in /var/www/html/phpwiki/lib/WikiDB.php on line 2180, referer: wiki/TitleSearch?s=and&auto_redirect=1 */
             $this->_pagedata_cache[$pagename] = $vdata['%pagedata'];
@@ -2203,7 +2203,7 @@
 
     function set_versiondata($pagename, $version, $data) {
         //unset($this->_versiondata_cache[$pagename][$version]);
-        
+
         if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
         $new = $this->_backend->set_versiondata($pagename, $version, $data);
         // Update the cache
@@ -2233,7 +2233,7 @@
         if (isset($this->_glv_cache[$pagename]) and $this->_glv_cache[$pagename] == $version)
             unset ($this->_glv_cache[$pagename]);
     }
-	
+
     function get_latest_version($pagename)  {
         if (USECACHE) {
             assert (is_string($pagename) && $pagename != '');
@@ -2245,7 +2245,7 @@
             }
             return $cache[$pagename];
         } else {
-            return $this->_backend->get_latest_version($pagename); 
+            return $this->_backend->get_latest_version($pagename);
         }
     }
 };
@@ -2275,5 +2275,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiGroup.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiGroup.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiGroup.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// $Id: WikiGroup.php 7635 2010-08-09 16:40:16Z vargenau $'
+// $Id: WikiGroup.php 8071 2011-05-18 14:56:14Z vargenau $'
 /*
  * Copyright (C) 2003, 2004 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -27,14 +27,14 @@
     trigger_error(_("No or unsupported GROUP_METHOD defined"), E_USER_WARNING);
 
 /* Special group names for ACL */
-define('GROUP_EVERY',		_("Every"));
-define('GROUP_ANONYMOUS',	_("Anonymous Users"));
-define('GROUP_BOGOUSER',	_("Bogo Users"));
-define('GROUP_SIGNED',		_("Signed Users"));
-define('GROUP_AUTHENTICATED',	_("Authenticated Users"));
-define('GROUP_ADMIN',		_("Administrators"));
-define('GROUP_OWNER',		_("Owner"));
-define('GROUP_CREATOR',	   	_("Creator"));
+define('GROUP_EVERY',        _("Every"));
+define('GROUP_ANONYMOUS',    _("Anonymous Users"));
+define('GROUP_BOGOUSER',    _("Bogo Users"));
+define('GROUP_SIGNED',        _("Signed Users"));
+define('GROUP_AUTHENTICATED',    _("Authenticated Users"));
+define('GROUP_ADMIN',        _("Administrators"));
+define('GROUP_OWNER',        _("Owner"));
+define('GROUP_CREATOR',           _("Creator"));
 
 /**
  * WikiGroup is an abstract class to provide the base functions for determining
@@ -73,7 +73,7 @@
      * @param object $request The global WikiRequest object -- ignored.
      */
     function WikiGroup($not_current = false) {
-    	$this->not_current = $not_current;
+        $this->not_current = $not_current;
         //$this->request =& $GLOBALS['request'];
     }
 
@@ -137,15 +137,15 @@
      *  translated
      */
     function specialGroup($group){
-    	return in_array($group,$this->specialGroups());
+        return in_array($group,$this->specialGroups());
     }
     /** untranslated */
     function _specialGroup($group){
-    	return in_array($group,$this->_specialGroups());
+        return in_array($group,$this->_specialGroups());
     }
     /** translated */
     function specialGroups(){
-    	return array(
+        return array(
                      GROUP_EVERY,
                      GROUP_ANONYMOUS,
                      GROUP_BOGOUSER,
@@ -157,7 +157,7 @@
     }
     /** untranslated */
     function _specialGroups(){
-    	return array(
+        return array(
                      "_EVERY",
                      "_ANONYMOUS",
                      "_BOGOUSER",
@@ -179,8 +179,8 @@
     function isMember($group){
         if (isset($this->membership[$group]))
             return $this->membership[$group];
-    	if ($this->specialGroup($group)) {
-    	    return $this->isSpecialMember($group);
+        if ($this->specialGroup($group)) {
+            return $this->isSpecialMember($group);
         } else {
             trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
                                     'isMember', GROUP_METHOD),
@@ -236,9 +236,9 @@
     }
 
     function _allUsers() {
-    	static $result = array();
-    	if (!empty($result))
-    		return $result;
+        static $result = array();
+        if (!empty($result))
+            return $result;
 
         global $request;
         /* WikiPage users: */
@@ -308,9 +308,9 @@
      * @return array Array of usernames that have joined the group (always empty).
      */
     function getMembersOf($group){
-    	if ($this->specialGroup($group)) {
-    	    return $this->getSpecialMembersOf($group);
-    	}
+        if ($this->specialGroup($group)) {
+            return $this->getSpecialMembersOf($group);
+        }
         trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
                                 'getMembersOf', GROUP_METHOD),
                       E_USER_WARNING);
@@ -421,8 +421,8 @@
      * @return boolean True if user is a member, else false (always false).
      */
     function isMember($group){
-    	if ($this->specialGroup($group)) {
-    	    return $this->isSpecialMember($group);
+        if ($this->specialGroup($group)) {
+            return $this->isSpecialMember($group);
         } else {
             return false;
         }
@@ -497,9 +497,9 @@
         }
         $this->membership[$group] = false;
         // Let grouppages override certain defaults, such as members of admin
-    	if ($this->specialGroup($group)) {
-    	    return $this->isSpecialMember($group);
-    	}
+        if ($this->specialGroup($group)) {
+            return $this->isSpecialMember($group);
+        }
         return false;
     }
 
@@ -539,7 +539,7 @@
     function getAllGroupsIn(){
         $membership = array();
 
-    	$specialgroups = $this->specialGroups();
+        $specialgroups = $this->specialGroups();
         foreach ($specialgroups as $group) {
             $this->membership[$group] = $this->isSpecialMember($group);
         }
@@ -567,7 +567,7 @@
      * @return array Array of usernames that have joined the group (always empty).
      */
     function getMembersOf($group){
-    	if ($this->specialGroup($group))
+        if ($this->specialGroup($group))
             return $this->getSpecialMembersOf($group);
 
         $group_page = $GLOBALS['request']->getPage($group);
@@ -605,7 +605,7 @@
      * @param object $request The global WikiRequest object. ignored
      */
     function GroupDb() {
-    	global $DBAuthParams, $DBParams;
+        global $DBAuthParams, $DBParams;
         //$this->request = &$GLOBALS['request'];
         $this->username = $this->_getUserName();
         $this->membership = array();
@@ -666,7 +666,7 @@
         }
         $this->membership[$group] = false;
         // Let override certain defaults, such as members of admin
-    	if ($this->specialGroup($group))
+        if ($this->specialGroup($group))
             return $this->isSpecialMember($group);
         return false;
     }
@@ -679,7 +679,7 @@
      * @return array Array of groups to which the user belongs.
      */
     function getAllGroupsIn(){
-    	$membership = array();
+        $membership = array();
 
         $dbh = & $this->dbh;
         $db_result = $dbh->query(sprintf($this->_user_groups, $dbh->quote($this->username)));
@@ -690,7 +690,7 @@
             }
         }
 
-    	$specialgroups = $this->specialGroups();
+        $specialgroups = $this->specialGroups();
         foreach ($specialgroups as $group) {
             if ($this->isMember($group)) {
                 $membership[] = $group;
@@ -718,7 +718,7 @@
             }
         }
         // add certain defaults, such as members of admin
-    	if ($this->specialGroup($group))
+        if ($this->specialGroup($group))
             $members = array_merge($members, $this->getSpecialMembersOf($group));
         return $members;
     }
@@ -754,7 +754,7 @@
             }
         }
         $this->membership[$group] = false;
-    	if ($this->specialGroup($group))
+        if ($this->specialGroup($group))
             return $this->isSpecialMember($group);
 
         return false;
@@ -768,7 +768,7 @@
      * @return array Array of groups to which the user belongs.
      */
     function getAllGroupsIn(){
-    	$membership = array();
+        $membership = array();
 
         $dbh = & $this->dbh;
         $rs = $dbh->Execute(sprintf($this->_user_groups, $dbh->qstr($this->username)));
@@ -782,7 +782,7 @@
         }
         $rs->Close();
 
-    	$specialgroups = $this->specialGroups();
+        $specialgroups = $this->specialGroups();
         foreach ($specialgroups as $group) {
             if ($this->isMember($group)) {
                 $membership[] = $group;
@@ -809,7 +809,7 @@
         }
         $rs->Close();
         // add certain defaults, such as members of admin
-    	if ($this->specialGroup($group))
+        if ($this->specialGroup($group))
             $members = array_merge($members, $this->getSpecialMembersOf($group));
         return $members;
     }
@@ -875,7 +875,7 @@
           }
         }
         $this->membership[$group] = false;
-    	if ($this->specialGroup($group))
+        if ($this->specialGroup($group))
             return $this->isSpecialMember($group);
         return false;
     }
@@ -901,7 +901,7 @@
           }
         }
 
-    	$specialgroups = $this->specialGroups();
+        $specialgroups = $this->specialGroups();
         foreach ($specialgroups as $group) {
             if ($this->isMember($group)) {
                 $this->membership[$group] = true;
@@ -923,7 +923,7 @@
         if (!empty($this->_file->users[$group])) {
             $members = explode(' ',$this->_file->users[$group]);
         }
-    	if ($this->specialGroup($group)) {
+        if ($this->specialGroup($group)) {
             $members = array_merge($members, $this->getSpecialMembersOf($group));
         }
         return $members;
@@ -994,7 +994,7 @@
         $this->membership[$group] = in_array($this->username,$this->getMembersOf($group));
         if ($this->membership[$group])
             return true;
-    	if ($this->specialGroup($group))
+        if ($this->specialGroup($group))
             return $this->isSpecialMember($group);
     }
 
@@ -1009,7 +1009,7 @@
         //$username = $this->_getUserName();
         $membership = array();
 
-    	$specialgroups = $this->specialGroups();
+        $specialgroups = $this->specialGroups();
         foreach ($specialgroups as $group) {
             if ($this->isMember($group)) {
                 $this->membership[$group] = true;
@@ -1020,21 +1020,21 @@
         // must be a valid LDAP server, and username must not contain a wildcard
         if ($ldap = $this->_user->_init()) {
             $st_search = LDAP_SEARCH_FIELD ? LDAP_SEARCH_FIELD."=".$this->username
-                			   : "uid=".$this->username;
+                               : "uid=".$this->username;
             $sr = ldap_search($ldap, (LDAP_OU_USERS ? LDAP_OU_USERS : "ou=Users")
                               .($this->base_dn ? ",".$this->base_dn : ''),
                               $st_search);
             if (!$sr) {
- 		$this->_user->_free();
+         $this->_user->_free();
                 return $this->membership;
             }
             $info = ldap_get_entries($ldap, $sr);
             if (empty($info["count"])) {
- 		$this->_user->_free();
+         $this->_user->_free();
                 return $this->membership;
             }
             for ($i = 0; $i < $info["count"]; $i++) {
-            	if ($info[$i]["gidNumber"]["count"]) {
+                if ($info[$i]["gidNumber"]["count"]) {
                     $gid = $info[$i]["gidnumber"][0];
                     $sr2 = ldap_search($ldap, (LDAP_OU_GROUP ? LDAP_OU_GROUP : "ou=Groups")
                                        .($this->base_dn ? ",".$this->base_dn : ''),
@@ -1094,7 +1094,7 @@
         $this->_user->_free();
         //ldap_close($ldap);
 
-    	if ($this->specialGroup($group)) {
+        if ($this->specialGroup($group)) {
             $members = array_merge($members, $this->getSpecialMembersOf($group));
         }
         return $members;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiPlugin.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiPlugin.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiPlugin.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: WikiPlugin.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikiPlugin.php 7964 2011-03-05 17:05:30Z vargenau $
 
 class WikiPlugin
 {
@@ -28,7 +28,7 @@
     function managesValidators() {
         return false;
     }
-  
+
     // FIXME: args?
     function run ($dbi, $argstr, &$request, $basepage) {
         trigger_error("WikiPlugin::run: pure virtual function",
@@ -59,7 +59,7 @@
     function getWikiPageLinks ($argstr, $basepage) {
         return false;
     }
-  
+
     /**
      * Get name of plugin.
      *
@@ -82,7 +82,7 @@
     function getDescription() {
         return $this->getName();
     }
-  
+
     function getArgs($argstr, $request=false, $defaults=false) {
         if ($defaults === false) {
             $defaults = $this->getDefaultArguments();
@@ -109,9 +109,9 @@
             unset($argstr_args[$arg]);
             unset($argstr_defaults[$arg]);
         }
-      
+
         foreach (array_merge($argstr_args, $argstr_defaults) as $arg => $val) {
-	    // TODO: where the heck comes this from? Put the new method over there and peace.
+        // TODO: where the heck comes this from? Put the new method over there and peace.
             /*if ($request and $request->getArg('pagename') == _("PhpWikiAdministration")
                 and $arg == 'overwrite') // silence this warning
                 ;*/
@@ -147,9 +147,9 @@
     function parseArgStr($argstr) {
         $args = array();
         $defaults = array();
-	if (empty($argstr))
+    if (empty($argstr))
             return array($args, $defaults);
-          
+
         $arg_p = '\w+';
         $op_p = '(?:\|\|)?=';
         $word_p = '\S+';
@@ -200,7 +200,7 @@
             elseif ($count >= 7)
                 $val = $word_val;
             else
-                $val = '';  
+                $val = '';
 
             if ($op == '=') {
                 $args[$arg] = $val;
@@ -229,14 +229,14 @@
         trigger_error(sprintf(_("trailing cruft in plugin args: '%s'"),
                               $argstr), E_USER_NOTICE);
     }
-  
+
     /* A plugin can override this to allow undeclared arguments.
        Or to silence the warning.
      */
     function allow_undeclared_arg($name, $value) {
         trigger_error(sprintf(_("Argument '%s' not declared by plugin."),
                               $name), E_USER_NOTICE);
-	return false;
+    return false;
     }
 
     /* handle plugin-list argument: use run(). */
@@ -248,7 +248,7 @@
             return $pagelist->pageNames();
         elseif (is_array($pagelist))
             return $pagelist;
-        else  
+        else
             return $list;
     }
 
@@ -268,18 +268,18 @@
                      'description'=> $this->getDescription(),
                      'formsize'   => 30);
     }
-  
+
     function makeForm($argstr, $request) {
         $form_defaults = $this->getDefaultFormArguments();
         $defaults = array_merge($form_defaults,
                                 array('start_debug' => $request->getArg('start_debug')),
-        			$this->getDefaultArguments());
-  
+                    $this->getDefaultArguments());
+
         $args = $this->getArgs($argstr, $request, $defaults);
         $plugin = $this->getName();
         $textinput = $args['textinput'];
         assert(!empty($textinput) && isset($args['textinput']));
-  
+
         $form = HTML::form(array('action' => WikiURL($args['targetpage']),
                                  'method' => $args['method'],
                                  'class'  => $args['class'],
@@ -297,15 +297,15 @@
         }
         $contents = HTML::div();
         $contents->setAttr('class', $args['class']);
-  
+
         foreach ($args as $arg => $val) {
             if (isset($form_defaults[$arg]))
                 continue;
             if ($arg != $textinput && $val == $defaults[$arg])
                 continue;
-  
+
             $i = HTML::input(array('name' => $arg, 'value' => $val));
-  
+
             if ($arg == $textinput) {
                 //if ($inputs[$arg] == 'file')
                 //    $attr['type'] = 'file';
@@ -319,7 +319,7 @@
                 $i->setAttr('type', 'hidden');
             }
             $contents->pushContent($i);
-  
+
             // FIXME: hackage
             if ($i->getAttr('type') == 'file') {
                 $form->setAttr('enctype', 'multipart/form-data');
@@ -329,7 +329,7 @@
                                                          'type' => 'hidden')));
             }
         }
-  
+
         if (!empty($args['buttontext']))
             $contents->pushContent(HTML::input(array('type' => 'submit',
                                                      'class' => 'button',
@@ -351,9 +351,9 @@
                          HTML::div(array('class'=>'box-title'), $title),
                          HTML::div(array('class'=>'box-data'), $body));
     }
-  
+
     function error ($message) {
-        return HTML::div(array('class' => 'errors'),
+        return HTML::span(array('class' => 'error'),
                         HTML::strong(fmt("Plugin %s failed.", $this->getName())), ' ',
                         $message);
     }
@@ -377,7 +377,7 @@
             $customPageListColumns[$column] = $obj;
         }
     }
-  
+
     // provide a sample usage text for automatic edit-toolbar insertion
     function getUsage() {
         $args = $this->getDefaultArguments();
@@ -435,15 +435,15 @@
                     // Output of plugin (potentially) depends on
                     // the state of the WikiDB (other than the current
                     // page.)
-                  
+
                     // Lacking other information, we'll assume things
                     // changed last time the wikidb was touched.
-                  
+
                     // As an additional hack, mark the ETag weak, since,
                     // for all we know, the page might depend
                     // on things other than the WikiDB (e.g. PhpWeather,
                     // Calendar...)
-                  
+
                     $timestamp = $dbi->getTimestamp();
                     $request->appendValidators(array('dbi_timestamp' => $timestamp,
                                                      '%mtime' => (int)$timestamp,
@@ -467,7 +467,7 @@
             return false;
         return $plugin->getWikiPageLinks($plugin_args, $basepage);
     }
-  
+
     function parsePI($pi) {
         if (!preg_match('/^\s*<\?(plugin(?:-form|-link|-list)?)\s+(\w+)\s*(.*?)\s*\?>\s*$/s', $pi, $m))
             return $this->_error(sprintf("Bad %s", 'PI'));
@@ -477,7 +477,7 @@
 
         return array($pi_name, $plugin, $plugin_args);
     }
-  
+
     function getPlugin($plugin_name, $pi=false) {
         global $ErrorManager;
         global $AllAllowedPlugins;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiPluginCached.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiPluginCached.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiPluginCached.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: WikiPluginCached.php 7639 2010-08-11 12:15:16Z vargenau $');
+<?php // $Id: WikiPluginCached.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2002 Johannes Große
  * Copyright (C) 2004,2007 Reini Urban
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -32,19 +32,19 @@
 // types:
 define('PLUGIN_CACHED_HTML', 0);         // cached html (extensive calculation)
 define('PLUGIN_CACHED_IMG_INLINE', 1);   // gd images
-define('PLUGIN_CACHED_MAP', 2);    	 // area maps
-define('PLUGIN_CACHED_SVG', 3);    	 // special SVG/SVGZ object
+define('PLUGIN_CACHED_MAP', 2);         // area maps
+define('PLUGIN_CACHED_SVG', 3);         // special SVG/SVGZ object
 define('PLUGIN_CACHED_SVG_PNG', 4);      // special SVG/SVGZ object with PNG fallback
-define('PLUGIN_CACHED_SWF', 5);    	 // special SWF (flash) object
-define('PLUGIN_CACHED_PDF', 6);    	 // special PDF object (inlinable?)
-define('PLUGIN_CACHED_PS', 7);    	 // special PS object (inlinable?)
+define('PLUGIN_CACHED_SWF', 5);         // special SWF (flash) object
+define('PLUGIN_CACHED_PDF', 6);         // special PDF object (inlinable?)
+define('PLUGIN_CACHED_PS', 7);         // special PS object (inlinable?)
 // boolean tests:
 define('PLUGIN_CACHED_IMG_ONDEMAND', 64);// don't cache
-define('PLUGIN_CACHED_STATIC', 128); 	 // make it available via /uploads/, not via /getimg.php?id=
+define('PLUGIN_CACHED_STATIC', 128);      // make it available via /uploads/, not via /getimg.php?id=
 
 /**
- * An extension of the WikiPlugin class to allow image output and    
- * cacheing.                                                       
+ * An extension of the WikiPlugin class to allow image output and
+ * cacheing.
  * There are several abstract functions to be overloaded.
  * Have a look at the example files
  * <ul><li>plugin/TexToPng.php</li>
@@ -55,9 +55,9 @@
  * </ul>
  *
  * @author  Johannes Große, Reini Urban
- */                                                              
+ */
 class WikiPluginCached extends WikiPlugin
-{ 
+{
     var $_static;
     /**
      * Produces URL and id number from plugin arguments which later on,
@@ -74,7 +74,7 @@
      * TODO: check if args is needed at all (on lost cache)
      */
     function genUrl($cache, $argarray) {
-    	global $request;
+        global $request;
         //$cacheparams = $GLOBALS['CacheParams'];
 
         $plugincall = serialize( array(
@@ -146,21 +146,21 @@
         $this->_static = false;
         if ($this->_type & PLUGIN_CACHED_STATIC
             or $request->getArg('action') == 'pdf') // htmldoc doesn't grok subrequests
-        {  
+        {
             $this->_type = $this->_type & ~PLUGIN_CACHED_STATIC;
             $this->_static = true;
         }
-  
+
         // ---------- embed static image, no getimg.php? url -----------------
         if (0 and $this->_static) {
             //$content = $cache->get($id, 'imagecache');
             $content = array();
             if ($this->produceImage($content, $this, $dbi, $sortedargs, $request, 'html')) {
-            	// save the image in uploads
-            	return $this->embedImg($content['url'], $dbi, $sortedargs, $request);
+                // save the image in uploads
+                return $this->embedImg($content['url'], $dbi, $sortedargs, $request);
             } else {
-            	// copy the cached image into uploads if older
-            	return HTML();
+                // copy the cached image into uploads if older
+                return HTML();
             }
         }
 
@@ -268,7 +268,7 @@
      *             <li>PLUGIN_CACHED_IMG_INLINE</li>
      *             <li>PLUGIN_CACHED_IMG_ONDEMAND</li>
      *             <li>PLUGIN_CACHED_MAP</li>
-     *             </ul>  
+     *             </ul>
      */
     function getPluginType() {
         return PLUGIN_CACHED_IMG_ONDEMAND;
@@ -327,7 +327,7 @@
      *                                WikiPlugin->getArgs anymore.
      * @param  request   Request      ???
      * @return           string       'png', 'jpeg' or 'gif'
-     */  
+     */
     function getImageType(&$dbi, $argarray, &$request) {
         if (in_array($argarray['imgtype'], preg_split('/\s*:\s*/', PLUGIN_CACHED_IMGTYPES)))
             return $argarray['imgtype'];
@@ -521,14 +521,14 @@
      */
 
     function decideImgType($wish) {
-        if ($wish=='html') return $wish;               
+        if ($wish=='html') return $wish;
         if ($wish=='jpg') { $wish = 'jpeg'; }
 
         $supportedtypes = array();
         // Todo: swf, pdf, ...
         $imagetypes = array(
             'png'   => IMG_PNG,
-            'gif'   => IMG_GIF,                           
+            'gif'   => IMG_GIF,
             'jpeg'  => IMG_JPEG,
             'wbmp'  => IMG_WBMP,
             'xpm'   => IMG_XPM,
@@ -542,7 +542,7 @@
             $presenttypes = ImageTypes();
             foreach ($imagetypes as $imgtype => $bitmask)
                 if ( $presenttypes && $bitmask )
-                    array_push($supportedtypes, $imgtype);      
+                    array_push($supportedtypes, $imgtype);
         } else {
             foreach ($imagetypes as $imgtype => $bitmask)
                 if (function_exists("Image".$imgtype))
@@ -554,7 +554,7 @@
             return reset($supportedtypes);
         else
             return 'html';
-      
+
     } // decideImgType
 
 
@@ -660,8 +660,8 @@
             } else {
                 $id = $cache->generateId( $plugincall );
             }
-        } 
-        return true;   
+        }
+        return true;
     } // checkCall1
 
 
@@ -674,7 +674,7 @@
      *                             name and parameters of the plugin call
      * @param  request    Request  ???
      * @return            boolean  false if an error occurs, true otherwise.
-     *               
+     *
      */
     function checkCall2(&$plugincall, $request) {
         // if plugincall wasn't sent by URL, it must have been
@@ -688,7 +688,7 @@
                     $id );
                 $this->printError($errorformat, $errortext);
                 return false;
-            }     
+            }
         }
         $plugincall = unserialize($plugincall);
         return true;
@@ -730,13 +730,13 @@
             return false;
         }
 
-        // image handle -> image data      
+        // image handle -> image data
         if (!empty($this->_static)) {
             $ext = "." . $content['imagetype'];
             if (is_string($imagehandle) and file_exists($imagehandle)) {
-            	if (preg_match("/.(\w+)$/",$imagehandle,$m)) {
-            	    $ext = "." . $m[1];
-            	}
+                if (preg_match("/.(\w+)$/",$imagehandle,$m)) {
+                    $ext = "." . $m[1];
+                }
             }
             $tmpfile = tempnam(getUploadFilePath(), PLUGIN_CACHED_FILENAME_PREFIX . $ext);
             if (!strstr(basename($tmpfile), $ext)) {
@@ -764,7 +764,7 @@
             $content['image'] = fread($fp, filesize($tmpfile));
             fclose($fp);
             if (!empty($this->_static)) {
-            	// on static it is in "uploads/" but in wikicached also
+                // on static it is in "uploads/" but in wikicached also
                 $content['file'] = $tmpfile;
                 $content['url'] = getUploadDataPath() . basename($tmpfile);
                 return true;
@@ -783,21 +783,21 @@
     }
 
     function tempnam($prefix = "") {
-	if (preg_match("/^(.+)\.(\w{2,4})$/", $prefix, $m)) {
-	    $prefix = $m[1];
-	    $ext = ".".$m[2];
-	} else {
-	    $ext = isWindows()? ".tmp" : "";
-	}
+    if (preg_match("/^(.+)\.(\w{2,4})$/", $prefix, $m)) {
+        $prefix = $m[1];
+        $ext = ".".$m[2];
+    } else {
+        $ext = isWindows()? ".tmp" : "";
+    }
         $temp = tempnam(isWindows() ? str_replace('/', "\\", PLUGIN_CACHED_CACHE_DIR)
                                     : PLUGIN_CACHED_CACHE_DIR,
                        $prefix ? $prefix : PLUGIN_CACHED_FILENAME_PREFIX);
         if (isWindows()) {
-	    if ($ext != ".tmp") unlink($temp);
+        if ($ext != ".tmp") unlink($temp);
             $temp = preg_replace("/\.tmp$/", $ext, $temp);
-	} else {
-	    $temp .= $ext;
-	}
+    } else {
+        $temp .= $ext;
+    }
         return $temp;
     }
 
@@ -811,7 +811,7 @@
      * @param  errorformat string        outputs errors in 'png', 'gif', 'jpeg' or 'html'
      */
     function fetchImageFromCache($dbi, $request, $errorformat='png') {
-        $cache   = $this->newCache();    
+        $cache   = $this->newCache();
         $errorformat = $this->decideImgType($errorformat);
         // get id
         if (!$this->checkCall1($id, $plugincall, $cache, $request, $errorformat)) return false;
@@ -883,7 +883,7 @@
     function resetError() {
         $this->_errortext = '';
     }
-     
+
     /**
      * Returns all accumulated error messages.
      *
@@ -977,7 +977,7 @@
         }
 
         // prepare Parameters
-      
+
         // set maximum values
         $IMAGESIZE  = array(
             'cols'   => 80,
@@ -1028,7 +1028,7 @@
         $bg  = ImageColorAllocate($im, $bgcol[0], $bgcol[1], $bgcol[2]);
 
         ImageFilledRectangle($im, 0, 0, $IMAGESIZE['width']-1, $IMAGESIZE['height']-1, $bg);
-  
+
         // write text lines
         foreach($lines as $nr => $textstr) {
             ImageString( $im, $fontnr, $marginx, $marginy+$nr*$chary,

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiTheme.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiTheme.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiTheme.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: WikiTheme.php 7685 2010-09-13 12:27:54Z vargenau $');
+<?php // $Id: WikiTheme.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam
  *
  * This file is part of PhpWiki.
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -23,8 +23,6 @@
  * and more formatting.
  */
 
-//require_once(dirname(__FILE__).'/HtmlElement.php');
-
 /**
  * Make a link to a wiki page (in this wiki).
  *
@@ -61,7 +59,7 @@
     }
 
     $version = false;
-  
+
     if (isa($page_or_rev, 'WikiDB_PageRevision')) {
         $version = $page_or_rev->getVersion();
         if ($page_or_rev->isCurrent())
@@ -88,13 +86,13 @@
         if (!$wikipage->isValid('strict'))
             return $WikiTheme->linkBadWikiWord($wikipage, $label);
     }
-  
+
     if ($type == 'auto' or $type == 'if_known') {
         if (isset($page)) {
             $exists = $page->exists();
         }
         else {
-	    $dbi =& $request->_dbi;
+        $dbi =& $request->_dbi;
             $exists = $dbi->isWikiPage($wikipage->name);
         }
     }
@@ -217,7 +215,7 @@
         }
         if ($noinit) return;
         $this->_css = array();
-      
+
         // on derived classes do not add headers twice
         if (count($this->_parents) > 1) {
             return;
@@ -262,7 +260,7 @@
 
         /* Derived classes should search all parent classes */
         foreach ($this->_parents as $parent) {
-	    $path = $parent->_findFile($file, 1);
+        $path = $parent->_findFile($file, 1);
             if ($path) {
                 return $path;
             } elseif (0 and DEBUG & (_DEBUG_VERBOSE + _DEBUG_REMOTE)) {
@@ -274,7 +272,7 @@
         }
         else if (!$missing_okay) {
             trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
-            if ((DEBUG & _DEBUG_TRACE) && function_exists('debug_backtrace')) { // >= 4.3.0
+            if (DEBUG & _DEBUG_TRACE) {
                 echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
             }
         }
@@ -282,19 +280,19 @@
     }
 
     function _findData ($file, $missing_okay = false) {
-    	if (!string_starts_with($file, "themes")) { // common case
-    	    $path = $this->_findFile($file, $missing_okay);
-    	} else {
-    	    // _findButton only
-    	    if (file_exists($file)) {
-    	        $path = $file;
-    	    } elseif (defined('DATA_PATH')
-    	              and file_exists(DATA_PATH . "/$file")) {
-    	        $path = $file;
-    	    } else { // fallback for buttons in parent themes
+        if (!string_starts_with($file, "themes")) { // common case
+            $path = $this->_findFile($file, $missing_okay);
+        } else {
+            // _findButton only
+            if (file_exists($file)) {
+                $path = $file;
+            } elseif (defined('DATA_PATH')
+                      and file_exists(DATA_PATH . "/$file")) {
+                $path = $file;
+            } else { // fallback for buttons in parent themes
                 $path = $this->_findFile($file, $missing_okay);
-    	    }
-    	}
+            }
+        }
         if (!$path)
             return false;
         if (!DEBUG) {
@@ -314,10 +312,10 @@
     ////////////////////////////////////////////////////////////////
 
     // Note:  Windows' implementation of strftime does not include certain
-	// format specifiers, such as %e (for date without leading zeros).  In
-	// general, see:
-	// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp
-	// As a result, we have to use %d, and strip out leading zeros ourselves.
+    // format specifiers, such as %e (for date without leading zeros).  In
+    // general, see:
+    // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp
+    // As a result, we have to use %d, and strip out leading zeros ourselves.
 
     var $_dateFormat = "%B %d, %Y";
     var $_timeFormat = "%I:%M %p";
@@ -419,13 +417,13 @@
      */
     function getDay ($time_t) {
         global $request;
-      
+
         if ($request->getPref('relativeDates') && ($date = $this->_relativeDay($time_t))) {
             return ucfirst($date);
         }
         return $this->formatDate($time_t);
     }
-  
+
     /**
      * Format the "last modified" message for a page revision.
      *
@@ -441,11 +439,11 @@
     function getLastModifiedMessage ($revision, $show_version = 'auto') {
         global $request;
         if (!$revision) return '';
-      
+
         // dates >= this are considered invalid.
         if (! defined('EPOCH'))
             define('EPOCH', 0); // seconds since ~ January 1 1970
-      
+
         $mtime = $revision->get('mtime');
         if ($mtime <= EPOCH)
             return fmt("Never edited");
@@ -457,9 +455,9 @@
             if ($this->_showModTime)
                 $date =  sprintf(_("%s at %s"),
                                  $date, $this->formatTime($mtime));
-          
+
             if ($show_version)
-                return fmt("Version %s, saved %s", $revision->getVersion(), $date);
+                return fmt("Version %s, saved on %s", $revision->getVersion(), $date);
             else
                 return fmt("Last edited %s", $date);
         }
@@ -468,20 +466,20 @@
             $date = $this->formatDateTime($mtime);
         else
             $date = $this->formatDate($mtime);
-      
+
         if ($show_version)
             return fmt("Version %s, saved on %s", $revision->getVersion(), $date);
         else
             return fmt("Last edited on %s", $date);
     }
-  
+
     function _relativeDay ($time_t) {
         global $request;
-      
+
         if (is_numeric($request->getPref('timeOffset')))
           $offset = 3600 * $request->getPref('timeOffset');
         else
-          $offset = 0;  
+          $offset = 0;
 
         $now = time() + $offset;
         $today = localtime($now, true);
@@ -489,7 +487,7 @@
 
         if ($time['tm_yday'] == $today['tm_yday'] && $time['tm_year'] == $today['tm_year'])
             return _("today");
-      
+
         // Note that due to daylight savings chages (and leap seconds), $now minus
         // 24 hours is not guaranteed to be yesterday.
         $yesterday = localtime($now - (12 + $today['tm_hour']) * 3600, true);
@@ -506,7 +504,7 @@
     function getOwnerMessage ($page) {
         if (!ENABLE_PAGEPERM or !class_exists("PagePermission"))
             return '';
-    	$dbi =& $GLOBALS['request']->_dbi;
+        $dbi =& $GLOBALS['request']->_dbi;
         $owner = $page->getOwner();
         if ($owner) {
             /*
@@ -596,7 +594,7 @@
              $default_text = $wikiword->shortName;
          else
              $default_text = $wikiword;
-       
+
         if (!empty($linktext)) {
             $link->pushContent($linktext);
             $link->setAttr('class', 'named-wiki');
@@ -622,7 +620,7 @@
         else {
             $default_text = $wikiword;
         }
-      
+
         if ($this->DUMP_MODE) { // HTML, PDF or XML
             $link = HTML::span( empty($linktext) ? $wikiword : $linktext);
             $link->setAttr('style', 'text-decoration: underline');
@@ -673,7 +671,7 @@
 
     function linkBadWikiWord($wikiword, $linktext = '') {
         global $ErrorManager;
-      
+
         if ($linktext) {
             $text = $linktext;
         }
@@ -689,17 +687,16 @@
         else
             $message = sprintf(_("'%s': Bad page name"), $wikiword);
         $ErrorManager->warning($message);
-      
+
         return HTML::span(array('class' => 'badwikiword'), $text);
     }
-  
+
     ////////////////////////////////////////////////////////////////
     //
     // Images and Icons
     //
     ////////////////////////////////////////////////////////////////
     var $_imageAliases = array();
-    var $_imageAlt = array();
 
     /**
      *
@@ -707,19 +704,12 @@
      */
     function addImageAlias ($alias, $image_name) {
         // fall back to the PhpWiki-supplied image if not found
-	if ((empty($this->_imageAliases[$alias])
-	       and $this->_findFile("images/$image_name", true))
-	    or $image_name === false)
+    if ((empty($this->_imageAliases[$alias])
+           and $this->_findFile("images/$image_name", true))
+        or $image_name === false)
             $this->_imageAliases[$alias] = $image_name;
     }
 
-    function addImageAlt ($alias, $alt_text) {
-        $this->_imageAlt[$alias] = $alt_text;
-    }
-    function getImageAlt ($alias) {
-        return $this->_imageAlt[$alias];
-    }
-
     function getImageURL ($image) {
         $aliases = &$this->_imageAliases;
 
@@ -834,7 +824,7 @@
         if (!file_exists($path_dir) || !is_dir($path_dir))
             return array();
         $path = array($button_dir);
-      
+
         $dir = dir($path_dir);
         while (($subdir = $dir->read()) !== false) {
             if ($subdir[0] == '.')
@@ -876,14 +866,14 @@
         if (preg_match('/^submit:(.*)$/', $url, $m))
             return $this->makeSubmitButton($text, $m[1], $class, $options);
 
-        if (is_string($text))    
+        if (is_string($text))
             $imgurl = $this->getButtonURL($text);
         else
             $imgurl = $text;
         if ($imgurl)
             return new ImageButton($text, $url,
-				   in_array($class,array("wikiaction","wikiadmin"))?"wikibutton":$class,
-				   $imgurl, $options);
+                   in_array($class,array("wikiaction","wikiadmin"))?"wikibutton":$class,
+                   $imgurl, $options);
         else
             return new Button($this->maybeSplitWikiWord($text), $url,
                               $class, $options);
@@ -948,20 +938,20 @@
 
         return $this->makeButton($label, WikiURL($pagename, $attr), $class, $options);
     }
-  
+
     function tooltipAccessKeyPrefix() {
-	static $tooltipAccessKeyPrefix = null;
-	if ($tooltipAccessKeyPrefix) return $tooltipAccessKeyPrefix;
+    static $tooltipAccessKeyPrefix = null;
+    if ($tooltipAccessKeyPrefix) return $tooltipAccessKeyPrefix;
 
         $tooltipAccessKeyPrefix = 'alt';
-	if (isBrowserOpera()) $tooltipAccessKeyPrefix = 'shift-esc';
-	elseif (isBrowserSafari() or browserDetect("Mac") or isBrowserKonqueror())
-	    $tooltipAccessKeyPrefix = 'ctrl';
-	// ff2 win and x11 only
-	elseif ((browserDetect("firefox/2") or browserDetect("minefield/3") or browserDetect("SeaMonkey/1.1"))
-		and ((browserDetect("windows") or browserDetect("x11"))))
-	    $tooltipAccessKeyPrefix = 'alt-shift';
-	return $tooltipAccessKeyPrefix;
+    if (isBrowserOpera()) $tooltipAccessKeyPrefix = 'shift-esc';
+    elseif (isBrowserSafari() or browserDetect("Mac") or isBrowserKonqueror())
+        $tooltipAccessKeyPrefix = 'ctrl';
+    // ff2 win and x11 only
+    elseif ((browserDetect("firefox/2") or browserDetect("minefield/3") or browserDetect("SeaMonkey/1.1"))
+        and ((browserDetect("windows") or browserDetect("x11"))))
+        $tooltipAccessKeyPrefix = 'alt-shift';
+    return $tooltipAccessKeyPrefix;
     }
 
     /** Define the accesskey in the title only, with ending [p] or [alt-p].
@@ -970,13 +960,13 @@
     function fixAccesskey($attrs) {
         if (!empty($attrs['title']) and preg_match("/\[(alt-)?(.)\]$/", $attrs['title'], $m))
         {
-    	    if (empty($attrs['accesskey'])) $attrs['accesskey'] = $m[2];
-    	    // firefox 'alt-shift', MSIE: 'alt', ... see wikibits.js
-    	    $attrs['title'] = preg_replace("/\[(alt-)?(.)\]$/", "[".$this->tooltipAccessKeyPrefix()."-\\2]", $attrs['title']);
+            if (empty($attrs['accesskey'])) $attrs['accesskey'] = $m[2];
+            // firefox 'alt-shift', MSIE: 'alt', ... see wikibits.js
+            $attrs['title'] = preg_replace("/\[(alt-)?(.)\]$/", "[".$this->tooltipAccessKeyPrefix()."-\\2]", $attrs['title']);
         }
         return $attrs;
     }
-  
+
     /**
      * Make a "button" which links to a wiki-page.
      *
@@ -1127,7 +1117,7 @@
             if (!in_array($css_file,$this->dumped_css)) $this->dumped_css[] = $css_file;
             $link->setAttr('href', basename($link->getAttr('href')));
         }
-      
+
         return $link;
     }
 
@@ -1179,12 +1169,12 @@
         foreach ($this->_css as $title => $css_files) {
             ksort($css_files); // move $css_files[''] to front.
             foreach ($css_files as $media => $css_file) {
-		if (!empty($this->DUMP_MODE)) {
-		    if ($media == 'print')
-			$css[] = $this->_CSSlink($title, $css_file, '', $is_alt);
-		} else {
-		    $css[] = $this->_CSSlink($title, $css_file, $media, $is_alt);
-		}
+        if (!empty($this->DUMP_MODE)) {
+            if ($media == 'print')
+            $css[] = $this->_CSSlink($title, $css_file, '', $is_alt);
+        } else {
+            $css[] = $this->_CSSlink($title, $css_file, $media, $is_alt);
+        }
                 if ($is_alt) break;
             }
             $is_alt = true;
@@ -1193,13 +1183,13 @@
     }
 
     function findTemplate ($name) {
-    	if ($tmp = $this->_findFile("templates/$name.tmpl", 1))
+        if ($tmp = $this->_findFile("templates/$name.tmpl", 1))
             return $this->_path . $tmp;
         else {
             $f1 = $this->file("templates/$name.tmpl");
             foreach ($this->_parents as $parent) {
-            	if ($tmp = $parent->_findFile("templates/$name.tmpl", 1))
-            	    return $this->_path . $tmp;
+                if ($tmp = $parent->_findFile("templates/$name.tmpl", 1))
+                    return $this->_path . $tmp;
             }
             trigger_error("$f1 not found", E_USER_ERROR);
             return false;
@@ -1215,8 +1205,8 @@
     function addMoreHeaders ($element) {
         $GLOBALS['request']->_MoreHeaders[] = $element;
         if (!empty($this->_headers_printed) and $this->_headers_printed) {
-	    trigger_error(_("Some action(page) wanted to add more headers, but they were already printed.")
-			  ."\n". $element->asXML(),
+        trigger_error(_("Some action(page) wanted to add more headers, but they were already printed.")
+              ."\n". $element->asXML(),
                            E_USER_NOTICE);
         }
     }
@@ -1225,10 +1215,10 @@
       * Singleton. Only called once, by the head template. See the warning above.
       */
     function getMoreHeaders () {
-    	global $request;
-    	// actionpages cannot add headers, because recursive template expansion
-    	// already expanded the head template before.
-    	$this->_headers_printed = 1;
+        global $request;
+        // actionpages cannot add headers, because recursive template expansion
+        // already expanded the head template before.
+        $this->_headers_printed = 1;
         if (empty($request->_MoreHeaders))
             return '';
         $out = '';
@@ -1260,7 +1250,7 @@
     //$GLOBALS['request']->_MoreAttr = array();
     // new arg: named elements to be able to remove them. such as DoubleClickEdit for htmldumps
     function addMoreAttr ($tag, $name, $element) {
-    	global $request;
+        global $request;
         // protect from duplicate attr (body jscript: themes, prefs, ...)
         static $_attr_cache = array();
         $hash = md5($tag."/".$element);
@@ -1274,7 +1264,7 @@
     }
 
     function getMoreAttr ($tag) {
-    	global $request;
+        global $request;
         if (empty($request->_MoreAttr[$tag]))
             return '';
         $out = '';
@@ -1299,119 +1289,119 @@
     function load() {
 
         $this->initGlobals();
-      
-	// 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.
 
-	// This should result in phpwiki-printer.css being used when
-	// printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
-	$this->setDefaultCSS('PhpWiki',
-			     array(''      => 'phpwiki.css',
-				   'print' => 'phpwiki-printer.css'));
+    // 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.
 
-	// This allows one to manually select "Printer" style (when browsing page)
-	// to see what the printer style looks like.
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+    // This should result in phpwiki-printer.css being used when
+    // printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
+    $this->setDefaultCSS('PhpWiki',
+                 array(''      => 'phpwiki.css',
+                   'print' => 'phpwiki-printer.css'));
 
-	if (isBrowserIE()) {
-	    $this->addMoreHeaders($this->_CSSlink(0,
-						  $this->_findFile('IEFixes.css'),'all'));
-	    $this->addMoreHeaders("\n");
-	}
+    // This allows one to manually select "Printer" style (when browsing page)
+    // to see what the printer style looks like.
+    $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+    $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
+    $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+    if (isBrowserIE()) {
+        $this->addMoreHeaders($this->_CSSlink(0,
+                          $this->_findFile('IEFixes.css'),'all'));
+        $this->addMoreHeaders("\n");
+    }
 
-	$this->addImageAlias('search', 'search.png');
+    /**
+     * The logo image appears on every page and links to the HomePage.
+     */
+    $this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is set to false then the "Thank you for editing..." screen will
-	 * be omitted.
-	 */
+    $this->addImageAlias('search', 'search.png');
 
-	$this->addImageAlias('signature', WIKI_NAME . "Signature.png");
-	// Uncomment this next line to disable the signature.
-	//$this->addImageAlias('signature', false);
+    /**
+     * The Signature image is shown after saving an edited page. If this
+     * is set to false then the "Thank you for editing..." screen will
+     * be omitted.
+     */
 
-	/*
-	 * Link icons.
-	 */
-	$this->setLinkIcon('http');
-	$this->setLinkIcon('https');
-	$this->setLinkIcon('ftp');
-	$this->setLinkIcon('mailto');
-	$this->setLinkIcon('interwiki');
-	$this->setLinkIcon('wikiuser');
-	$this->setLinkIcon('*', 'url');
+    $this->addImageAlias('signature', WIKI_NAME . "Signature.png");
+    // Uncomment this next line to disable the signature.
+    //$this->addImageAlias('signature', false);
 
-	$this->setButtonSeparator("\n | ");
+    /*
+     * Link icons.
+     */
+    $this->setLinkIcon('http');
+    $this->setLinkIcon('https');
+    $this->setLinkIcon('ftp');
+    $this->setLinkIcon('mailto');
+    $this->setLinkIcon('interwiki');
+    $this->setLinkIcon('wikiuser');
+    $this->setLinkIcon('*', 'url');
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	$this->setAutosplitWikiWords(false);
+    $this->setButtonSeparator("\n | ");
 
-	/**
-	 * Layout improvement with dangling links for mostly closed wiki's:
-	 * If false, only users with edit permissions will be presented the
-	 * special wikiunknown class with "?" and Tooltip.
-	 * If true (default), any user will see the ?, but will be presented
-	 * the PrintLoginForm on a click.
-	 */
-	//$this->setAnonEditUnknownLinks(false);
+    /**
+     * WikiWords can automatically be split by inserting spaces between
+     * the words. The default is to leave WordsSmashedTogetherLikeSo.
+     */
+    $this->setAutosplitWikiWords(false);
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 *
-	 * Suggestion for french:
-	 *   $this->setDateFormat("%A %e %B %Y");
-	 *   $this->setTimeFormat("%H:%M:%S");
-	 * Suggestion for capable php versions, using the server locale:
-	 *   $this->setDateFormat("%x");
-	 *   $this->setTimeFormat("%X");
-	 */
-	//$this->setDateFormat("%B %d, %Y");
-	//$this->setTimeFormat("%I:%M %p");
+    /**
+     * Layout improvement with dangling links for mostly closed wiki's:
+     * If false, only users with edit permissions will be presented the
+     * special wikiunknown class with "?" and Tooltip.
+     * If true (default), any user will see the ?, but will be presented
+     * the PrintLoginForm on a click.
+     */
+    //$this->setAnonEditUnknownLinks(false);
 
-	/*
-	 * To suppress times in the "Last edited on" messages, give a
-	 * give a second argument of false:
-	 */
-	//$this->setDateFormat("%B %d, %Y", false);
+    /*
+     * You may adjust the formats used for formatting dates and times
+     * below.  (These examples give the default formats.)
+     * Formats are given as format strings to PHP strftime() function See
+     * http://www.php.net/manual/en/function.strftime.php for details.
+     * Do not include the server's zone (%Z), times are converted to the
+     * user's time zone.
+     *
+     * Suggestion for french:
+     *   $this->setDateFormat("%A %e %B %Y");
+     *   $this->setTimeFormat("%H:%M:%S");
+     * Suggestion for capable php versions, using the server locale:
+     *   $this->setDateFormat("%x");
+     *   $this->setTimeFormat("%X");
+     */
+    //$this->setDateFormat("%B %d, %Y");
+    //$this->setTimeFormat("%I:%M %p");
 
+    /*
+     * To suppress times in the "Last edited on" messages, give a
+     * give a second argument of false:
+     */
+    //$this->setDateFormat("%B %d, %Y", false);
 
-	/**
-	 * Custom UserPreferences:
-	 * A list of name => _UserPreference class pairs.
-	 * Rationale: Certain themes should be able to extend the predefined list
-	 * of preferences. Display/editing is done in the theme specific userprefs.tmpl
-	 * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
-	 * See themes/wikilens/themeinfo.php
-	 */
-	//$this->customUserPreference();
 
-	/**
-	 * Register custom PageList type and define custom PageList classes.
-	 * Rationale: Certain themes should be able to extend the predefined list
-	 * of pagelist types. E.g. certain plugins, like MostPopular might use
-	 * info=pagename,hits,rating
-	 * which displays the rating column whenever the wikilens theme is active.
-	 * See themes/wikilens/themeinfo.php
-	 */
-	//$this->addPageListColumn();
+    /**
+     * Custom UserPreferences:
+     * A list of name => _UserPreference class pairs.
+     * Rationale: Certain themes should be able to extend the predefined list
+     * of preferences. Display/editing is done in the theme specific userprefs.tmpl
+     * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+     * See themes/wikilens/themeinfo.php
+     */
+    //$this->customUserPreference();
 
+    /**
+     * Register custom PageList type and define custom PageList classes.
+     * Rationale: Certain themes should be able to extend the predefined list
+     * of pagelist types. E.g. certain plugins, like MostPopular might use
+     * info=pagename,hits,rating
+     * which displays the rating column whenever the wikilens theme is active.
+     * See themes/wikilens/themeinfo.php
+     */
+    //$this->addPageListColumn();
+
     } // end of load
 
     /**
@@ -1445,7 +1435,7 @@
 
     function initGlobals() {
         global $request;
-	static $already = 0;
+    static $already = 0;
         if (!$already) {
             $script_url = deduce_script_name();
             if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
@@ -1460,7 +1450,7 @@
                 ."var folderArrowPath = '".javascript_quote_string($folderArrowPath)."';\n"
                 ."var use_path_info = " . (USE_PATH_INFO ? "true" : "false") .";\n";
             $this->addMoreHeaders(JavaScript($js));
-	    $already = 1;
+        $already = 1;
         }
     }
 
@@ -1476,8 +1466,8 @@
     // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js seperately.
     // Google's or acdropdown is better.
     function initLiveSearch() {
-	//subclasses of Sidebar will init this twice
-	static $already = 0;
+    //subclasses of Sidebar will init this twice
+    static $already = 0;
         if (!$this->HTML_DUMP_SUFFIX and !$already) {
             $this->addMoreAttr('body', 'LiveSearch',
                                HTML::Raw(" onload=\"liveSearchInit()"));
@@ -1485,15 +1475,15 @@
                                              .WikiURL(_("TitleSearch"),false,true).'";'));
             $this->addMoreHeaders(JavaScript('', array
                                              ('src' => $this->_findData('livesearch.js'))));
-	    $already = 1;
+        $already = 1;
         }
     }
 
     // Immediate title search results via XMLHttpRequest
     // using the shipped moacdropdown js-lib
     function initMoAcDropDown() {
-	//subclasses of Sidebar will init this twice
-	static $already = 0;
+    //subclasses of Sidebar will init this twice
+    static $already = 0;
         if (!$this->HTML_DUMP_SUFFIX and !$already) {
             $dir = $this->_findData('moacdropdown');
             if (!DEBUG and ($css = $this->_findFile('moacdropdown/css/dropdown-min.css'))) {
@@ -1502,27 +1492,27 @@
                 $this->addMoreHeaders(HTML::style(array('type' => 'text/css'), "  @import url( $dir/css/dropdown.css );\n"));
             }
             // if autocomplete_remote is used: (getobject2 also for calc. the showlist width)
-	    if (DEBUG) {
-		foreach (array("mobrowser.js","modomevent3.js","modomt.js",
-			       "modomext.js","getobject2.js","xmlextras.js") as $js)
-		{
-		    $this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/$js")));
-		}
-		$this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/acdropdown.js")));
-	    } else {
+        if (DEBUG) {
+        foreach (array("mobrowser.js","modomevent3.js","modomt.js",
+                   "modomext.js","getobject2.js","xmlextras.js") as $js)
+        {
+            $this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/$js")));
+        }
+        $this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/acdropdown.js")));
+        } else {
                 // already in wikicommon-min.js
-		; //$this->addMoreHeaders(JavaScript('', array('src' => DATA_PATH . "/themes/default/moacdropdown.js")));
-	    }
-	    /*
-	    // for local xmlrpc requests
-	    $xmlrpc_url = deduce_script_name();
-	    //if (1 or DATABASE_TYPE == 'dba')
-	    $xmlrpc_url = DATA_PATH . "/RPC2.php";
-	    if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
-		$xmlrpc_url .= ("?start_debug=".$_GET['start_debug']);
+        ; //$this->addMoreHeaders(JavaScript('', array('src' => DATA_PATH . "/themes/default/moacdropdown.js")));
+        }
+        /*
+        // for local xmlrpc requests
+        $xmlrpc_url = deduce_script_name();
+        //if (1 or DATABASE_TYPE == 'dba')
+        $xmlrpc_url = DATA_PATH . "/RPC2.php";
+        if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
+        $xmlrpc_url .= ("?start_debug=".$_GET['start_debug']);
             $this->addMoreHeaders(JavaScript("var xmlrpc_url = '$xmlrpc_url'"));
-	    */
-	    $already = 1;
+        */
+        $already = 1;
         }
     }
 
@@ -1619,14 +1609,14 @@
      * Callback when a user logs in
     */
     function CbUserLogin (&$request, $userid) {
-	; // do nothing
+    ; // do nothing
     }
 
     /** CbNewUserEdit (&$request, $userid)
      * Callback when a new user creates or edits a page
      */
     function CbNewUserEdit (&$request, $userid) {
-	; // i.e. create homepage with Template/UserPage
+    ; // i.e. create homepage with Template/UserPage
     }
 
     /** CbNewUserLogin (&$request, $userid)
@@ -1636,14 +1626,14 @@
      *  Let's say a new user is a user without homepage.
      */
     function CbNewUserLogin (&$request, $userid) {
-	; // do nothing
+    ; // do nothing
     }
 
     /** CbUserLogout (&$request, $userid)
      * Callback when a user logs out
      */
     function CbUserLogout (&$request, $userid) {
-	; // do nothing
+    ; // do nothing
     }
 
 };
@@ -1810,7 +1800,7 @@
     var $_plugin, $_args = false, $_basepage = false;
 
     function PluginSidebarBox($name, $args = false, $basepage = false) {
-	require_once("lib/WikiPlugin.php");
+    require_once("lib/WikiPlugin.php");
 
         $loader = new WikiPluginLoader();
         $plugin = $loader->getPlugin($name);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/AdoDb.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/AdoDb.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/AdoDb.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: AdoDb.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: AdoDb.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/BogoLogin.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/BogoLogin.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/BogoLogin.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: BogoLogin.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: BogoLogin.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Db.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Db.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Db.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: Db.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: Db.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/EMailConfirm.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/EMailConfirm.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/EMailConfirm.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: EMailConfirm.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: EMailConfirm.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2006 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Facebook.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Facebook.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Facebook.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: Facebook.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: Facebook.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2009 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * From http://developeronline.blogspot.com/2008/10/using-perl-against-facebook-part-i.html:

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/File.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/File.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/File.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: File.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: File.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Forbidden.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Forbidden.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Forbidden.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: Forbidden.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: Forbidden.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/FusionForge.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/FusionForge.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/FusionForge.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: FusionForge.php 7715 2010-10-14 15:49:22Z vargenau $');
+// $Id: FusionForge.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2006 Alain Peyrat
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -43,13 +43,13 @@
     }
 
     function userExists() {
-            global $group_id;
+        global $group_id;
 
         // Mapping (PhpWiki vs FusionForge) performed is:
         //     ANON  for non logged or non member
         //     USER  for member of the project.
         //     ADMIN for member having admin rights
-        if (session_loggedin()){
+        if (session_loggedin()) {
 
             // Get project object (if error => ANON)
             $project = group_get_object($group_id);
@@ -83,8 +83,8 @@
                 return $this;
             }
         }
-               $this->_level = WIKIAUTH_ANON;
-               return false;
+        $this->_level = WIKIAUTH_ANON;
+        return false;
     }
 
     function checkPass($submitted_password) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/HttpAuth.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/HttpAuth.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/HttpAuth.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: HttpAuth.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: HttpAuth.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/HttpAuthUpper.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/HttpAuthUpper.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: HttpAuthUpper.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: HttpAuthUpper.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004,2007 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/IMAP.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/IMAP.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/IMAP.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: IMAP.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: IMAP.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/LDAP.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/LDAP.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/LDAP.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: LDAP.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: LDAP.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/LdapUpper.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/LdapUpper.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/LdapUpper.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: LdapUpper.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: LdapUpper.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2007,2009 Reini Urban
  *
@@ -16,10 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-
 include_once("lib/WikiUser/LDAP.php");
 
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/OpenID.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/OpenID.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/OpenID.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: OpenID.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: OpenID.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2010 ReiniUrban
  * Zend_OpenId_Consumer parts from Zend licensed under
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * This is not yet finished. We do not want to use zend extensions.

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/POP3.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/POP3.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/POP3.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: POP3.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: POP3.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PdoDb.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PdoDb.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PdoDb.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: PdoDb.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: PdoDb.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004, 2005 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PearDb.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PearDb.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PearDb.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: PearDb.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: PearDb.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,10 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-
 include_once("lib/WikiUser/Db.php");
 
 class _PearDbPassUser

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PersonalPage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PersonalPage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/PersonalPage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: PersonalPage.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: PersonalPage.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Session.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Session.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser/Session.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: Session.php 7640 2010-08-11 12:33:25Z vargenau $');
+// $Id: Session.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 ReiniUrban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: WikiUser.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: WikiUser.php 7964 2011-03-05 17:05:30Z vargenau $
 
 // It is anticipated that when userid support is added to phpwiki,
 // this object will hold much more information (e-mail,
@@ -51,7 +51,7 @@
     if (isa($user,'WikiUser') and isa($olduser,'WikiUser')) {
         // populate the upgraded class with the values from the old object
         foreach (get_object_vars($olduser) as $k => $v) {
-            $user->$k = $v;	
+            $user->$k = $v;
         }
         $GLOBALS['request']->_user = $user;
         return $user;
@@ -61,7 +61,7 @@
 }
 
 /**
-* 
+*
 */
 class WikiUser {
     var $_userid = false;
@@ -71,8 +71,8 @@
 
     /**
      * Constructor.
-     * 
-     * Populates the instance variables and calls $this->_ok() 
+     *
+     * Populates the instance variables and calls $this->_ok()
      * to ensure that the parameters are valid.
      * @param mixed $userid String of username or WikiUser object.
      * @param integer $authlevel Authorization level.
@@ -103,7 +103,7 @@
 
     /**
     * Get the string indicating how the user was authenticated.
-    * 
+    *
     * Get the string indicating how the user was authenticated.
     * Does not seem to be set - jbw
     * @return string The method of authentication.
@@ -114,8 +114,8 @@
 
     /**
      * Invariant
-     * 
-     * If the WikiUser object has a valid authorization level and the 
+     *
+     * If the WikiUser object has a valid authorization level and the
      * userid is a string returns true, else false.
      * @return boolean If valid level and username string true, else false
      */
@@ -147,7 +147,7 @@
     }
 
     function getAuthenticatedId() {
-    	//assert($this->_request);
+        //assert($this->_request);
         return ( $this->isAuthenticated()
                  ? $this->_userid
                  : $this->_request->get('REMOTE_ADDR') ); // FIXME: globals
@@ -352,7 +352,7 @@
     }
 
     // No cookies anymore for all prefs, only the userid. PHP creates
-    // a session cookie in memory, which is much more efficient, 
+    // a session cookie in memory, which is much more efficient,
     // but not persistent. Get persistency with a homepage or DB Prefs
     //
     // Return the number of changed entries
@@ -389,7 +389,7 @@
                             // An "empty" page could still be
                             // intentionally locked by admin to
                             // prevent its creation.
-                            //                            
+                            //
                             // FIXME: This permission situation should
                             // probably be handled by the DB backend,
                             // once the new WikiUser code has been
@@ -431,7 +431,7 @@
             if (empty($this->_dbi)) {
                 if (DEBUG) printSimpleTrace(debug_backtrace());
             } else {
-            	$this->_homepage = $this->_dbi->getPage($this->_userid);
+                $this->_homepage = $this->_dbi->getPage($this->_userid);
             }
             return $this->_homepage;
         }
@@ -539,7 +539,7 @@
         $prefs = $this->getPreferences();
         if (ENCRYPTED_PASSWD)
             $prefs->set('passwd', crypt($newpasswd));
-        else 
+        else
             $prefs->set('passwd', $newpasswd);
         $this->setPreferences($prefs);
         return true;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUserNew.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUserNew.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WikiUserNew.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-//rcs_id('$Id: WikiUserNew.php 7702 2010-09-21 06:08:32Z rurban $');
+//$Id: WikiUserNew.php 8072 2011-05-18 15:45:03Z vargenau $
 /* Copyright (C) 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  * Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent
@@ -17,37 +17,38 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 /**
  * This is a complete OOP rewrite of the old WikiUser code with various
  * configurable external authentication methods.
  *
- * There's only one entry point, the function WikiUser which returns 
+ * There's only one entry point, the function WikiUser which returns
  * a WikiUser object, which contains the name, authlevel and user's preferences.
  * This object might get upgraded during the login step and later also.
  * There exist three preferences storage methods: cookie, homepage and db,
  * and multiple password checking methods.
- * See index.php for $USER_AUTH_ORDER[] and USER_AUTH_POLICY if 
+ * See index.php for $USER_AUTH_ORDER[] and USER_AUTH_POLICY if
  * ALLOW_USER_PASSWORDS is defined.
  *
- * Each user object must define the two preferences methods 
- *  getPreferences(), setPreferences(), 
+ * Each user object must define the two preferences methods
+ *  getPreferences(), setPreferences(),
  * and the following 1-4 auth methods
  *  checkPass()  must be defined by all classes,
- *  userExists() only if USER_AUTH_POLICY'=='strict' 
+ *  userExists() only if USER_AUTH_POLICY'=='strict'
  *  mayChangePass()  only if the password is storable.
  *  storePass()  only if the password is storable.
  *
  * WikiUser() given no name, returns an _AnonUser (anonymous user)
- * object, who may or may not have a cookie. 
- * However, if the there's a cookie with the userid or a session, 
+ * object, who may or may not have a cookie.
+ * However, if the there's a cookie with the userid or a session,
  * the user is upgraded to the matching user object.
- * Given a user name, returns a _BogoUser object, who may or may not 
- * have a cookie and/or PersonalPage, one of the various _PassUser objects 
+ * Given a user name, returns a _BogoUser object, who may or may not
+ * have a cookie and/or PersonalPage, one of the various _PassUser objects
  * or an _AdminUser object.
- * BTW: A BogoUser is a userid (loginname) as valid WikiWord, who might 
+ * BTW: A BogoUser is a userid (loginname) as valid WikiWord, who might
  * have stored a password or not. If so, his account is secure, if not
  * anybody can use it, because the username is visible e.g. in RecentChanges.
  *
@@ -55,46 +56,46 @@
  * user's page and any cookies. lib/main.php will query the user object to
  * verify the password as appropriate.
  *
- * @author: Reini Urban (the tricky parts), 
+ * @author: Reini Urban (the tricky parts),
  *          Carsten Klapp (started rolling the ball)
  *
  * Random architectural notes, sorted by date:
  * 2004-01-25 rurban
  * Test it by defining ENABLE_USER_NEW in config/config.ini
  * 1) Now a ForbiddenUser is returned instead of false.
- * 2) Previously ALLOW_ANON_USER = false meant that anon users cannot edit, 
- *    but may browse. Now with ALLOW_ANON_USER = false he may not browse, 
+ * 2) Previously ALLOW_ANON_USER = false meant that anon users cannot edit,
+ *    but may browse. Now with ALLOW_ANON_USER = false he may not browse,
  *    which is needed to disable browse PagePermissions.
- *    I added now ALLOW_ANON_EDIT = true to makes things clear. 
+ *    I added now ALLOW_ANON_EDIT = true to makes things clear.
  *    (which replaces REQUIRE_SIGNIN_BEFORE_EDIT)
  * 2004-02-27 rurban:
- * 3) Removed pear prepare. Performance hog, and using integers as 
+ * 3) Removed pear prepare. Performance hog, and using integers as
  *    handler doesn't help. Do simple sprintf as with adodb. And a prepare
- *    in the object init is no advantage, because in the init loop a lot of 
+ *    in the object init is no advantage, because in the init loop a lot of
  *    objects are tried, but not used.
- * 4) Already gotten prefs are passed to the next object to avoid 
+ * 4) Already gotten prefs are passed to the next object to avoid
  *    duplicate getPreferences() calls.
  * 2004-03-18 rurban
  * 5) Major php-5 problem: $this re-assignment is disallowed by the parser
- *    So we cannot just discrimate with 
+ *    So we cannot just discrimate with
  *      if (!check_php_version(5))
  *          $this = $user;
- *    A /php5-patch.php is provided, which patches the src automatically 
+ *    A /php5-patch.php is provided, which patches the src automatically
  *    for php4 and php5. Default is php4.
  *    Update: not needed anymore. we use eval to fool the load-time syntax checker.
  * 2004-03-24 rurban
  * 6) enforced new cookie policy: prefs don't get stored in cookies
- *    anymore, only in homepage and/or database, but always in the 
+ *    anymore, only in homepage and/or database, but always in the
  *    current session. old pref cookies will get deleted.
  * 2004-04-04 rurban
- * 7) Certain themes should be able to extend the predefined list 
+ * 7) Certain themes should be able to extend the predefined list
  *    of preferences. Display/editing is done in the theme specific userprefs.tmpl,
  *    but storage must be extended to the Get/SetPreferences methods.
  *    <theme>/themeinfo.php must provide CustomUserPreferences:
  *      A list of name => _UserPreference class pairs.
  * 2010-06-07 rurban
- *    Fixed a nasty recursion bug (i.e. php crash), when user = new class 
- *    which returned false, did not return false on php-4.4.7. Check for 
+ *    Fixed a nasty recursion bug (i.e. php crash), when user = new class
+ *    which returned false, did not return false on php-4.4.7. Check for
  *    a object member now.
  */
 
@@ -127,7 +128,7 @@
 $EMailHosts = array('avl.com' => 'mail.avl.com');
 
 /**
- * There are be the following constants in config/config.ini to 
+ * There are be the following constants in config/config.ini to
  * establish login parameters:
  *
  * ALLOW_ANON_USER         default true
@@ -150,7 +151,7 @@
  * any page.
  *
  * There are other possible combinations, but the typical wiki (such
- * as http://PhpWiki.sf.net/phpwiki) would usually just leave all four 
+ * as http://PhpWiki.sf.net/phpwiki) would usually just leave all four
  * enabled.
  *
  */
@@ -208,26 +209,26 @@
             return $_BogoUser;
     }
     if (_isUserPasswordsAllowed()) {
-    	// PassUsers override BogoUsers if a password is stored
-        if (isset($_BogoUser) and isset($_BogoUser->_prefs) 
+        // PassUsers override BogoUsers if a password is stored
+        if (isset($_BogoUser) and isset($_BogoUser->_prefs)
             and $_BogoUser->_prefs->get('passwd'))
             return new _PassUser($UserName, $_BogoUser->_prefs);
-        else { 
+        else {
             $_PassUser = new _PassUser($UserName,
                                        isset($_BogoUser) ? $_BogoUser->_prefs : false);
             if ($_PassUser->userExists() or $GLOBALS['request']->getArg('auth')) {
-            	if (isset($GLOBALS['request']->_user_class))
-	    	    $class = $GLOBALS['request']->_user_class;
-            	elseif (strtolower(get_class($_PassUser)) == "_passuser")
-	    	    $class = $_PassUser->nextClass();
-	    	else
-		    $class = get_class($_PassUser);
-    		if ($user = new $class($UserName, $_PassUser->_prefs)
-    		    and $user->_userid) {
-	            return $user;
-            	} else {
-            	    return $_PassUser;
-            	}
+                if (isset($GLOBALS['request']->_user_class))
+                $class = $GLOBALS['request']->_user_class;
+                elseif (strtolower(get_class($_PassUser)) == "_passuser")
+                $class = $_PassUser->nextClass();
+            else
+            $class = get_class($_PassUser);
+            if ($user = new $class($UserName, $_PassUser->_prefs)
+                and $user->_userid) {
+                return $user;
+                } else {
+                    return $_PassUser;
+                }
             }
         }
     }
@@ -239,7 +240,7 @@
 
 /**
  * Primary WikiUser function, called by lib/main.php.
- * 
+ *
  * This determines the user's type and returns an appropriate user
  * object. lib/main.php then querys the resultant object for password
  * validity as necessary.
@@ -247,9 +248,9 @@
  * If an _AnonUser object is returned, the user may only browse pages
  * (and save prefs in a cookie).
  *
- * To disable access but provide prefs the global $ForbiddenUser class 
+ * To disable access but provide prefs the global $ForbiddenUser class
  * is returned. (was previously false)
- * 
+ *
  */
 function WikiUser ($UserName = '') {
     global $ForbiddenUser, $HTTP_SESSION_VARS;
@@ -308,7 +309,7 @@
     if (isa($user,'_WikiUser') and isa($newuser,'_WikiUser')) {
         // populate the upgraded class $newuser with the values from the current user object
         //only _auth_level, _current_method, _current_index,
-        if (!empty($user->_level) and 
+        if (!empty($user->_level) and
             $user->_level > $newuser->_level)
             $newuser->_level = $user->_level;
         if (!empty($user->_current_index) and
@@ -318,10 +319,10 @@
         }
         if (!empty($user->_authmethod))
             $newuser->_authmethod = $user->_authmethod;
-	$GLOBALS['request']->_user_class = get_class($newuser);
+    $GLOBALS['request']->_user_class = get_class($newuser);
         /*
         foreach (get_object_vars($user) as $k => $v) {
-            if (!empty($v)) $olduser->$k = $v;	
+            if (!empty($v)) $olduser->$k = $v;
         }
         */
         $newuser->hasHomePage(); // revive db handle, because these don't survive sessions
@@ -340,7 +341,7 @@
     global $request;
     if (!($user = $request->getUser()))
         $user = WikiUser($UserName);
-    if (!$user) 
+    if (!$user)
         return false;
     if ($user->userExists($UserName)) {
         $request->_user = $user;
@@ -394,7 +395,7 @@
     }
 
     function setPreferences($prefs, $id_only) {
-        trigger_error("DEBUG: Note: undefined _WikiUser class trying to save prefs." 
+        trigger_error("DEBUG: Note: undefined _WikiUser class trying to save prefs."
                       . " "
                       . "New subclasses of _WikiUser must override this function.");
         return false;
@@ -406,7 +407,7 @@
 
     function checkPass($submitted_password) {
         // By definition, an undefined user class cannot sign in.
-        trigger_error("DEBUG: Warning: undefined _WikiUser class trying to sign in." 
+        trigger_error("DEBUG: Warning: undefined _WikiUser class trying to sign in."
                       . " "
                       . "New subclasses of _WikiUser must override this function.");
         return false;
@@ -451,15 +452,15 @@
     }
 
     function nextAuthMethodIndex() {
-        if (empty($this->_auth_methods)) 
+        if (empty($this->_auth_methods))
             $this->_auth_methods = $GLOBALS['USER_AUTH_ORDER'];
         if (empty($this->_current_index)) {
             if (strtolower(get_class($this)) != '_passuser') {
-            	$this->_current_method = substr(get_class($this),1,-8);
+                $this->_current_method = substr(get_class($this),1,-8);
                 $this->_current_index = $this->array_position($this->_current_method,
                                                               $this->_auth_methods);
             } else {
-            	$this->_current_index = -1;
+                $this->_current_index = -1;
             }
         }
         $this->_current_index++;
@@ -470,8 +471,8 @@
     }
 
     function AuthMethod($index = false) {
-        return $this->_auth_methods[ $index === false 
-                                     ? count($this->_auth_methods)-1 
+        return $this->_auth_methods[ $index === false
+                                     ? count($this->_auth_methods)-1
                                      : $index];
     }
 
@@ -527,7 +528,7 @@
     }
 
     function isAdmin () {
-        static $group; 
+        static $group;
         if ($this->_level == WIKIAUTH_ADMIN) return true;
         if (!$this->isSignedIn()) return false;
         if (!$this->isAuthenticated()) return false;
@@ -556,7 +557,7 @@
         return $this->_level >= $require_level;
     }
 
-    /* This is quite restrictive and not according the login description online. 
+    /* This is quite restrictive and not according the login description online.
        Any word char (A-Za-z0-9_), " ", ".", "@" and "-"
        The backends may loosen or tighten this.
     */
@@ -583,33 +584,33 @@
         $require_level = max(0, min(WIKIAUTH_ADMIN, (int)$require_level));
 
         if ($logout) { // Log out
-	    if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
-		global $request;
-		$zone_offset = Request_AccessLogEntry::_zone_offset();
-		$ncsa_time = date("d/M/Y:H:i:s", time());
-		$entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
-				 (string) $request->get('REMOTE_HOST'),
-				 (string) $request->_user->_userid,
-				 $ncsa_time, $zone_offset, 
-				 "logout ".get_class($request->_user),
-				 "401",
-				 (string) $request->get('HTTP_REFERER'),
-				 (string) $request->get('HTTP_USER_AGENT')
-				 );
-		if (($fp = fopen(LOGIN_LOG, "a"))) {
-		    flock($fp, LOCK_EX);
-		    fputs($fp, "$entry\n");
-		    fclose($fp);
-		}
-		//error_log("$entry\n", 3, LOGIN_LOG);
-	    }
+        if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
+        global $request;
+        $zone_offset = Request_AccessLogEntry::_zone_offset();
+        $ncsa_time = date("d/M/Y:H:i:s", time());
+        $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
+                 (string) $request->get('REMOTE_HOST'),
+                 (string) $request->_user->_userid,
+                 $ncsa_time, $zone_offset,
+                 "logout ".get_class($request->_user),
+                 "401",
+                 (string) $request->get('HTTP_REFERER'),
+                 (string) $request->get('HTTP_USER_AGENT')
+                 );
+        if (($fp = fopen(LOGIN_LOG, "a"))) {
+            flock($fp, LOCK_EX);
+            fputs($fp, "$entry\n");
+            fclose($fp);
+        }
+        //error_log("$entry\n", 3, LOGIN_LOG);
+        }
             if (method_exists($GLOBALS['request']->_user, "logout")) { //_HttpAuthPassUser
-          	$GLOBALS['request']->_user->logout();
+              $GLOBALS['request']->_user->logout();
             }
             $user = new _AnonUser();
             $user->_userid = '';
             $user->_level = WIKIAUTH_ANON;
-            return $user; 
+            return $user;
         } elseif ($cancel)
             return false;        // User hit cancel button.
         elseif (!$login && !$userid)
@@ -620,47 +621,47 @@
 
         $authlevel = $this->checkPass($passwd === false ? '' : $passwd);
 
-	if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
-	    global $request;
-	    $zone_offset = Request_AccessLogEntry::_zone_offset();
-	    $ncsa_time = date("d/M/Y:H:i:s", time());
-	    $manglepasswd = $passwd;
-	    for ($i=0; $i<strlen($manglepasswd); $i++) {
-		$c = substr($manglepasswd,$i,1);
-		if (ord($c) < 32) $manglepasswd[$i] = "<";
-		elseif ($c == '*') $manglepasswd[$i] = "*";
-		elseif ($c == '?') $manglepasswd[$i] = "?";
-		elseif ($c == '(') $manglepasswd[$i] = "(";
-		elseif ($c == ')') $manglepasswd[$i] = ")";
-		elseif ($c == "\\") $manglepasswd[$i] = "\\";
-		elseif (ord($c) < 127) $manglepasswd[$i] = "x";
-		elseif (ord($c) >= 127) $manglepasswd[$i] = ">";
-	    }
+    if (LOGIN_LOG and is_writeable(LOGIN_LOG)) {
+        global $request;
+        $zone_offset = Request_AccessLogEntry::_zone_offset();
+        $ncsa_time = date("d/M/Y:H:i:s", time());
+        $manglepasswd = $passwd;
+        for ($i=0; $i<strlen($manglepasswd); $i++) {
+        $c = substr($manglepasswd,$i,1);
+        if (ord($c) < 32) $manglepasswd[$i] = "<";
+        elseif ($c == '*') $manglepasswd[$i] = "*";
+        elseif ($c == '?') $manglepasswd[$i] = "?";
+        elseif ($c == '(') $manglepasswd[$i] = "(";
+        elseif ($c == ')') $manglepasswd[$i] = ")";
+        elseif ($c == "\\") $manglepasswd[$i] = "\\";
+        elseif (ord($c) < 127) $manglepasswd[$i] = "x";
+        elseif (ord($c) >= 127) $manglepasswd[$i] = ">";
+        }
             if ((DEBUG & _DEBUG_LOGIN) and $authlevel <= 0) $manglepasswd = $passwd;
-	    $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
-			     $request->get('REMOTE_HOST'),
-			     (string) $request->_user->_userid,
-			     $ncsa_time, $zone_offset, 
-			     "login $userid/$manglepasswd => $authlevel ".get_class($request->_user),
-			     $authlevel > 0 ? "200" : "403",
-			     (string) $request->get('HTTP_REFERER'),
-			     (string) $request->get('HTTP_USER_AGENT')
-			     );
-	    if (($fp = fopen(LOGIN_LOG, "a"))) {
-		flock($fp, LOCK_EX);
-		fputs($fp, "$entry\n");
-		fclose($fp);
-	    }
-	    //error_log("$entry\n", 3, LOGIN_LOG);
-	}
+        $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"',
+                 $request->get('REMOTE_HOST'),
+                 (string) $request->_user->_userid,
+                 $ncsa_time, $zone_offset,
+                 "login $userid/$manglepasswd => $authlevel ".get_class($request->_user),
+                 $authlevel > 0 ? "200" : "403",
+                 (string) $request->get('HTTP_REFERER'),
+                 (string) $request->get('HTTP_USER_AGENT')
+                 );
+        if (($fp = fopen(LOGIN_LOG, "a"))) {
+        flock($fp, LOCK_EX);
+        fputs($fp, "$entry\n");
+        fclose($fp);
+        }
+        //error_log("$entry\n", 3, LOGIN_LOG);
+    }
 
         if ($authlevel <= 0) { // anon or forbidden
             if ($passwd)
                 return _("Invalid password.");
             else
                 return _("Invalid password or userid.");
-        } elseif ($authlevel < $require_level) { // auth ok, but not enough 
-            if (!empty($this->_current_method) and strtolower(get_class($this)) == '_passuser') 
+        } elseif ($authlevel < $require_level) { // auth ok, but not enough
+            if (!empty($this->_current_method) and strtolower(get_class($this)) == '_passuser')
             {
                 // upgrade class
                 $class = "_" . $this->_current_method . "PassUser";
@@ -679,8 +680,8 @@
 
         // Successful login.
         //$user = $GLOBALS['request']->_user;
-        if (!empty($this->_current_method) and 
-            strtolower(get_class($this)) == '_passuser') 
+        if (!empty($this->_current_method) and
+            strtolower(get_class($this)) == '_passuser')
         {
             // upgrade class
             $class = "_" . $this->_current_method . "PassUser";
@@ -706,7 +707,7 @@
 class _AnonUser
 extends _WikiUser
 {
-    var $_level = WIKIAUTH_ANON; 	// var in php-5.0.0RC1 deprecated
+    var $_level = WIKIAUTH_ANON;     // var in php-5.0.0RC1 deprecated
 
     /** Anon only gets to load and save prefs in a cookie, that's it.
      */
@@ -720,7 +721,7 @@
         // Try to read deprecated 1.3.x style cookies
         if ($cookie = $request->cookies->get_old(WIKI_NAME)) {
             if (! $unboxedcookie = $this->_prefs->retrieve($cookie)) {
-                trigger_error(_("Empty Preferences or format of UserPreferences cookie not recognised.") 
+                trigger_error(_("Empty Preferences or format of UserPreferences cookie not recognised.")
                               . "\n"
                               . sprintf("%s='%s'", WIKI_NAME, $cookie)
                               . "\n"
@@ -739,8 +740,8 @@
                 $UserName = @$unboxedcookie['userid'];
                 if (is_string($UserName) and (substr($UserName,0,2) != 's:'))
                     $this->_userid = $UserName;
-                else 
-                    $UserName = false;    
+                else
+                    $UserName = false;
             }
             // v1.3.8 policy: don't set PhpWiki cookies, only plaintext WIKI_ID cookies
             if (!headers_sent())
@@ -755,8 +756,8 @@
                     $UserName = $unboxedcookie['userid'];
                     if (is_string($UserName) and (substr($UserName,0,2) != 's:'))
                         $this->_userid = $UserName;
-                    else 
-                        $UserName = false;    
+                    else
+                        $UserName = false;
                 }
                 if (!headers_sent())
                     $request->deleteCookieVar("WIKI_PREF2");
@@ -813,7 +814,7 @@
         if ($updated) {
             if ($id_only and !headers_sent()) {
                 global $request;
-                // new 1.3.8 policy: no array cookies, only plain userid string as in 
+                // 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(getCookieName(), $this->_userid,
@@ -827,8 +828,8 @@
             $unpacked = $prefs->unpack($packed);
             if (count($unpacked)) {
                 foreach (array('_method','_select','_update','_insert') as $param) {
-            	    if (!empty($this->_prefs->{$param}))
-            	        $prefs->{$param} = $this->_prefs->{$param};
+                    if (!empty($this->_prefs->{$param}))
+                        $prefs->{$param} = $this->_prefs->{$param};
                 }
                 $this->_prefs = $prefs;
             }
@@ -855,7 +856,7 @@
 }
 
 /**
- * Helper class to finish the PassUser auth loop. 
+ * Helper class to finish the PassUser auth loop.
  * This is added automatically to USER_AUTH_ORDER.
  */
 class _ForbiddenUser
@@ -877,7 +878,7 @@
  * Do NOT extend _BogoUser to other classes, for checkPass()
  * security. (In case of defects in code logic of the new class!)
  * The intermediate step between anon and passuser.
- * We also have the _BogoLoginPassUser class with stricter 
+ * We also have the _BogoLoginPassUser class with stricter
  * password checking, which fits into the auth loop.
  * Note: This class is not called anymore by WikiUser()
  */
@@ -906,14 +907,14 @@
 /**
  * Called if ALLOW_USER_PASSWORDS and Anon and Bogo failed.
  *
- * The classes for all subsequent auth methods extend from this class. 
- * This handles the auth method type dispatcher according $USER_AUTH_ORDER, 
+ * The classes for all subsequent auth methods extend from this class.
+ * This handles the auth method type dispatcher according $USER_AUTH_ORDER,
  * the three auth method policies first-only, strict and stacked
- * and the two methods for prefs: homepage or database, 
+ * and the two methods for prefs: homepage or database,
  * if $DBAuthParams['pref_select'] is defined.
  *
  * Default is PersonalPage auth and prefs.
- * 
+ *
  * @author: Reini Urban
  * @tables: pref
  */
@@ -937,40 +938,40 @@
         // Check the configured Prefs methods
         $dbi = $this->getAuthDbh();
         $dbh = $GLOBALS['request']->getDbh();
-        if ( $dbi 
-             and !$dbh->readonly 
-             and !isset($this->_prefs->_select) 
-             and $dbh->getAuthParam('pref_select')) 
+        if ( $dbi
+             and !$dbh->readonly
+             and !isset($this->_prefs->_select)
+             and $dbh->getAuthParam('pref_select'))
         {
             if (!$this->_prefs) {
-            	$this->_prefs = new UserPreferences();
-            	$need_pref = true;
+                $this->_prefs = new UserPreferences();
+                $need_pref = true;
             }
             $this->_prefs->_method = $dbh->getParam('dbtype');
             $this->_prefs->_select = $this->prepare($dbh->getAuthParam('pref_select'), "userid");
             // read-only prefs?
             if ( !isset($this->_prefs->_update) and $dbh->getAuthParam('pref_update')) {
-                $this->_prefs->_update = $this->prepare($dbh->getAuthParam('pref_update'), 
+                $this->_prefs->_update = $this->prepare($dbh->getAuthParam('pref_update'),
                                                         array("userid", "pref_blob"));
             }
         } else {
             if (!$this->_prefs) {
-            	$this->_prefs = new UserPreferences();
-            	$need_pref = true;
+                $this->_prefs = new UserPreferences();
+                $need_pref = true;
             }
             $this->_prefs->_method = 'HomePage';
         }
-        
+
         if (! $this->_prefs or isset($need_pref) ) {
             if ($prefs) $this->_prefs = $prefs;
             else $this->getPreferences();
         }
-        
+
         // Upgrade to the next parent _PassUser class. Avoid recursion.
         if ( strtolower(get_class($this)) === '_passuser' ) {
             //auth policy: Check the order of the configured auth methods
             // 1. first-only: Upgrade the class here in the constructor
-            // 2. old:       ignore USER_AUTH_ORDER and try to use all available methods as 
+            // 2. old:       ignore USER_AUTH_ORDER and try to use all available methods as
             ///              in the previous PhpWiki releases (slow)
             // 3. strict:    upgrade the class after checking the user existance in userExists()
             // 4. stacked:   upgrade the class after the password verification in checkPass()
@@ -1009,7 +1010,7 @@
                             return $user;
                         }
                     } elseif (in_array('LDAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and
-                              defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') and 
+                              defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') and
                               function_exists('ldap_connect')) {
                         include_once("lib/WikiUser/LDAP.php");
                         if (check_php_version(5))
@@ -1054,7 +1055,7 @@
                         }
                     }
                 }
-                else 
+                else
                     // else use the page methods defined in _PassUser.
                     return $this;
             }
@@ -1065,7 +1066,7 @@
         global $request; //, $DBParams, $DBAuthParams;
 
         $dbh = $request->getDbh();
-        // session restauration doesn't re-connect to the database automatically, 
+        // session restauration doesn't re-connect to the database automatically,
         // so dirty it here, to force a reconnect.
         if (isset($this->_auth_dbi)) {
             if (($dbh->getParam('dbtype') == 'SQL') and empty($this->_auth_dbi->connection))
@@ -1074,22 +1075,22 @@
                 unset($this->_auth_dbi);
         }
         if (empty($this->_auth_dbi)) {
-            if ($dbh->getParam('dbtype') != 'SQL' 
+            if ($dbh->getParam('dbtype') != 'SQL'
                 and $dbh->getParam('dbtype') != 'ADODB'
                 and $dbh->getParam('dbtype') != 'PDO')
                 return false;
             if (empty($GLOBALS['DBAuthParams']))
                 return false;
             if (!$dbh->getAuthParam('auth_dsn')) {
-                $dbh = $request->getDbh(); // use phpwiki database 
+                $dbh = $request->getDbh(); // use phpwiki database
             } elseif ($dbh->getAuthParam('auth_dsn') == $dbh->getParam('dsn')) {
-                $dbh = $request->getDbh(); // same phpwiki database 
+                $dbh = $request->getDbh(); // same phpwiki database
             } else { // use another external database handle. needs PHP >= 4.1
                 $local_params = array_merge($GLOBALS['DBParams'],$GLOBALS['DBAuthParams']);
                 $local_params['dsn'] = $local_params['auth_dsn'];
                 $dbh = WikiDB::open($local_params);
-            }       
-            $this->_auth_dbi =& $dbh->_backend->_dbh;    
+            }
+            $this->_auth_dbi =& $dbh->_backend->_dbh;
         }
         return $this->_auth_dbi;
     }
@@ -1108,7 +1109,7 @@
 
     // TODO: use it again for the auth and member tables
     // sprintfstyle vs prepare style: %s or ?
-    //   multiple vars should be executed via prepare(?,?)+execute, 
+    //   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) {
@@ -1121,7 +1122,7 @@
         $new = array();
         if (is_array($variables)) {
             //$sprintfstyle = false;
-            for ($i=0; $i < count($variables); $i++) { 
+            for ($i=0; $i < count($variables); $i++) {
                 $var = $this->_normalize_stmt_var($variables[$i], $oldstyle);
                 if (!$var)
                     trigger_error(sprintf("DbAuthParams: Undefined or empty statement variable %s in %s",
@@ -1129,7 +1130,7 @@
                 $variables[$i] = $var;
                 if (!$var) $new[] = '';
                 else {
-                    $s = "%" . ($i+1) . "s";	
+                    $s = "%" . ($i+1) . "s";
                     $new[] = $sprintfstyle ? $s : "?";
                 }
             }
@@ -1139,16 +1140,16 @@
                 trigger_error(sprintf("DbAuthParams: Undefined or empty statement variable %s in %s",
                                       $variables, $stmt), E_USER_WARNING);
             $variables = $var;
-            if (!$var) $new = ''; 
-            else $new = $sprintfstyle ? '%s' : "?"; 
+            if (!$var) $new = '';
+            else $new = $sprintfstyle ? '%s' : "?";
         }
         $prefix = $dbi->getParam('prefix');
         // probably prefix table names if in same database
-        if ($prefix and isset($this->_auth_dbi) and isset($dbi->_backend->_dbh) and 
+        if ($prefix and isset($this->_auth_dbi) and isset($dbi->_backend->_dbh) and
             ($dbi->getAuthParam('auth_dsn') and $dbi->getParam('dsn') == $dbi->getAuthParam('auth_dsn')))
         {
             if (!stristr($stmt, $prefix)) {
-            	$oldstmt = $stmt;
+                $oldstmt = $stmt;
                 $stmt = str_replace(array(" user "," pref "," member "),
                                     array(" ".$prefix."user ",
                                           " ".$prefix."pref ",
@@ -1230,14 +1231,14 @@
         }
         if ($updated = _AnonUser::setPreferences($prefs, $id_only)) {
             // Encode only the _prefs array of the UserPreference object
-	    // If no DB method exists to store the prefs we must store it in the page, not in the cookies.
+        // If no DB method exists to store the prefs we must store it in the page, not in the cookies.
             if (empty($this->_HomePagehandle)) {
                 $this->_HomePagehandle = $GLOBALS['request']->getPage($this->_userid);
-	    }
+        }
             if (! $this->_HomePagehandle->exists() ) {
                 $this->createHomePage();
             }
-	    if (!empty($this->_HomePagehandle) and !$id_only) {
+        if (!empty($this->_HomePagehandle) and !$id_only) {
                 $this->_HomePagehandle->set('pref', $this->_prefs->store());
             }
         }
@@ -1248,7 +1249,7 @@
         return true;
     }
 
-    //The default method is getting the password from prefs. 
+    //The default method is getting the password from prefs.
     // child methods obtain $stored_password from external auth.
     function userExists() {
         //if ($this->_HomePagehandle) return true;
@@ -1276,7 +1277,7 @@
         return false;
     }
 
-    //The default method is getting the password from prefs. 
+    //The default method is getting the password from prefs.
     // child methods obtain $stored_password from external auth.
     function checkPass($submitted_password) {
         $stored_password = $this->_prefs->get('passwd');
@@ -1309,11 +1310,11 @@
      * @see UserPreferences::set
      *
      * DBPassUser password's have their own crypt definition.
-     * That's why DBPassUser::checkPass() doesn't call this method, if 
-     * the db password method is 'plain', which means that the DB SQL 
-     * statement just returns 1 or 0. To use CRYPT() or PASSWORD() and 
+     * That's why DBPassUser::checkPass() doesn't call this method, if
+     * the db password method is 'plain', which means that the DB SQL
+     * statement just returns 1 or 0. To use CRYPT() or PASSWORD() and
      * don't store plain passwords in the DB.
-     * 
+     *
      * TODO: remove crypt() function check from config.php:396 ??
      */
     function _checkPass($submitted_password, $stored_password) {
@@ -1361,8 +1362,8 @@
         return false;
     }
 
-    /** The default method is storing the password in prefs. 
-     *  Child methods (DB, File) may store in external auth also, but this 
+    /** The default method is storing the password in prefs.
+     *  Child methods (DB, File) may store in external auth also, but this
      *  must be explicitly enabled.
      *  This may be called by plugin/UserPreferences or by ->SetPreferences()
      */
@@ -1381,7 +1382,7 @@
             $this->SetPreferences($this->_prefs);
             return true;
         }
-        //Todo: return an error msg to the caller what failed? 
+        //Todo: return an error msg to the caller what failed?
         // same password or no privilege
         return ENCRYPTED_PASSWD ? true : false;
     }
@@ -1415,12 +1416,12 @@
             $GLOBALS['USER_AUTH_ERROR'][$class] = 'nosuchuser';
         }
         if (USER_AUTH_POLICY === 'strict'
-	    or USER_AUTH_POLICY === 'stacked') {
+        or USER_AUTH_POLICY === 'stacked') {
             $class = $this->nextClass();
             while ($user = new $class($this->_userid, $this->_prefs)) {
                 if (!check_php_version(5))
                     eval("\$this = \$user;");
-	        $user = UpgradeUser($this, $user);
+            $user = UpgradeUser($this, $user);
                 if ($user->userExists()) {
                     $user = UpgradeUser($this, $user);
                     return true;
@@ -1436,7 +1437,7 @@
 
 /**
  * Insert more auth classes here...
- * For example a customized db class for another db connection 
+ * For example a customized db class for another db connection
  * or a socket-based auth server.
  *
  */
@@ -1448,7 +1449,7 @@
  *
  * FIXME: This should be a singleton class. Only ADMIN_USER may be of class AdminUser!
  * Other members of the Administrators group must raise their level otherwise somehow.
- * Currently every member is a AdminUser, which will not work for the various 
+ * Currently every member is a AdminUser, which will not work for the various
  * storage methods.
  */
 class _AdminUser
@@ -1458,7 +1459,7 @@
         return false;
     }
     function checkPass($submitted_password) {
-    	if ($this->_userid == ADMIN_USER)
+        if ($this->_userid == ADMIN_USER)
             $stored_password = ADMIN_PASSWD;
         else {
             // Should not happen! Only ADMIN_USER should use this class.
@@ -1481,7 +1482,7 @@
     }
 
     function storePass($submitted_password) {
-    	if ($this->_userid == ADMIN_USER)
+        if ($this->_userid == ADMIN_USER)
             return false;
         else {
             // should not happen! only ADMIN_USER should use this class.
@@ -1492,9 +1493,9 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
- * Various data classes for the preference types, 
+ * Various data classes for the preference types,
  * to support get, set, sanify (range checking, ...)
- * update() will do the neccessary side-effects if a 
+ * update() will do the neccessary side-effects if a
  * setting gets changed (theme, language, ...)
 */
 
@@ -1511,36 +1512,36 @@
     }
 
     function get ($name) {
-    	if (isset($this->{$name}))
-	    return $this->{$name};
-    	else 
+        if (isset($this->{$name}))
+        return $this->{$name};
+        else
             return $this->default_value;
     }
 
     function getraw ($name) {
-    	if (!empty($this->{$name}))
-	    return $this->{$name};
+        if (!empty($this->{$name}))
+        return $this->{$name};
     }
 
     // stores the value as $this->$name, and not as $this->value (clever?)
     function set ($name, $value) {
-    	$return = 0;
-    	$value = $this->sanify($value);
-	if ($this->get($name) != $value) {
-	    $this->update($value);
-	    $return = 1;
-	}
-	if ($value != $this->default_value) {
-	    $this->{$name} = $value;
+        $return = 0;
+        $value = $this->sanify($value);
+    if ($this->get($name) != $value) {
+        $this->update($value);
+        $return = 1;
+    }
+    if ($value != $this->default_value) {
+        $this->{$name} = $value;
         } else {
             unset($this->{$name});
         }
         return $return;
     }
 
-    // default: no side-effects 
+    // default: no side-effects
     function update ($value) {
-    	;
+        ;
     }
 }
 
@@ -1620,7 +1621,7 @@
 
         return (string) $value;
     }
-    
+
     function update ($newvalue) {
         if (! $this->_init ) {
             // invalidate etag to force fresh output
@@ -1663,7 +1664,7 @@
 extends _UserPreference
 {
     function sanify ($value) {
-    	if (!empty($value))
+        if (!empty($value))
             return $value;
         else
             return $this->default_value;
@@ -1671,18 +1672,18 @@
 
     /** update to global user prefs: side-effect on set notify changes
      * use a global_data notify hash:
-     * notify = array('pagematch' => array(userid => ('email' => mail, 
+     * notify = array('pagematch' => array(userid => ('email' => mail,
      *                                                'verified' => 0|1),
      *                                     ...),
      *                ...);
      */
     function update ($value) {
-    	if (!empty($this->_init)) return;
+        if (!empty($this->_init)) return;
         $dbh = $GLOBALS['request']->getDbh();
         $notify = $dbh->get('notify');
         if (empty($notify))
             $data = array();
-        else 
+        else
             $data =& $notify;
         // expand to existing pages only or store matches?
         // for now we store (glob-style) matches which is easier for the user
@@ -1710,7 +1711,7 @@
                 if (!isset($data[$page]))
                     $data[$page] = array();
                 if (!isset($data[$page][$userid])) {
-                    // should we really store the verification notice here or 
+                    // should we really store the verification notice here or
                     // check it dynamically at every page->save?
                     if ($verified) {
                         $data[$page][$userid] = array('email' => $email,
@@ -1759,11 +1760,11 @@
         if ($ok) {
             return $value;
         } else {
-            trigger_error("E-Mail Validation Error: ".$msg, E_USER_WARNING);
+            trigger_error("E-mail Validation Error: ".$msg, E_USER_WARNING);
             return $this->default_value;
         }
     }
-    
+
     /** Side-effect on email changes:
      * Send a verification mail or for now just a notification email.
      * For true verification (value = 2), we'd need a mailserver hook.
@@ -1771,7 +1772,7 @@
     function update($value) {
         // e-mail address is already checked by FusionForge
         if (FUSIONFORGE) return $value;
-    	if (!empty($this->_init)) return;
+        if (!empty($this->_init)) return;
         $verified = $this->getraw('emailVerified');
         // hack!
         if (($value == 1 or $value === true) and $verified)
@@ -1783,7 +1784,7 @@
                              WIKI_NAME, WikiURL($GLOBALS['request']->getArg('pagename'),'',true)))) {
                 $this->set('emailVerified',1);
             } else {
-            	trigger_error($msg, E_USER_WARNING);
+                trigger_error($msg, E_USER_WARNING);
             }
         }
     }
@@ -1833,25 +1834,25 @@
     $mailbox = "(?:$addr_spec|$phrase$route_addr)";
 
     $rfc822re = "/$lwsp*$mailbox/";
-    unset($domain, $route_addr, $route, $phrase, $addr_spec, $sub_domain, $localpart, 
+    unset($domain, $route_addr, $route, $phrase, $addr_spec, $sub_domain, $localpart,
           $atom, $word, $quoted_string);
     unset($dtext, $controls, $specials, $lwsp, $domain_literal);
 
     if (!preg_match($rfc822re, $email)) {
         $result[0] = false;
-        $result[1] = sprintf(_("E-Mail address '%s' is not properly formatted"), $email);
+        $result[1] = sprintf(_("E-mail address '%s' is not properly formatted"), $email);
         return $result;
     }
     if ($noconnect)
-      return array(true, sprintf(_("E-Mail address '%s' is properly formatted"), $email));
+      return array(true, sprintf(_("E-mail address '%s' is properly formatted"), $email));
 
     list ( $Username, $Domain ) = explode("@", $email);
     //Todo: getmxrr workaround on windows or manual input field to verify it manually
-    if (!isWindows() and getmxrr($Domain, $MXHost)) { // avoid warning on Windows. 
+    if (!isWindows() and getmxrr($Domain, $MXHost)) { // avoid warning on Windows.
         $ConnectAddress = $MXHost[0];
     } else {
         $ConnectAddress = $Domain;
-	if (isset($EMailHosts[ $Domain ])) {
+    if (isset($EMailHosts[ $Domain ])) {
             $ConnectAddress = $EMailHosts[ $Domain ];
         }
     }
@@ -1883,22 +1884,22 @@
           }
     }  else {
         $result[0]=false;
-        $result[1]="Can not connect E-Mail server.";
+        $result[1]="Cannot connect e-mail server.";
         return $result;
     }
     $result[0]=true;
-    $result[1]="E-Mail address '$email' appears to be valid.";
+    $result[1]="E-mail address '$email' appears to be valid.";
     return $result;
-} // end of function 
+} // end of function
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /**
  * UserPreferences
- * 
+ *
  * This object holds the $request->_prefs subobjects.
  * A simple packed array of non-default values get's stored as cookie,
- * homepage, or database, which are converted to the array of 
+ * homepage, or database, which are converted to the array of
  * ->_prefs objects.
  * We don't store the objects, because otherwise we will
  * not be able to upgrade any subobject. And it's a waste of space also.
@@ -1907,20 +1908,20 @@
 class UserPreferences
 {
     var $notifyPagesAll;
-	
+
     function UserPreferences($saved_prefs = false) {
         // userid stored too, to ensure the prefs are being loaded for
         // the correct (currently signing in) userid if stored in a
         // cookie.
-        // Update: for db prefs we disallow passwd. 
-        // userid is needed for pref reflexion. current pref must know its username, 
+        // Update: for db prefs we disallow passwd.
+        // userid is needed for pref reflexion. current pref must know its username,
         // if some app needs prefs from different users, different from current user.
         $this->_prefs
             = array(
                     'userid'        => new _UserPreference(''),
                     'passwd'        => new _UserPreference(''),
                     'autologin'     => new _UserPreference_bool(),
-                    //'emailVerified' => new _UserPreference_emailVerified(), 
+                    //'emailVerified' => new _UserPreference_emailVerified(),
                     //fixed: store emailVerified as email parameter, 1.3.8
                     'email'         => new _UserPreference_email(''),
                     'notifyPages'   => new _UserPreference_notify(''), // 1.3.8
@@ -1929,7 +1930,7 @@
                     'editWidth'     => new _UserPreference_int(EDITWIDTH_DEFAULT_COLS,
                                                                EDITWIDTH_MIN_COLS,
                                                                EDITWIDTH_MAX_COLS),
-                    'noLinkIcons'   => new _UserPreference_bool(),    // 1.3.8 
+                    'noLinkIcons'   => new _UserPreference_bool(),    // 1.3.8
                     'editHeight'    => new _UserPreference_int(EDITHEIGHT_DEFAULT_ROWS,
                                                                EDITHEIGHT_MIN_ROWS,
                                                                EDITHEIGHT_MAX_ROWS),
@@ -1968,7 +1969,7 @@
         }
 
         // add custom theme-specific pref types:
-        // FIXME: on theme changes the wiki_user session pref object will fail. 
+        // 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);
@@ -1993,8 +1994,8 @@
     }
 
     function _getPref($name) {
-    	if ($name == 'emailVerified')
-    	    $name = 'email';
+        if ($name == 'emailVerified')
+            $name = 'email';
         if (!isset($this->_prefs[$name])) {
             if ($name == 'passwd2') return false;
             if ($name == 'passwd') return false;
@@ -2003,16 +2004,16 @@
         }
         return $this->_prefs[$name];
     }
-    
+
     // get the value or default_value of the subobject
     function get($name) {
-    	if ($_pref = $this->_getPref($name))
-    	    if ($name == 'emailVerified')
-    	        return $_pref->getraw($name);
-    	    else
-    	        return $_pref->get($name);
-    	else
-    	    return false;  
+        if ($_pref = $this->_getPref($name))
+            if ($name == 'emailVerified')
+                return $_pref->getraw($name);
+            else
+                return $_pref->get($name);
+        else
+            return false;
     }
 
     // check and set the new value in the subobject
@@ -2022,8 +2023,8 @@
             return false;
 
         /* do it here or outside? */
-        if ($name == 'passwd' and 
-            defined('PASSWORD_LENGTH_MINIMUM') and 
+        if ($name == 'passwd' and
+            defined('PASSWORD_LENGTH_MINIMUM') and
             strlen($value) <= PASSWORD_LENGTH_MINIMUM ) {
             //TODO: How to notify the user?
             return false;
@@ -2039,7 +2040,7 @@
         {
             if ($name == 'emailVerified') $newvalue = $value;
             else $newvalue = $pref->sanify($value);
-	    $pref->set($name, $newvalue);
+        $pref->set($name, $newvalue);
         }
         $this->_prefs[$name] =& $pref;
         return true;
@@ -2058,13 +2059,13 @@
                     $count++;
             }
             foreach (array_keys($this->_prefs) as $type) {
-            	$obj =& $this->_prefs[$type];
+                $obj =& $this->_prefs[$type];
                 $obj->_init = $init;
                 if ($prefs->get($type) !== $obj->get($type)) {
                     // special systemdefault prefs: (probably not needed)
-                    if ($type == 'theme' and $prefs->get($type) == '' and 
+                    if ($type == 'theme' and $prefs->get($type) == '' and
                         $obj->get($type) == THEME) continue;
-                    if ($type == 'lang' and $prefs->get($type) == '' and 
+                    if ($type == 'lang' and $prefs->get($type) == '' and
                         $obj->get($type) == DEFAULT_LANGUAGE) continue;
                     if ($this->_prefs[$type]->set($type, $prefs->get($type)))
                         $count++;
@@ -2073,12 +2074,12 @@
         } elseif (is_array($prefs)) {
             //unset($this->_prefs['userid']);
             /*
-	    if (isset($this->_method) and 
-	         ($this->_method == 'SQL' or $this->_method == 'ADODB')) {
+        if (isset($this->_method) and
+             ($this->_method == 'SQL' or $this->_method == 'ADODB')) {
                 unset($this->_prefs['passwd']);
-	    }
-	    */
-	    // emailVerified at first, the rest later
+        }
+        */
+        // emailVerified at first, the rest later
             $type = 'emailVerified'; $obj =& $this->_prefs['email'];
             $obj->_init = $init;
             if (isset($prefs[$type]) and $obj->get($type) !== $prefs[$type]) {
@@ -2086,17 +2087,17 @@
                     $count++;
             }
             foreach (array_keys($this->_prefs) as $type) {
-            	$obj =& $this->_prefs[$type];
+                $obj =& $this->_prefs[$type];
                 $obj->_init = $init;
-                if (!isset($prefs[$type]) and isa($obj,"_UserPreference_bool")) 
+                if (!isset($prefs[$type]) and isa($obj,"_UserPreference_bool"))
                     $prefs[$type] = false;
                 if (isset($prefs[$type]) and isa($obj,"_UserPreference_int"))
                     $prefs[$type] = (int) $prefs[$type];
                 if (isset($prefs[$type]) and $obj->get($type) != $prefs[$type]) {
                     // special systemdefault prefs:
-                    if ($type == 'theme' and $prefs[$type] == '' and 
+                    if ($type == 'theme' and $prefs[$type] == '' and
                         $obj->get($type) == THEME) continue;
-                    if ($type == 'lang' and $prefs[$type] == '' and 
+                    if ($type == 'lang' and $prefs[$type] == '' and
                         $obj->get($type) == DEFAULT_LANGUAGE) continue;
                     if ($obj->set($type,$prefs[$type]))
                         $count++;
@@ -2149,7 +2150,7 @@
                 and substr($packed_pref, 0, 2) == "O:")
             {
                 //legacy: check if it's an old array of objects
-                // Looks like a serialized object. 
+                // Looks like a serialized object.
                 // This might fail if the object definition does not exist anymore.
                 // object with ->$name and ->default_value vars.
                 $pref =  @unserialize($packed_pref);
@@ -2157,10 +2158,10 @@
                     $prefs[$name] = $pref->get($name);
             // fix old-style prefs
             } elseif (is_numeric($name) and is_array($packed_pref)) {
-            	if (count($packed_pref) == 1) {
-            	    list($name,$value) = each($packed_pref);
-            	    $prefs[$name] = $value;
-            	}
+                if (count($packed_pref) == 1) {
+                    list($name,$value) = each($packed_pref);
+                    $prefs[$name] = $value;
+                }
             } else {
                 if (isSerialized($packed_pref))
                     $prefs[$name] = @unserialize($packed_pref);
@@ -2171,7 +2172,7 @@
                     $prefs[$name] = $packed_pref;
             }
         }
-        
+
         if (FUSIONFORGE) {
             // Restore notifyPages from notifyPagesAll
             // notifyPages are pages to notify in the current project
@@ -2201,13 +2202,13 @@
     }
 
     function defaultPreferences() {
-    	$prefs = array();
-    	foreach ($this->_prefs as $key => $obj) {
-    	    $prefs[$key] = $obj->default_value;
-    	}
-    	return $prefs;
+        $prefs = array();
+        foreach ($this->_prefs as $key => $obj) {
+            $prefs[$key] = $obj->default_value;
+        }
+        return $prefs;
     }
-    
+
     // array of objects
     function getAll() {
         return $this->_prefs;
@@ -2247,7 +2248,7 @@
 extends UserPreferences
 {
     function CookieUserPreferences ($saved_prefs = false) {
-    	//_AnonUser::_AnonUser('',$saved_prefs);
+        //_AnonUser::_AnonUser('',$saved_prefs);
         UserPreferences::UserPreferences($saved_prefs);
     }
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/FCKeditor.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/FCKeditor.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/FCKeditor.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: FCKeditor.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: FCKeditor.php 7956 2011-03-03 17:08:31Z vargenau $
 /**
  * FCKeditor is compatible with most internet browsers which
  * include: IE 5.5+ (Windows), Firefox 1.0+, Mozilla 1.3+

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/Wikiwyg.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/Wikiwyg.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: Wikiwyg.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: Wikiwyg.php 7956 2011-03-03 17:08:31Z vargenau $
 /**
  * Wikiwyg is compatible with most internet browsers which
  * include: IE 5.5+ (Windows), Firefox 1.0+, Mozilla 1.3+

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/htmlarea2.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/htmlarea2.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/htmlarea2.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: htmlarea2.php 7454 2010-05-31 13:02:02Z vargenau $');
+// $Id: htmlarea2.php 7956 2011-03-03 17:08:31Z vargenau $
 /**
  * requires installation into themes/default/htmlarea2/
  * Output the javascript function to check for MS Internet Explorer >= 5.5 on Windows

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/htmlarea3.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/htmlarea3.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/htmlarea3.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: htmlarea3.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: htmlarea3.php 7956 2011-03-03 17:08:31Z vargenau $
 /**
  * requires installation into themes/default/htmlarea3/
  * MSIE => 5.5,  Mozilla >= 1.3

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/tinymce.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/tinymce.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit/tinymce.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: tinymce.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: tinymce.php 7956 2011-03-03 17:08:31Z vargenau $
 /**
  * Multiple browser support, currently Mozilla (PC, Mac and Linux), 
  * MSIE (PC) and FireFox (PC, Mac and Linux) and some limited Safari support.

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/WysiwygEdit.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: WysiwygEdit.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: WysiwygEdit.php 7964 2011-03-05 17:05:30Z vargenau $
 /**
  * Baseclass for WysiwygEdit/*
  *
@@ -7,10 +7,10 @@
  *   tinymce, htmlarea3, FCKeditor, spaw, htmlarea2, Wikiwyg
  * Not yet enabled as default, since we cannot convert HTML to Wiki Markup yet.
  * (See HtmlParser.php for the ongoing efforts)
- * We might use a PageType=html, which is contra wiki, but some people 
+ * We might use a PageType=html, which is contra wiki, but some people
  * might prefer HTML markup.
  *
- * TODO: Change from ENABLE_WYSIWYG constant to user preference variable 
+ * TODO: Change from ENABLE_WYSIWYG constant to user preference variable
  *       (checkbox setting or edit click as in gmail),
  *       when HtmlParser is finished.
  * Based upon htmlarea3.php and tinymce.php
@@ -25,17 +25,17 @@
 
 class WysiwygEdit {
 
-    function WysiwygEdit() { 
+    function WysiwygEdit() {
         $this->_transformer_tags = false;
     }
 
     function Head($name='edit[content]') {
-        trigger_error("virtual", E_USER_ERROR); 
+        trigger_error("virtual", E_USER_ERROR);
     }
 
     // to be called after </textarea>
     function Textarea($textarea,$wikitext,$name='edit[content]') {
-        trigger_error("virtual", E_USER_ERROR); 
+        trigger_error("virtual", E_USER_ERROR);
     }
 
     /**
@@ -45,10 +45,10 @@
      */
     function ConvertBefore($text) {
         require_once("lib/BlockParser.php");
-    	$xml = TransformText($text, 2.0, $GLOBALS['request']->getArg('pagename'));
+        $xml = TransformText($text, 2.0, $GLOBALS['request']->getArg('pagename'));
         return $xml->AsXML();
     }
-    
+
     /**
      * FIXME: Handler to convert the HTML formatting back to wiki formatting.
      * Derived from InlineParser, but returning wiki text instead of HtmlElement objects.
@@ -81,7 +81,7 @@
         case 'b':
         case 'strong':
             return "*".$body."*";
-        case 'big': 
+        case 'big':
             return "<big>".$body."</big>";
         case 'i':
         case 'em':
@@ -119,7 +119,7 @@
 class HtmlTransformer extends InlineTransformer
 {
     function HtmlTransformer ($tags = false) {
-        if (!$tags) $tags = 
+        if (!$tags) $tags =
             array('escape','html_br','html_spanbold','html_simple_tag',
                   'html_p',);
         /*

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/XmlElement.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/XmlElement.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/XmlElement.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: XmlElement.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: XmlElement.php 7964 2011-03-05 17:05:30Z vargenau $
 /**
  * Code for writing XML.
  * @package Markup
@@ -71,7 +71,7 @@
         else
             array_unshift($this->_content, $item);
     }
-  
+
     function getContent () {
         return $this->_content;
     }
@@ -94,12 +94,12 @@
                     printf("==Object(%s)==", get_class($item));
             }
             elseif (is_array($item)) {
-	        // DEPRECATED:
-        	// Use XmlContent objects instead of arrays for collections of XmlElements.
-        	trigger_error("Passing arrays to printXML() is deprecated: (" . AsXML($item, true) . ")",
+            // DEPRECATED:
+            // Use XmlContent objects instead of arrays for collections of XmlElements.
+            trigger_error("Passing arrays to printXML() is deprecated: (" . AsXML($item, true) . ")",
                       E_USER_NOTICE);
-        	foreach ($item as $x)
-            	    $this->printXML($x);
+            foreach ($item as $x)
+                    $this->printXML($x);
             } else {
                 echo $this->_quote((string) $item);
             }
@@ -118,10 +118,10 @@
                     $xml .= sprintf("==Object(%s)==", get_class($item));
             }
             elseif (is_array($item)) {
-        	trigger_error("Passing arrays to ->asXML() is deprecated: (" . AsXML($item, true) . ")",
+            trigger_error("Passing arrays to ->asXML() is deprecated: (" . AsXML($item, true) . ")",
                       E_USER_NOTICE);
-        	foreach ($item as $x)
-            	    $xml .= $this->asXML($x);
+            foreach ($item as $x)
+                    $xml .= $this->asXML($x);
             }
             else
                 $xml .= $this->_quote((string) $item);
@@ -157,11 +157,11 @@
             if (is_object($item)) {
                 if (method_exists($item, 'asString')) {
                     $string = $item->asString();
-	            if (is_object($string)) {
-	            	; // ignore error so far: ImageLink labels
-	            } else {
+                if (is_object($string)) {
+                    ; // ignore error so far: ImageLink labels
+                } else {
                         $val .= $this->_quote($item->asString());
-	            }
+                }
                 } else {
                     $val .= sprintf("==Object(%s)==", get_class($item));
                 }
@@ -188,10 +188,10 @@
         }
         return true;
     }
-  
+
     function _quote ($string) {
-    	if (!$string) return $string;
-	return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']);
+        if (!$string) return $string;
+    return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']);
     }
 };
 
@@ -215,7 +215,7 @@
         assert(count($args) >= 1);
         //assert(is_string($args[0]));
         $this->_tag = array_shift($args);
-      
+
         if ($args && is_array($args[0]))
             $this->_attr = array_shift($args);
         else {
@@ -226,7 +226,7 @@
 
         $this->setContent($args);
     }
-  
+
     /** Methods only needed for XmlParser,
      *  to be fully compatible to perl Html::Element
      */
@@ -241,7 +241,7 @@
         unset($this->_attr);
         unset($this->_content);
     }
-  
+
     function getChildren () {
         return $this->_children;
     }
@@ -255,19 +255,19 @@
     function getTag () {
         return $this->_tag;
     }
-  
+
     function setAttr ($attr, $value = false) {
-	if (is_array($attr)) {
+    if (is_array($attr)) {
             assert($value === false);
             foreach ($attr as $a => $v) {
                 $this->_attr[strtolower($a)] = $v;
-		//$this->set($a, $v);
+        //$this->set($a, $v);
             }
             return;
-	}
+    }
 
         assert(is_string($attr));
-          
+
         if ($value === false) {
             unset($this->_attr[$attr]);
         }
@@ -277,43 +277,43 @@
             $this->_attr[$attr] = (string) $value;
         }
 
-	if ($attr == 'class')
-	    unset($this->_classes);
+    if ($attr == 'class')
+        unset($this->_classes);
     }
 
     function getAttr ($attr) {
-	if ($attr == 'class')
-	    $this->_setClasses();
+    if ($attr == 'class')
+        $this->_setClasses();
 
-	if (isset($this->_attr[strtolower($attr)]))
-	    return $this->_attr[strtolower($attr)];
-	else
-	    return false;
+    if (isset($this->_attr[strtolower($attr)]))
+        return $this->_attr[strtolower($attr)];
+    else
+        return false;
     }
 
     function _getClasses() {
-	if (!isset($this->_classes)) {
-	    $this->_classes = array();
-	    if (isset($this->_attr['class'])) {
-		$classes = explode(' ', (string) $this->_attr['class']);
-		foreach ($classes as $class) {
-		    $class = trim($class);
-		    if ($class)
-			$this->_classes[$class] = $class;
-		}
-	    }
-	}
-	return $this->_classes;
+    if (!isset($this->_classes)) {
+        $this->_classes = array();
+        if (isset($this->_attr['class'])) {
+        $classes = explode(' ', (string) $this->_attr['class']);
+        foreach ($classes as $class) {
+            $class = trim($class);
+            if ($class)
+            $this->_classes[$class] = $class;
+        }
+        }
     }
+    return $this->_classes;
+    }
 
     function _setClasses() {
-	if (isset($this->_classes)) {
-	    if ($this->_classes)
-		$this->_attr['class'] = join(' ', $this->_classes);
-	    else
-		unset($this->_attr['class']);
-	}
+    if (isset($this->_classes)) {
+        if ($this->_classes)
+        $this->_attr['class'] = join(' ', $this->_classes);
+        else
+        unset($this->_attr['class']);
     }
+    }
 
     /**
      * Manipulate the elements CSS class membership.
@@ -328,12 +328,12 @@
      *   If false, the element is removed from the class.
      */
     function setInClass($class, $in_class=true) {
-	$this->_getClasses();
-	$class = trim($class);
-	if ($in_class)
-	    $this->_classes[$class] = $class;
-	else
-	    unset($this->_classes[$class]);
+    $this->_getClasses();
+    $class = trim($class);
+    if ($in_class)
+        $this->_classes[$class] = $class;
+    else
+        unset($this->_classes[$class]);
     }
 
     /**
@@ -346,13 +346,13 @@
      * @return bool True if the element is a member of $class.
      */
     function inClass($class) {
-	$this->_parseClasses();
-	return isset($this->_classes[trim($class)]);
+    $this->_parseClasses();
+    return isset($this->_classes[trim($class)]);
     }
 
     function startTag() {
         $start = "<" . $this->_tag;
-	$this->_setClasses();
+    $this->_setClasses();
         foreach ($this->_attr as $attr => $val) {
             if (is_bool($val)) {
                 if (!$val)
@@ -370,12 +370,12 @@
         return substr($this->startTag(), 0, -1) . "/>";
     }
 
-  
+
     function endTag() {
         return "</$this->_tag>";
     }
-  
-      
+
+
     function printXML () {
         if ($this->isEmpty())
             echo $this->emptyTag();
@@ -422,7 +422,7 @@
             return false;
         return true;
     }
-  
+
     /**
      * Is this element part of inline content?
      *
@@ -432,7 +432,7 @@
     function isInlineElement () {
         return false;
     }
-  
+
 };
 
 class RawXml {
@@ -452,9 +452,9 @@
     function asXML () {
         return $this->_xml;
     }
-  
+
     function asString () {
-    	return $this->_xml;
+        return $this->_xml;
     }
 
     function isEmpty () {
@@ -486,7 +486,7 @@
                 // strings uncluttered
                 trigger_error(sprintf(_("Can't mix '%s' with '%s' type format strings"),
                                       '%1\$s','%s'), E_USER_WARNING);
-      
+
             $this->_fs = preg_replace('/(?<!%)%\d+\$/x', '%', $this->_fs);
 
             $this->_args = array();
@@ -630,7 +630,7 @@
             $str .= AsString($x);
         return $str;
     }
-  
+
     return (string) $val;
 }
 
@@ -649,5 +649,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/XmlParser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/XmlParser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/XmlParser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: XmlParser.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: XmlParser.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Base XmlParser Class.
  * Requires the expat.so/.dll, usually enabled by default.
@@ -34,7 +34,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -93,7 +93,7 @@
         if (is_string($attrs) and !empty($attrs)) {
             // lowercase attr names
             foreach(explode(' ', $attrs) as $pair) {
-            	if (strstr($pair,"=")) {
+                if (strstr($pair,"=")) {
                     list($key,$val) = explode('=', $pair);
                     $key = strtolower(trim($key));
                     $val = str_replace(array('"',"'"),'',trim($val));
@@ -114,9 +114,9 @@
             $this->current->_content[] =& $node;    // copy or ref?
             $node->previous =& $this->current;      // ref to parallel prev
         }
-        $this->current =& $node;	  		// ref
+        $this->current =& $node;              // ref
         if (empty($this->root)) {
-            $this->root =& $node; 		 	// ref for === test below
+            $this->root =& $node;              // ref for === test below
             $GLOBALS['xml_parser_root'] =& $this->root;  // copy
         }
     }
@@ -155,7 +155,7 @@
             }
             $content = "";
             while ($data = fread($fp, 4096))  {
-            	$content .= $data;
+                $content .= $data;
             }
             fclose($fp);
             $this->parse($content);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/XmlRpcClient.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/XmlRpcClient.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/XmlRpcClient.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// $Id: XmlRpcClient.php 7638 2010-08-11 11:58:40Z vargenau $
+// $Id: XmlRpcClient.php 7964 2011-03-05 17:05:30Z vargenau $
 /* Copyright (C) 2002, Lawrence Akka <lakka at users.sourceforge.net>
  * Copyright (C) 2004,2005,2006 $ThePhpWikiProgrammingTeam
  */
@@ -80,27 +80,27 @@
 
 function wiki_xmlrpc_post($method, $args = null, $url = null, $auth = null) {
     if (is_null($url)) {
-	//$url = deduce_script_name();
-	$url = DATA_PATH . "/RPC2.php"; // connect to self
+    //$url = deduce_script_name();
+    $url = DATA_PATH . "/RPC2.php"; // connect to self
     }
     $debug = 0;
     $server = parse_url($url);
     if (empty($server['host'])) {
-	$server['host'] = 'localhost';
+    $server['host'] = 'localhost';
     }
     if (!empty($_GET['start_debug'])) {
-	$debug = 2;
+    $debug = 2;
     }
     if (DEBUG & _DEBUG_REMOTE) {  // xmlrpc remote debugging
-	$debug = 2;
-	$server['path'] .= '?start_debug=1';
+    $debug = 2;
+    $server['path'] .= '?start_debug=1';
     }
     $params = array('method' => $method,
-		    'args'   => $args,
-		    'host'   => $server['host'],
-		    'uri'    => $server['path'],
-		    'debug'  => $debug,
-		    'output' => null);
+            'args'   => $args,
+            'host'   => $server['host'],
+            'uri'    => $server['path'],
+            'debug'  => $debug,
+            'output' => null);
     //TODO: auth and/or session cookie
     if (isset($auth['sid']))
         $params['cookies'] = array(session_name() => $auth['sid']);
@@ -118,5 +118,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/XmlRpcServer.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/XmlRpcServer.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/XmlRpcServer.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// $Id: XmlRpcServer.php 7638 2010-08-11 11:58:40Z vargenau $
+// $Id: XmlRpcServer.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2002, Lawrence Akka <lakka at users.sourceforge.net>
  * Copyright (C) 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
  *
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * LIBRARY USED - POSSIBLE PROBLEMS
@@ -61,11 +61,11 @@
 
 Done:
         Test hwiki.jar xmlrpc interface (java visualization plugin)
-     	Make use of the xmlrpc extension if found. http://xmlrpc-epi.sourceforge.net/
-	Resolved namespace conflicts
-	Added various phpwiki specific methods (mailPasswordToUser, getUploadedFileInfo,
-	putPage, titleSearch, listPlugins, getPluginSynopsis, listRelations)
-	Use client methods in inter-phpwiki calls: SyncWiki, tests/xmlrpc/
+         Make use of the xmlrpc extension if found. http://xmlrpc-epi.sourceforge.net/
+    Resolved namespace conflicts
+    Added various phpwiki specific methods (mailPasswordToUser, getUploadedFileInfo,
+    putPage, titleSearch, listPlugins, getPluginSynopsis, listRelations)
+    Use client methods in inter-phpwiki calls: SyncWiki, tests/xmlrpc/
 */
 
 // Intercept GET requests from confused users.  Only POST is allowed here!
@@ -133,9 +133,9 @@
  * int getRPCVersionSupported(): Returns 1 for this version of the API
  */
 $wiki_dmap['getRPCVersionSupported']
-= array('signature'	=> array(array($xmlrpcInt)),
+= array('signature'    => array(array($xmlrpcInt)),
         'documentation' => 'Get the version of the wiki API',
-        'function'	=> 'getRPCVersionSupported');
+        'function'    => 'getRPCVersionSupported');
 
 // The function must be a function in the global scope which services the XML-RPC
 // method.
@@ -158,9 +158,9 @@
  * Additionally to API version 1 and 2 we added the summary field.
  */
 $wiki_dmap['getRecentChanges']
-= array('signature'	=> array(array($xmlrpcArray, $xmlrpcDateTime)),
+= array('signature'    => array(array($xmlrpcArray, $xmlrpcDateTime)),
         'documentation' => 'Get a list of changed pages since [timestamp]',
-        'function'	=> 'getRecentChanges');
+        'function'    => 'getRecentChanges');
 
 function getRecentChanges($params)
 {
@@ -183,7 +183,7 @@
         $pages[] = new xmlrpcval(array('name' => $name,
                                        'lastModified' => $lastmodified,
                                        'author' => $author,
-				       'summary' => short_string($page->get('summary')),
+                       'summary' => short_string($page->get('summary')),
                                        'version' => $version),
                                  'struct');
     }
@@ -197,9 +197,9 @@
  * with UTF-8 encoded page data.
  */
 $wiki_dmap['getPage']
-= array('signature'	=> array(array($xmlrpcBase64, $xmlrpcString)),
+= array('signature'    => array(array($xmlrpcBase64, $xmlrpcString)),
         'documentation' => 'Get the raw Wiki text of the current version of a page',
-        'function'	=> 'getPage');
+        'function'    => 'getPage');
 
 function getPage($params)
 {
@@ -220,9 +220,9 @@
  * Returns UTF-8, expects UTF-8 with URL encoding.
  */
 $wiki_dmap['getPageVersion']
-= array('signature'	=> array(array($xmlrpcBase64, $xmlrpcString, $xmlrpcInt)),
+= array('signature'    => array(array($xmlrpcBase64, $xmlrpcString, $xmlrpcInt)),
         'documentation' => 'Get the raw Wiki text of a page version',
-        'function'	=> 'getPageVersion');
+        'function'    => 'getPageVersion');
 
 function getPageVersion($params)
 {
@@ -236,22 +236,22 @@
  */
 
 $wiki_dmap['getPageHTML']
-= array('signature'	=> array(array($xmlrpcBase64, $xmlrpcString)),
+= array('signature'    => array(array($xmlrpcBase64, $xmlrpcString)),
         'documentation' => 'Get the current version of a page rendered in HTML',
-        'function'	=> 'getPageHTML');
+        'function'    => 'getPageHTML');
 
 function getPageHTML($params)
 {
     $revision = _getPageRevision($params);
     if (!$revision)
         return NoSuchPage();
-  
+
     $content = $revision->getTransformedContent();
     $html = $content->asXML();
     // HACK: Get rid of outer <div class="wikitext">
     if (preg_match('/^\s*<div class="wikitext">/', $html, $m1)
-	&& preg_match('@</div>\s*$@', $html, $m2)) {
-	$html = substr($html, strlen($m1[0]), -strlen($m2[0]));
+    && preg_match('@</div>\s*$@', $html, $m2)) {
+    $html = substr($html, strlen($m1[0]), -strlen($m2[0]));
     }
 
     return new xmlrpcresp(long_string($html));
@@ -261,9 +261,9 @@
  * base64 getPageHTMLVersion( String pagename, int version ): Return page in rendered HTML, UTF-8.
  */
 $wiki_dmap['getPageHTMLVersion']
-= array('signature'	=> array(array($xmlrpcBase64, $xmlrpcString, $xmlrpcInt)),
+= array('signature'    => array(array($xmlrpcBase64, $xmlrpcString, $xmlrpcInt)),
         'documentation' => 'Get a version of a page rendered in HTML',
-        'function'	=> 'getPageHTMLVersion');
+        'function'    => 'getPageHTMLVersion');
 
 function getPageHTMLVersion($params)
 {
@@ -274,9 +274,9 @@
  * getAllPages(): Returns a list of all pages. The result is an array of strings.
  */
 $wiki_dmap['getAllPages']
-= array('signature'	=> array(array($xmlrpcArray)),
+= array('signature'    => array(array($xmlrpcArray)),
         'documentation' => 'Returns a list of all pages as an array of strings',
-        'function'	=> 'getAllPages');
+        'function'    => 'getAllPages');
 
 function getAllPages($params)
 {
@@ -298,22 +298,22 @@
  *   author (string): author name
  */
 $wiki_dmap['getPageInfo']
-= array('signature'	=> array(array($xmlrpcStruct, $xmlrpcString)),
+= array('signature'    => array(array($xmlrpcStruct, $xmlrpcString)),
         'documentation' => 'Gets info about the current version of a page',
-        'function'	=> 'getPageInfo');
+        'function'    => 'getPageInfo');
 
 function getPageInfo($params)
 {
     $revision = _getPageRevision($params);
     if (!$revision)
         return NoSuchPage();
-  
+
     $name = short_string($revision->getPageName());
     $version = new xmlrpcval ($revision->getVersion(), "int");
     $lastmodified = new xmlrpcval(iso8601_encode($revision->get('mtime'), 0),
                                   "dateTime.iso8601");
     $author = short_string($revision->get('author'));
-      
+
     return new xmlrpcresp(new xmlrpcval(array('name' => $name,
                                               'lastModified' => $lastmodified,
                                               'version' => $version,
@@ -327,9 +327,9 @@
  * specific version.
  */
 $wiki_dmap['getPageInfoVersion']
-= array('signature'	=> array(array($xmlrpcStruct, $xmlrpcString, $xmlrpcInt)),
+= array('signature'    => array(array($xmlrpcStruct, $xmlrpcString, $xmlrpcInt)),
         'documentation' => 'Gets info about a page version',
-        'function'	=> 'getPageInfoVersion');
+        'function'    => 'getPageInfoVersion');
 
 function getPageInfoVersion($params)
 {
@@ -339,19 +339,19 @@
 
 /*  array listLinks( string pagename ): Lists all links for a given page. The
  *  returned array contains structs, with the following elements:
- *   	 name (string) : The page name or URL the link is to.
+ *        name (string) : The page name or URL the link is to.
  *       type (int)    : The link type. Zero (0) for internal Wiki link,
  *                        one (1) for external link (URL - image link, whatever).
  */
 $wiki_dmap['listLinks']
-= array('signature'	=> array(array($xmlrpcArray, $xmlrpcString)),
+= array('signature'    => array(array($xmlrpcArray, $xmlrpcString)),
         'documentation' => 'Lists all links for a given page',
-        'function'	=> 'listLinks');
+        'function'    => 'listLinks');
 
 function listLinks($params)
 {
     global $request;
-  
+
     $ParamPageName = $params->getParam(0);
     $pagename = short_string_decode($ParamPageName->scalarval());
     $dbh = $request->getDbh();
@@ -359,7 +359,7 @@
         return NoSuchPage($pagename);
 
     $page = $dbh->getPage($pagename);
-  
+
     // The fast WikiDB method. below is the slow method which goes through the formatter
     // NB no clean way to extract a list of external links yet, so
     // only internal links returned.  i.e. all type 'local'.
@@ -377,7 +377,7 @@
         // Also, if USE_PATH_INFO is false, WikiURL is wrong
         // due to its use of SCRIPT_NAME.
         //$use_abspath = USE_PATH_INFO && ! preg_match('/RPC2.php$/', VIRTUAL_PATH);
-      
+
         // USE_PATH_INFO must be defined in index.php or config.ini but not before,
         // otherwise it is ignored and xmlrpc urls are wrong.
         // SCRIPT_NAME here is always .../RPC2.php
@@ -393,7 +393,7 @@
                                             'href' => short_string($url)),
                                       "struct");
     }
- 
+
     /*
     $current = $page->getCurrentRevision();
     $content = $current->getTransformedContent();
@@ -435,7 +435,7 @@
 
 function _getUser($userid='') {
     global $request;
-  
+
     if (! $userid ) {
         if (!isset($_SERVER))
             $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
@@ -459,7 +459,7 @@
         return new WikiUser($request, $userid);
     }
 }
-      
+
 function putPage($params) {
     global $request;
 
@@ -476,12 +476,12 @@
             $passwd = short_string_decode($ParamPassword->scalarval());
         }
     } else {
-    	$userid = $request->_user->_userid;
+        $userid = $request->_user->_userid;
     }
     $request->_user = _getUser($userid);
     $request->_user->_group = $request->getGroup();
     $request->_user->AuthCheck($userid, $passwd);
-                                       
+
     if (! mayAccessPage ('edit', $pagename)) {
         return new xmlrpcresp(
                               new xmlrpcval(
@@ -520,8 +520,8 @@
         else
             $message = "Problem creating version $version of page $pagename";
     } else {
-    	$res = 0;
-    	$message = $message = "Page $pagename unchanged";
+        $res = 0;
+        $message = $message = "Page $pagename unchanged";
     }
     return new xmlrpcresp(new xmlrpcval(array('code'    => new xmlrpcval($res ? 200 : 400, "int"),
                                               'version' => new xmlrpcval($version, "int"),
@@ -544,9 +544,9 @@
  * base64 getAttachment( utf8 attachmentName ), putAttachment( utf8 attachmentName, base64 content )
  */
 $wiki_dmap['getUploadedFileInfo']
-= array('signature'	=> array(array($xmlrpcStruct, $xmlrpcString)),
+= array('signature'    => array(array($xmlrpcStruct, $xmlrpcString)),
         'documentation' => 'Gets date and size about an uploaded local file',
-        'function'	=> 'getUploadedFileInfo');
+        'function'    => 'getUploadedFileInfo');
 
 function getUploadedFileInfo($params)
 {
@@ -559,11 +559,11 @@
         $size = filesize($file);
         $lastmodified = filemtime($file);
     } else {
-    	$size = 0;
-    	$lastmodified = 0;
-    }      
+        $size = 0;
+        $lastmodified = 0;
+    }
     return new xmlrpcresp(new xmlrpcval
-    	(array('lastModified' => new xmlrpcval(iso8601_encode($lastmodified, 1),
+        (array('lastModified' => new xmlrpcval(iso8601_encode($lastmodified, 1),
                                                "dateTime.iso8601"),
                'size' => new xmlrpcval($size, "int")),
         "struct"));
@@ -589,9 +589,9 @@
  * http://www.thetwowayweb.com/soapmeetsrss#rsscloudInterface
  */
 $wiki_dmap['rssPleaseNotify']
-= array('signature'	=> array(array($xmlrpcBoolean, $xmlrpcStruct)),
+= array('signature'    => array(array($xmlrpcBoolean, $xmlrpcStruct)),
         'documentation' => 'RSS2 change notification subscriber channel',
-        'function'	=> 'rssPleaseNotify');
+        'function'    => 'rssPleaseNotify');
 
 function rssPleaseNotify($params)
 {
@@ -605,9 +605,9 @@
 
  */
 $wiki_dmap['mailPasswordToUser']
-= array('signature'	=> array(array($xmlrpcBoolean, $xmlrpcString)),
+= array('signature'    => array(array($xmlrpcBoolean, $xmlrpcString)),
         'documentation' => 'RSS2 user management helper',
-        'function'	=> 'mailPasswordToUser');
+        'function'    => 'mailPasswordToUser');
 
 function mailPasswordToUser($params)
 {
@@ -648,8 +648,8 @@
         $ParamOption = $params->getParam(1);
         $option = (int) $ParamOption->scalarval();
     } else
-	$option = 0;
-    	// default option: substring, case-inexact
+    $option = 0;
+        // default option: substring, case-inexact
 
     $case_exact = $option & 1;
     $regex      = $option & 2;
@@ -664,10 +664,10 @@
             $searchstring = "^".$searchstring."$";
         }
     } else {
-    	if ($option & 4 or $option & 8) {
-	    global $xmlrpcerruser;
-    	    return new xmlrpcresp(0, $xmlrpcerruser + 1, "Invalid option");
-    	}
+        if ($option & 4 or $option & 8) {
+        global $xmlrpcerruser;
+            return new xmlrpcresp(0, $xmlrpcerruser + 1, "Invalid option");
+        }
     }
     include_once("lib/TextSearchQuery.php");
     $query = new TextSearchQuery($searchstring, $case_exact, $regex ? 'auto' : 'none');
@@ -761,7 +761,7 @@
             $plugin_args = '\n'.str_replace($src, $replace, $desc);
         $synopsis = "<?plugin ".$pluginName.$plugin_args."?>"; // args?
     }
- 
+
     return new xmlrpcresp(short_string($synopsis));
 }
 
@@ -795,10 +795,10 @@
     $pagelist = $p->run($dbi, $plugin_args, $request, $basepage);
     $list = array();
     if (is_object($pagelist) and isa($pagelist, 'PageList')) {
-	foreach ($pagelist->_pages as $page) {
-	    $list[] = $page->getName();
-	}
+    foreach ($pagelist->_pages as $page) {
+        $list[] = $page->getName();
     }
+    }
     return new xmlrpcresp(new xmlrpcval($list, "array"));
 }
 
@@ -827,14 +827,14 @@
         $ParamOption = $params->getParam(0);
         $option = (int) $ParamOption->scalarval();
     } else
-	$option = 1;
+    $option = 1;
     $also_attributes = $option & 2;
     $only_attributes = $option & 2 and !($option & 1);
     $sorted = !($option & 4);
     return new xmlrpcresp(new xmlrpcval($dbh->listRelations($also_attributes,
-							    $only_attributes,
-							    $sorted),
-					"array"));
+                                $only_attributes,
+                                $sorted),
+                    "array"));
 }
 
 /**
@@ -859,9 +859,9 @@
     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.
+        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.
     0x0010 (16)
         The source URI does not exist.
     0x0011 (17)
@@ -966,7 +966,7 @@
         xmlrpc_server::service();
         $ErrorManager->popErrorHandler();
     }
-  
+
     function _errorHandler ($e) {
         $msg = htmlspecialchars($e->asString());
         // '--' not allowed within xml comment
@@ -983,5 +983,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/config.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/config.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/config.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: config.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: config.php 7964 2011-03-05 17:05:30Z vargenau $
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
@@ -20,8 +20,8 @@
 define ('_DEBUG_LOGIN',    64); // verbose login debug-msg (settings and reason for failure)
 define ('_DEBUG_SQL',     128); // force check db, force optimize, print some debugging logs
 define ('_DEBUG_REMOTE',  256); // remote debug into subrequests (xmlrpc, ajax, wikiwyg, ...)
-				// or test local SearchHighlight.
-				// internal links have persistent ?start_debug=1
+                // or test local SearchHighlight.
+                // internal links have persistent ?start_debug=1
 
 function isCGI() {
     return (substr(php_sapi_name(),0,3) == 'cgi' and
@@ -98,8 +98,8 @@
  */
 function guessing_lang ($languages=false) {
     if (!$languages) {
-    	// make this faster
-    	$languages = array("en","de","es","fr","it","ja","zh","nl","sv");
+        // make this faster
+        $languages = array("en","de","es","fr","it","ja","zh","nl","sv");
     }
 
     $accept = false;
@@ -184,7 +184,7 @@
             if (strlen($lang) > 2) {
                 foreach ($alt as $try => $locs) {
                     if (in_array($locale, $locs) or in_array($lang, $locs)) {
-                    	//if (empty($GLOBALS['LANG'])) $GLOBALS['LANG'] = $try;
+                        //if (empty($GLOBALS['LANG'])) $GLOBALS['LANG'] = $try;
                         return $try;
                     }
                 }
@@ -335,6 +335,15 @@
   }
 }
 
+// htmlspecialchars_decode exists for PHP >= 5.1
+if (!function_exists('htmlspecialchars_decode')) {
+
+  function htmlspecialchars_decode($text) {
+      return strtr($text, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
+  }
+
+}
+
 /**
  * safe php4 definition for clone.
  * php5 copies objects by reference, but we need to clone "deep copy" in some places.
@@ -370,11 +379,11 @@
 }
 function getUploadDataPath() {
     if (defined('UPLOAD_DATA_PATH')) {
-	return string_ends_with(UPLOAD_DATA_PATH, "/")
-	    ? UPLOAD_DATA_PATH : UPLOAD_DATA_PATH."/";
+    return string_ends_with(UPLOAD_DATA_PATH, "/")
+        ? UPLOAD_DATA_PATH : UPLOAD_DATA_PATH."/";
     }
     return SERVER_URL . (string_ends_with(DATA_PATH, "/") ? '' : "/")
-	 . DATA_PATH . '/uploads/';
+     . DATA_PATH . '/uploads/';
 }
 
 // Local Variables:

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/diff.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/diff.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/diff.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: diff.php 7546 2010-06-17 14:09:32Z vargenau $');
+// $Id: diff.php 7953 2011-03-03 16:21:48Z vargenau $
 // diff.php
 //
 // PhpWiki diff output code.
@@ -44,7 +44,7 @@
 
         foreach ($words as $word) {
             // new-line should only come as first char of word.
-            if ($word === "") 
+            if ($word === "")
                 continue;
             if ($word[0] == "\n") {
                 $this->_group .= " ";
@@ -220,13 +220,13 @@
         $version = $request->getArg('version');
         $previous = $request->getArg('previous');
     }
- 
+
     // abort if page doesn't exist
     $dbi = $request->getDbh();
     $page = $request->getPage();
     $current = $page->getCurrentRevision(false);
     if ($current->getVersion() < 1) {
-	$html = HTML::div(array('class'=>'wikitext','id'=>'difftext'),
+        $html = HTML::div(array('class'=>'wikitext','id'=>'difftext'),
                           HTML::p(fmt("I'm sorry, there is no such page as %s.",
                                       WikiLink($pagename, 'unknown'))));
         require_once('lib/Template.php');
@@ -317,14 +317,16 @@
 
         if ($diff->isEmpty()) {
             $html->pushContent(HTML::hr(),
-                               HTML::p(_("Content of versions "), $old->getVersion(),
-                                       _(" and "), $new->getVersion(), _(" is identical.")));
+                               HTML::p(sprintf(_("Content of versions %1$s and %2$s is identical."),
+                                               $old->getVersion(),
+                                               $new->getVersion())));
             // If two consecutive versions have the same content, it is because the page was
             // renamed, or metadata changed: ACL, owner, markup.
             // We give the reason by printing the summary.
             if (($new->getVersion() - $old->getVersion()) == 1) {
-                $html->pushContent(HTML::p(_("Version "), $new->getVersion(), 
-                                           _(" was created because: "), $new->get('summary')));
+                $html->pushContent(HTML::p(sprintf(_("Version %1$s was created because: %2$s"),
+                                                   $new->getVersion(),
+                                                   $new->get('summary'))));
             }
         } else {
             $fmt = new HtmlUnifiedDiffFormatter;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/diff3.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/diff3.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/diff3.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: diff3.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: diff3.php 7964 2011-03-05 17:05:30Z vargenau $
 // diff3.php
 //
 // A class for computing three way diffs
@@ -12,7 +12,7 @@
 
 class _Diff3_Block {
     var $type = 'diff3';
-    
+
     function _Diff3_Block ($orig = false, $final1 = false, $final2 = false) {
         $this->orig = $orig ? $orig : array();
         $this->final1 = $final1 ? $final1 : array();
@@ -38,10 +38,10 @@
     }
 }
 
-    
+
 class _Diff3_CopyBlock extends _Diff3_Block {
     var $type = 'copy';
-    
+
     function _Diff3_CopyBlock ($lines = false) {
         $this->orig = $lines ? $lines : array();
         $this->final1 = &$this->orig;
@@ -51,7 +51,7 @@
     function merged() {
         return $this->orig;
     }
-    
+
     function is_conflict () {
         return false;
     }
@@ -65,12 +65,12 @@
     function _init() {
         $this->orig = $this->final1 = $this->final2 = array();
     }
-    
-        
+
+
     function _append (&$array, $lines) {
         array_splice($array, sizeof($array), 0, $lines);
     }
-    
+
     function input($lines) {
         if ($lines)
             $this->_append($this->orig, $lines);
@@ -89,7 +89,7 @@
     function is_empty() {
         return !$this->orig && !$this->final1 && !$this->final2;
     }
-    
+
     function finish() {
         if ($this->is_empty())
             return false;
@@ -121,7 +121,7 @@
 //          print_r($e1);
 //          print_r($e2);
 //          echo "====\n";
-           
+
             if ($e1 && $e2 && $e1->type == 'copy' && $e2->type == 'copy') {
                 // We have copy blocks from both diffs.  This is the (only)
                 // time we want to emit a diff3 copy block.
@@ -155,10 +155,10 @@
                         array_splice($e2->orig, 0, $norig);
                         $bb->input($orig);
                     }
-                    
+
                     if ($e1->type == 'copy')
                         $bb->out1(array_splice($e1->final, 0, $norig));
-                                                     
+
                     if ($e2->type == 'copy')
                         $bb->out2(array_splice($e2->final, 0, $norig));
                 }
@@ -191,7 +191,7 @@
                                      array("======="),
                                      $block->final2,
                                      array(">>>>>>>" . ($label2 ? " $label2" : '')));
-				$this->ConflictingBlocks++;
+                $this->ConflictingBlocks++;
             }
             else {
                 $lines = array_merge($lines, $block->merged());
@@ -207,5 +207,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
-?>
\ No newline at end of file
+// End:
+?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/difflib.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/difflib.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/difflib.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: difflib.php 7502 2010-06-09 06:23:12Z rurban $');
+// $Id: difflib.php 7964 2011-03-05 17:05:30Z vargenau $
 
 // difflib.php
 //
@@ -209,102 +209,102 @@
      * of the portions it is going to specify.
      */
     function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
-	$flip = false;
-	
-	if ($xlim - $xoff > $ylim - $yoff) {
-	    // Things seems faster (I'm not sure I understand why)
+    $flip = false;
+
+    if ($xlim - $xoff > $ylim - $yoff) {
+        // Things seems faster (I'm not sure I understand why)
             // when the shortest sequence in X.
             $flip = true;
-	    list ($xoff, $xlim, $yoff, $ylim)
-		= array( $yoff, $ylim, $xoff, $xlim);
+        list ($xoff, $xlim, $yoff, $ylim)
+        = array( $yoff, $ylim, $xoff, $xlim);
         }
 
-	if ($flip)
-	    for ($i = $ylim - 1; $i >= $yoff; $i--)
-		$ymatches[$this->xv[$i]][] = $i;
-	else
-	    for ($i = $ylim - 1; $i >= $yoff; $i--)
-		$ymatches[$this->yv[$i]][] = $i;
+    if ($flip)
+        for ($i = $ylim - 1; $i >= $yoff; $i--)
+        $ymatches[$this->xv[$i]][] = $i;
+    else
+        for ($i = $ylim - 1; $i >= $yoff; $i--)
+        $ymatches[$this->yv[$i]][] = $i;
 
-	$this->lcs = 0;
-	$this->seq[0]= $yoff - 1;
-	$this->in_seq = array();
-	$ymids[0] = array();
+    $this->lcs = 0;
+    $this->seq[0]= $yoff - 1;
+    $this->in_seq = array();
+    $ymids[0] = array();
 
-	$numer = $xlim - $xoff + $nchunks - 1;
-	$x = $xoff;
-	for ($chunk = 0; $chunk < $nchunks; $chunk++) {
-	    if ($chunk > 0)
-		for ($i = 0; $i <= $this->lcs; $i++)
-		    $ymids[$i][$chunk-1] = $this->seq[$i];
+    $numer = $xlim - $xoff + $nchunks - 1;
+    $x = $xoff;
+    for ($chunk = 0; $chunk < $nchunks; $chunk++) {
+        if ($chunk > 0)
+        for ($i = 0; $i <= $this->lcs; $i++)
+            $ymids[$i][$chunk-1] = $this->seq[$i];
 
-	    $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
-	    for ( ; $x < $x1; $x++) {
+        $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
+        for ( ; $x < $x1; $x++) {
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
                 if (empty($ymatches[$line]))
-		    continue;
-		$matches = $ymatches[$line];
+            continue;
+        $matches = $ymatches[$line];
                 reset($matches);
-		while (list ($junk, $y) = each($matches))
-		    if (empty($this->in_seq[$y])) {
-			$k = $this->_lcs_pos($y);
-			assert($k > 0);
-			$ymids[$k] = $ymids[$k-1];
-			break;
+        while (list ($junk, $y) = each($matches))
+            if (empty($this->in_seq[$y])) {
+            $k = $this->_lcs_pos($y);
+            assert($k > 0);
+            $ymids[$k] = $ymids[$k-1];
+            break;
                     }
-		while (list ($junk, $y) = each($matches)) {
-		    if ($y > $this->seq[$k-1]) {
-			assert($y < $this->seq[$k]);
-			// Optimization: this is a common case:
-			//  next match is just replacing previous match.
-			$this->in_seq[$this->seq[$k]] = false;
-			$this->seq[$k] = $y;
-			$this->in_seq[$y] = 1;
+        while (list ($junk, $y) = each($matches)) {
+            if ($y > $this->seq[$k-1]) {
+            assert($y < $this->seq[$k]);
+            // Optimization: this is a common case:
+            //  next match is just replacing previous match.
+            $this->in_seq[$this->seq[$k]] = false;
+            $this->seq[$k] = $y;
+            $this->in_seq[$y] = 1;
                     }
-		    else if (empty($this->in_seq[$y])) {
-			$k = $this->_lcs_pos($y);
-			assert($k > 0);
-			$ymids[$k] = $ymids[$k-1];
+            else if (empty($this->in_seq[$y])) {
+            $k = $this->_lcs_pos($y);
+            assert($k > 0);
+            $ymids[$k] = $ymids[$k-1];
                     }
                 }
             }
         }
 
-	$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
-	$ymid = $ymids[$this->lcs];
-	for ($n = 0; $n < $nchunks - 1; $n++) {
-	    $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
-	    $y1 = $ymid[$n] + 1;
-	    $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+    $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+    $ymid = $ymids[$this->lcs];
+    for ($n = 0; $n < $nchunks - 1; $n++) {
+        $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+        $y1 = $ymid[$n] + 1;
+        $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
         }
-	$seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+    $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
 
-	return array($this->lcs, $seps);
+    return array($this->lcs, $seps);
     }
 
     function _lcs_pos ($ypos) {
-	$end = $this->lcs;
-	if ($end == 0 || $ypos > $this->seq[$end]) {
-	    $this->seq[++$this->lcs] = $ypos;
-	    $this->in_seq[$ypos] = 1;
-	    return $this->lcs;
+    $end = $this->lcs;
+    if ($end == 0 || $ypos > $this->seq[$end]) {
+        $this->seq[++$this->lcs] = $ypos;
+        $this->in_seq[$ypos] = 1;
+        return $this->lcs;
         }
 
-	$beg = 1;
-	while ($beg < $end) {
-	    $mid = (int)(($beg + $end) / 2);
-	    if ( $ypos > $this->seq[$mid] )
-		$beg = $mid + 1;
-	    else
-		$end = $mid;
+    $beg = 1;
+    while ($beg < $end) {
+        $mid = (int)(($beg + $end) / 2);
+        if ( $ypos > $this->seq[$mid] )
+        $beg = $mid + 1;
+        else
+        $end = $mid;
         }
 
-	assert($ypos != $this->seq[$end]);
+    assert($ypos != $this->seq[$end]);
 
-	$this->in_seq[$this->seq[$end]] = false;
-	$this->seq[$end] = $ypos;
-	$this->in_seq[$ypos] = 1;
-	return $end;
+    $this->in_seq[$this->seq[$end]] = false;
+    $this->seq[$end] = $ypos;
+    $this->in_seq[$ypos] = 1;
+    return $end;
     }
 
     /* Find LCS of two sequences.
@@ -319,46 +319,46 @@
      * All line numbers are origin-0 and discarded lines are not counted.
      */
     function _compareseq ($xoff, $xlim, $yoff, $ylim) {
-	// Slide down the bottom initial diagonal.
-	while ($xoff < $xlim && $yoff < $ylim
+    // Slide down the bottom initial diagonal.
+    while ($xoff < $xlim && $yoff < $ylim
                && $this->xv[$xoff] == $this->yv[$yoff]) {
-	    ++$xoff;
-	    ++$yoff;
+        ++$xoff;
+        ++$yoff;
         }
 
-	// Slide up the top initial diagonal.
-	while ($xlim > $xoff && $ylim > $yoff
+    // Slide up the top initial diagonal.
+    while ($xlim > $xoff && $ylim > $yoff
                && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
-	    --$xlim;
-	    --$ylim;
+        --$xlim;
+        --$ylim;
         }
 
-	if ($xoff == $xlim || $yoff == $ylim)
-	    $lcs = 0;
-	else {
-	    // This is ad hoc but seems to work well.
-	    //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
-	    //$nchunks = max(2,min(8,(int)$nchunks));
-	    $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
-	    list ($lcs, $seps)
-		= $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
+    if ($xoff == $xlim || $yoff == $ylim)
+        $lcs = 0;
+    else {
+        // This is ad hoc but seems to work well.
+        //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
+        //$nchunks = max(2,min(8,(int)$nchunks));
+        $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+        list ($lcs, $seps)
+        = $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
         }
 
-	if ($lcs == 0) {
-	    // X and Y sequences have no common subsequence:
-	    // mark all changed.
-	    while ($yoff < $ylim)
-		$this->ychanged[$this->yind[$yoff++]] = 1;
-	    while ($xoff < $xlim)
-		$this->xchanged[$this->xind[$xoff++]] = 1;
+    if ($lcs == 0) {
+        // X and Y sequences have no common subsequence:
+        // mark all changed.
+        while ($yoff < $ylim)
+        $this->ychanged[$this->yind[$yoff++]] = 1;
+        while ($xoff < $xlim)
+        $this->xchanged[$this->xind[$xoff++]] = 1;
         }
-	else {
-	    // Use the partitions to split this problem into subproblems.
-	    reset($seps);
-	    $pt1 = $seps[0];
-	    while ($pt2 = next($seps)) {
-		$this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
-		$pt1 = $pt2;
+    else {
+        // Use the partitions to split this problem into subproblems.
+        reset($seps);
+        $pt1 = $seps[0];
+        while ($pt2 = next($seps)) {
+        $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+        $pt1 = $pt2;
             }
         }
     }
@@ -376,108 +376,108 @@
      * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
      */
     function _shift_boundaries ($lines, &$changed, $other_changed) {
-	$i = 0;
-	$j = 0;
+    $i = 0;
+    $j = 0;
 
-	assert('sizeof($lines) == sizeof($changed)');
-	$len = sizeof($lines);
-	$other_len = sizeof($other_changed);
+    assert('sizeof($lines) == sizeof($changed)');
+    $len = sizeof($lines);
+    $other_len = sizeof($other_changed);
 
-	while (1) {
-	    /*
-	     * Scan forwards to find beginning of another run of changes.
-	     * Also keep track of the corresponding point in the other file.
-	     *
-	     * Throughout this code, $i and $j are adjusted together so that
-	     * the first $i elements of $changed and the first $j elements
-	     * of $other_changed both contain the same number of zeros
-	     * (unchanged lines).
-	     * Furthermore, $j is always kept so that $j == $other_len or
-	     * $other_changed[$j] == false.
-	     */
-	    while ($j < $other_len && $other_changed[$j])
-		$j++;
-	
-	    while ($i < $len && ! $changed[$i]) {
-		assert('$j < $other_len && ! $other_changed[$j]');
-		$i++; $j++;
-		while ($j < $other_len && $other_changed[$j])
-		    $j++;
+    while (1) {
+        /*
+         * Scan forwards to find beginning of another run of changes.
+         * Also keep track of the corresponding point in the other file.
+         *
+         * Throughout this code, $i and $j are adjusted together so that
+         * the first $i elements of $changed and the first $j elements
+         * of $other_changed both contain the same number of zeros
+         * (unchanged lines).
+         * Furthermore, $j is always kept so that $j == $other_len or
+         * $other_changed[$j] == false.
+         */
+        while ($j < $other_len && $other_changed[$j])
+        $j++;
+
+        while ($i < $len && ! $changed[$i]) {
+        assert('$j < $other_len && ! $other_changed[$j]');
+        $i++; $j++;
+        while ($j < $other_len && $other_changed[$j])
+            $j++;
             }
 
-	    if ($i == $len)
-		break;
+        if ($i == $len)
+        break;
 
-	    $start = $i;
+        $start = $i;
 
-	    // Find the end of this run of changes.
-	    while (++$i < $len && $changed[$i])
-		continue;
+        // Find the end of this run of changes.
+        while (++$i < $len && $changed[$i])
+        continue;
 
-	    do {
-		/*
-		 * Record the length of this run of changes, so that
-		 * we can later determine whether the run has grown.
-		 */
-		$runlength = $i - $start;
+        do {
+        /*
+         * Record the length of this run of changes, so that
+         * we can later determine whether the run has grown.
+         */
+        $runlength = $i - $start;
 
-		/*
-		 * Move the changed region back, so long as the
-		 * previous unchanged line matches the last changed one.
-		 * This merges with previous changed regions.
-		 */
-		while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
-		    $changed[--$start] = 1;
-		    $changed[--$i] = false;
-		    while ($start > 0 && $changed[$start - 1])
-			$start--;
-		    assert('$j > 0');
-		    while ($other_changed[--$j])
-			continue;
-		    assert('$j >= 0 && !$other_changed[$j]');
+        /*
+         * Move the changed region back, so long as the
+         * previous unchanged line matches the last changed one.
+         * This merges with previous changed regions.
+         */
+        while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
+            $changed[--$start] = 1;
+            $changed[--$i] = false;
+            while ($start > 0 && $changed[$start - 1])
+            $start--;
+            assert('$j > 0');
+            while ($other_changed[--$j])
+            continue;
+            assert('$j >= 0 && !$other_changed[$j]');
                 }
 
-		/*
-		 * Set CORRESPONDING to the end of the changed run, at the last
-		 * point where it corresponds to a changed run in the other file.
-		 * CORRESPONDING == LEN means no such point has been found.
-		 */
-		$corresponding = $j < $other_len ? $i : $len;
+        /*
+         * Set CORRESPONDING to the end of the changed run, at the last
+         * point where it corresponds to a changed run in the other file.
+         * CORRESPONDING == LEN means no such point has been found.
+         */
+        $corresponding = $j < $other_len ? $i : $len;
 
-		/*
-		 * Move the changed region forward, so long as the
-		 * first changed line matches the following unchanged one.
-		 * This merges with following changed regions.
-		 * Do this second, so that if there are no merges,
-		 * the changed region is moved forward as far as possible.
-		 */
-		while ($i < $len && $lines[$start] == $lines[$i]) {
-		    $changed[$start++] = false;
-		    $changed[$i++] = 1;
-		    while ($i < $len && $changed[$i])
-			$i++;
+        /*
+         * Move the changed region forward, so long as the
+         * first changed line matches the following unchanged one.
+         * This merges with following changed regions.
+         * Do this second, so that if there are no merges,
+         * the changed region is moved forward as far as possible.
+         */
+        while ($i < $len && $lines[$start] == $lines[$i]) {
+            $changed[$start++] = false;
+            $changed[$i++] = 1;
+            while ($i < $len && $changed[$i])
+            $i++;
 
-		    assert('$j < $other_len && ! $other_changed[$j]');
-		    $j++;
-		    if ($j < $other_len && $other_changed[$j]) {
-			$corresponding = $i;
-			while ($j < $other_len && $other_changed[$j])
-			    $j++;
+            assert('$j < $other_len && ! $other_changed[$j]');
+            $j++;
+            if ($j < $other_len && $other_changed[$j]) {
+            $corresponding = $i;
+            while ($j < $other_len && $other_changed[$j])
+                $j++;
                     }
                 }
             } while ($runlength != $i - $start);
 
-	    /*
-	     * If possible, move the fully-merged run of changes
-	     * back to a corresponding run in the other file.
-	     */
-	    while ($corresponding < $i) {
-		$changed[--$start] = 1;
-		$changed[--$i] = 0;
-		assert('$j > 0');
-		while ($other_changed[--$j])
-		    continue;
-		assert('$j >= 0 && !$other_changed[$j]');
+        /*
+         * If possible, move the fully-merged run of changes
+         * back to a corresponding run in the other file.
+         */
+        while ($corresponding < $i) {
+        $changed[--$start] = 1;
+        $changed[--$i] = 0;
+        assert('$j > 0');
+        while ($other_changed[--$j])
+            continue;
+        assert('$j >= 0 && !$other_changed[$j]');
             }
         }
     }
@@ -515,12 +515,12 @@
      *                original diff.
      */
     function reverse () {
-	$rev = $this;
+    $rev = $this;
         $rev->edits = array();
         foreach ($this->edits as $edit) {
             $rev->edits[] = $edit->reverse();
         }
-	return $rev;
+    return $rev;
     }
 
     /**
@@ -544,12 +544,12 @@
      * @return int The length of the LCS.
      */
     function lcs () {
-	$lcs = 0;
+    $lcs = 0;
         foreach ($this->edits as $edit) {
             if ($edit->type == 'copy')
                 $lcs += sizeof($edit->orig);
         }
-	return $lcs;
+    return $lcs;
     }
 
     /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/display.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/display.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/display.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
 <?php
 // display.php: fetch page or get default content
-// rcs_id('$Id: display.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: display.php 8002 2011-03-17 09:10:25Z vargenau $
 
 require_once('lib/Template.php');
 
@@ -17,7 +17,7 @@
     $links = $page->getPageLinks();
     $keywords[] = SplitPagename($page->getName());
     while ($link = $links->next()) {
-    	$m = array();
+        $m = array();
         if (preg_match($KeywordLinkRegexp, $link->getName(), $m))
             $keywords[] = SplitPagename($m[0]);
     }
@@ -37,7 +37,7 @@
                    $pagename);
 }
 
-/* only on ?action= */  
+/* only on ?action= */
 function actionPage(&$request, $action) {
     global $WikiTheme;
     global $robots;
@@ -71,7 +71,7 @@
     $args = array();
     if (GOOGLE_LINKS_NOFOLLOW) {
         $robots = "noindex,nofollow";
-	$args = array('ROBOTS_META' => $robots);
+    $args = array('ROBOTS_META' => $robots);
     }
 
     /* Handle other formats: So far we had html only.
@@ -81,83 +81,83 @@
        rdf and owl are handled by SemanticWeb.
     */
     $format = $request->getArg('format');
-  
+
     /* At first the single page formats: html, xml */
     if ($pagename == _("LinkDatabase")) {
         $template = Template('browse', array('CONTENT' => $transformedContent));
-	GeneratePage($template, $pagetitle, $revision, $args);
+    GeneratePage($template, $pagetitle, $revision, $args);
     } elseif (!$format or $format == 'html' or $format == 'sidebar' or $format == 'contribs') {
-	$template = Template('browse', array('CONTENT' => $transformedContent));
-	GeneratePage($template, $pagetitle, $revision, $args);
+    $template = Template('browse', array('CONTENT' => $transformedContent));
+    GeneratePage($template, $pagetitle, $revision, $args);
     } elseif ($format == 'xml') {
-    	$request->setArg('format','');
-	$template = new Template('browse', $request,
+        $request->setArg('format','');
+    $template = new Template('browse', $request,
                                  array('revision' => $revision,
                                        'CONTENT'  => $transformedContent,
-				       ));
-	$html = GeneratePageAsXML($template, $pagename, $revision /*,
-				  array('VALID_LINKS' => $args['VALID_LINKS'])*/);
-	header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']);
-	echo $html;
+                       ));
+    $html = GeneratePageAsXML($template, $pagename, $revision /*,
+                  array('VALID_LINKS' => $args['VALID_LINKS'])*/);
+    header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']);
+    echo $html;
     } else {
-    	$pagelist = null;
-    	require_once('lib/WikiPlugin.php');
-	// Then the multi-page formats
-	// rss (if not already handled by RecentChanges)
-	// Need the pagelist from the first plugin
-	foreach($transformedContent->_content as $cached_element) {
-	    if (is_a($cached_element, "Cached_PluginInvocation")) {
-	        $loader = new WikiPluginLoader;
-	        $markup = null;
-	        // return the first found pagelist
-	        $pagelist = $loader->expandPI($cached_element->_pi, $request,
-	                                      $markup, $pagename);
-	        if (is_a($pagelist, 'PageList'))
-	            break;
-	    }
-	}
+        $pagelist = null;
+        require_once('lib/WikiPlugin.php');
+    // Then the multi-page formats
+    // rss (if not already handled by RecentChanges)
+    // Need the pagelist from the first plugin
+    foreach($transformedContent->_content as $cached_element) {
+        if (is_a($cached_element, "Cached_PluginInvocation")) {
+            $loader = new WikiPluginLoader;
+            $markup = null;
+            // return the first found pagelist
+            $pagelist = $loader->expandPI($cached_element->_pi, $request,
+                                          $markup, $pagename);
+            if (is_a($pagelist, 'PageList'))
+                break;
+        }
+    }
         if (!$pagelist or !is_a($pagelist, 'PageList')) {
-	    if (!in_array($format, array("rss91","rss2","rss","atom","rdf")))
-		trigger_error(sprintf("Format %s requires an actionpage returning a pagelist.",
-				      $format)
-			      ."\n".("Fall back to single page mode"), E_USER_WARNING);
-	    require_once('lib/PageList.php');
-	    $pagelist = new PageList();
-	    if ($format == 'pdf')
-	        $pagelist->addPage($page);
-	} else {
+        if (!in_array($format, array("rss91","rss2","rss","atom","rdf")))
+        trigger_error(sprintf("Format %s requires an actionpage returning a pagelist.",
+                      $format)
+                  ."\n".("Fall back to single page mode"), E_USER_WARNING);
+        require_once('lib/PageList.php');
+        $pagelist = new PageList();
+        if ($format == 'pdf')
+            $pagelist->addPage($page);
+    } else {
             foreach ($pagelist->_pages as $page) {
-            	$name = $page->getName();
-            	if ($name != $pagename and $page->exists())
+                $name = $page->getName();
+                if ($name != $pagename and $page->exists())
                     $args['VALID_LINKS'][] = $name;
             }
-	}
-	if ($format == 'pdf') {
-	    require_once("lib/pdf.php");
-	    array_unshift($args['VALID_LINKS'], $pagename);
-	    ConvertAndDisplayPdfPageList($request, $pagelist, $args);
-	}
-	elseif ($format == 'ziphtml') { // need to fix links
-	    require_once('lib/loadsave.php');
-	    array_unshift($args['VALID_LINKS'], $pagename);
-	    $request->setArg('zipname', FilenameForPage($pagename).".zip");
-	    $request->setArg('pages', $args['VALID_LINKS']);
-	    $request->setArg('format','');
-	    MakeWikiZipHtml($request);
-	} // time-sorted RDF á la RecentChanges
-	elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
+    }
+    if ($format == 'pdf') {
+        require_once("lib/pdf.php");
+        array_unshift($args['VALID_LINKS'], $pagename);
+        ConvertAndDisplayPdfPageList($request, $pagelist, $args);
+    }
+    elseif ($format == 'ziphtml') { // need to fix links
+        require_once('lib/loadsave.php');
+        array_unshift($args['VALID_LINKS'], $pagename);
+        $request->setArg('zipname', FilenameForPage($pagename).".zip");
+        $request->setArg('pages', $args['VALID_LINKS']);
+        $request->setArg('format','');
+        MakeWikiZipHtml($request);
+    } // time-sorted RDF á la RecentChanges
+    elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
             $args = $request->getArgs();
             //$request->setArg('format','');
             if ($pagename == _("RecentChanges")) {
                 $template->printExpansion($args);
-	    } else {
-	        require_once("lib/plugin/RecentChanges.php");
-	        $plugin = new WikiPlugin_RecentChanges();
+        } else {
+            require_once("lib/plugin/RecentChanges.php");
+            $plugin = new WikiPlugin_RecentChanges();
                 return $plugin->format($plugin->getChanges($request->_dbi, $args), $args);
-	    }
-	} elseif ($format == 'json') { // for faster autocompletion on searches
-	    $req_args =& $request->args;
-	    unset($req_args['format']);
+        }
+    } elseif ($format == 'json') { // for faster autocompletion on searches
+        $req_args =& $request->args;
+        unset($req_args['format']);
             $json = array('count' => count($pagelist->_pages),
                           'list'  => $args['VALID_LINKS'],
                           'args'  => $req_args,
@@ -171,26 +171,26 @@
             }
             header("Content-Type: application/json");
             die($json_enc);
-	} elseif ($format == 'rdf') { // all semantic relations and attributes
-	    require_once("lib/SemanticWeb.php");
-	    $rdf = new RdfWriter($request, $pagelist);
-	    $rdf->format();
-	} elseif ($format == 'rdfs') {
-	    require_once("lib/SemanticWeb.php");
-	    $rdf = new RdfsWriter($request, $pagelist);
-	    $rdf->format();
-	} elseif ($format == 'owl') { // or daml?
-	    require_once("lib/SemanticWeb.php");
-	    $rdf = new OwlWriter($request, $pagelist);
-	    $rdf->format();
-	} else {
-	    if (!in_array($pagename, array(_("LinkDatabase"))))
-		trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
-	    	              E_USER_WARNING);
-	    $template = Template('browse', array('CONTENT' => $transformedContent));
-	    GeneratePage($template, $pagetitle, $revision, $args);
-	}
+    } elseif ($format == 'rdf') { // all semantic relations and attributes
+        require_once("lib/SemanticWeb.php");
+        $rdf = new RdfWriter($request, $pagelist);
+        $rdf->format();
+    } elseif ($format == 'rdfs') {
+        require_once("lib/SemanticWeb.php");
+        $rdf = new RdfsWriter($request, $pagelist);
+        $rdf->format();
+    } elseif ($format == 'owl') { // or daml?
+        require_once("lib/SemanticWeb.php");
+        $rdf = new OwlWriter($request, $pagelist);
+        $rdf->format();
+    } else {
+        if (!in_array($pagename, array(_("LinkDatabase"))))
+        trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
+                          E_USER_WARNING);
+        $template = Template('browse', array('CONTENT' => $transformedContent));
+        GeneratePage($template, $pagetitle, $revision, $args);
     }
+    }
     $request->checkValidators();
     flush();
     return '';
@@ -208,7 +208,7 @@
             NoSuchRevision($request, $page, $version);
         /* Tell Google (and others) to ignore old versions of pages */
         $robots = "noindex,nofollow";
-	$toks['ROBOTS_META'] = $robots;
+    $toks['ROBOTS_META'] = $robots;
     }
     else {
         $revision = $page->getCurrentRevision();
@@ -221,17 +221,17 @@
         // DOCTYPE html needed to allow unencoded entities like   without !CDATA[]
         echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',"\n";
-	if ($page->exists()) {
-	    header("Last-Modified: " . Rfc1123DateTime($revision->get('mtime')));
-	    $request->cacheControl();
-	    $request->setArg('format','');
+    if ($page->exists()) {
+        header("Last-Modified: " . Rfc1123DateTime($revision->get('mtime')));
+        $request->cacheControl();
+        $request->setArg('format','');
             $page_content = $revision->getTransformedContent();
             $page_content->printXML();
             $request->_is_buffering_output = false; // avoid wrong Content-Length with errors
             $request->finish();
         }
         else {
-	    $request->cacheControl();
+        $request->cacheControl();
             echo('<div style="display:none;" />');
             $request->_is_buffering_output = false; // avoid wrong Content-Length with errors
             $request->finish();
@@ -275,7 +275,7 @@
         $redirect_message = HTML::span(array('class' => 'redirectfrom'),
                                        fmt("(Redirected from %s)",
                                            RedirectorLink($redirect_from)));
-    // abuse the $redirected template var for some status update notice                                     
+    // abuse the $redirected template var for some status update notice
     } elseif ($request->getArg('errormsg')) {
         $redirect_message = $request->getArg('errormsg');
         $request->setArg('errormsg', false);
@@ -303,8 +303,8 @@
     // On external searchengine (google) referrer, highlight the searchterm and
     // pass through the Searchhighlight actionpage.
     if ($result = isExternalReferrer($request)) {
-    	if (!empty($result['query'])) {
-    	    if (ENABLE_SEARCHHIGHLIGHT) {
+        if (!empty($result['query'])) {
+            if (ENABLE_SEARCHHIGHLIGHT) {
                 $request->_searchhighlight = $result;
                 $request->appendValidators(array('%mtime' => time())); // force no cache(?)
                 // Should be changed to check the engine and search term only
@@ -312,9 +312,9 @@
                 $page_content = new TransformedText($revision->getPage(),
                                                     $revision->getPackedContent(),
                                                     $revision->getMetaData());
-		/* Now add the SearchHighlight plugin to the top of the page, in memory only.
-		   You can parametrize this by changing the SearchHighlight action page.
-		*/
+        /* Now add the SearchHighlight plugin to the top of the page, in memory only.
+           You can parametrize this by changing the SearchHighlight action page.
+        */
                 if ($actionpage = $request->findActionPage('SearchHighlight')) {
                     $actionpage = $request->getPage($actionpage);
                     $actionrev = $actionpage->getCurrentRevision();
@@ -326,34 +326,26 @@
                     $toks['SEARCH_ENGINE'] = $result['engine'];
                     $toks['SEARCH_ENGINE_URL'] = $result['engine_url'];
                     $toks['SEARCH_TERM'] = $result['query'];
-		    //$toks['HEADER'] = HTML($actionpage->getName(),": ",$pageheader); // h1 with backlink
+            //$toks['HEADER'] = HTML($actionpage->getName(),": ",$pageheader); // h1 with backlink
                     $actioncontent = new TransformedText($actionrev->getPage(),
                                                          $actionrev->getPackedContent(),
                                                          $actionrev->getMetaData());
-		    // prepend the actionpage in front of the hightlighted content
-	            $toks['CONTENT'] = HTML($actioncontent, $page_content);
+            // prepend the actionpage in front of the hightlighted content
+                $toks['CONTENT'] = HTML($actioncontent, $page_content);
                 }
-	    }
-	} else {
+        }
+    } else {
             $page_content = $revision->getTransformedContent();
-	}
+    }
     } else {
         $page_content = $revision->getTransformedContent();
     }
- 
-    /* Check for special pagenames, which are no actionpages. */
-    /*
-    if ( $pagename == _("RecentVisitors")) {
-        $robots = "noindex,follow";
-        $toks['ROBOTS_META'] = $robots;
-    } else
-    */
+
     if ($pagename == _("SandBox")) {
         $robots = "noindex,nofollow";
         $toks['ROBOTS_META'] = $robots;
     } else if (isActionPage($pagename)) {
-        // AllPages must not be indexed, but must be followed to get all pages
-        $robots = "noindex,follow";
+        $robots = "noindex,nofollow";
         $toks['ROBOTS_META'] = $robots;
     } else if (!isset($toks['ROBOTS_META'])) {
         $robots = "index,follow";
@@ -379,44 +371,44 @@
     /* Only single page versions. rss only if not already handled by RecentChanges.
      */
     if (!$format or $format == 'html' or $format == 'sidebar' or $format == 'contribs') {
-	$template->printExpansion($toks);
+    $template->printExpansion($toks);
     } else {
-	// No pagelist here. Single page version only
-	require_once("lib/PageList.php");
-	$pagelist = new PageList();
-	$pagelist->addPage($page);
-	if ($format == 'pdf') {
-	    require_once("lib/pdf.php");
-	    $request->setArg('format','');
-	    ConvertAndDisplayPdfPageList($request, $pagelist);
-	// time-sorted rdf a la RecentChanges
-	} elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
-	    //$request->setArg('format','');
+    // No pagelist here. Single page version only
+    require_once("lib/PageList.php");
+    $pagelist = new PageList();
+    $pagelist->addPage($page);
+    if ($format == 'pdf') {
+        require_once("lib/pdf.php");
+        $request->setArg('format','');
+        ConvertAndDisplayPdfPageList($request, $pagelist);
+    // time-sorted rdf a la RecentChanges
+    } elseif (in_array($format, array("rss91","rss2","rss","atom"))) {
+        //$request->setArg('format','');
             if ($pagename == _("RecentChanges"))
                 $template->printExpansion($toks);
-            else {  
-	        require_once("lib/plugin/RecentChanges.php");
-	        $plugin = new WikiPlugin_RecentChanges();
+            else {
+            require_once("lib/plugin/RecentChanges.php");
+            $plugin = new WikiPlugin_RecentChanges();
                 $args = $request->getArgs();
                 return $plugin->format($plugin->getChanges($request->_dbi, $args), $args);
             }
-	} elseif ($format == 'rdf') { // all semantic relations and attributes
-	    require_once("lib/SemanticWeb.php");
-	    $rdf = new RdfWriter($request, $pagelist);
-	    $rdf->format();
-	} elseif ($format == 'owl') { // or daml?
-	    require_once("lib/SemanticWeb.php");
-	    $rdf = new OwlWriter($request, $pagelist);
-	    $rdf->format();
-	} elseif ($format == 'json') { // include page content asynchronously
-	    $request->setArg('format','');
-	    if ($page->exists())
-            	$content = $page_content->asXML();
+    } elseif ($format == 'rdf') { // all semantic relations and attributes
+        require_once("lib/SemanticWeb.php");
+        $rdf = new RdfWriter($request, $pagelist);
+        $rdf->format();
+    } elseif ($format == 'owl') { // or daml?
+        require_once("lib/SemanticWeb.php");
+        $rdf = new OwlWriter($request, $pagelist);
+        $rdf->format();
+    } elseif ($format == 'json') { // include page content asynchronously
+        $request->setArg('format','');
+        if ($page->exists())
+                $content = $page_content->asXML();
             else
                 $content = '';
-	    $req_args = $request->args;
-	    unset($req_args['format']);
-	    // no meta-data so far, just the content
+        $req_args = $request->args;
+        unset($req_args['format']);
+        // no meta-data so far, just the content
             $json = array('content' => $content,
                           'args'    => $req_args,
                           'phpwiki-version' => PHPWIKI_VERSION);
@@ -429,19 +421,19 @@
             }
             header("Content-Type: application/json");
             die($json_enc);
-	} else {
-	    if (!in_array($pagename, array(_("LinkDatabase"))))
-		trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
-	    	              E_USER_WARNING);
-	    $template->printExpansion($toks);
-	}
+    } else {
+        if (!in_array($pagename, array(_("LinkDatabase"))))
+        trigger_error(sprintf(_("Unsupported argument: %s=%s"),"format",$format),
+                          E_USER_WARNING);
+        $template->printExpansion($toks);
     }
-  
+    }
+
     $page->increaseHitCount();
 
     if ($request->getArg('action') != 'pdf') {
         $request->checkValidators();
-    	flush();
+        flush();
     }
     return '';
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/editpage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/editpage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/editpage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: editpage.php 7546 2010-06-17 14:09:32Z vargenau $');
+// $Id: editpage.php 7964 2011-03-05 17:05:30Z vargenau $
 
 require_once('lib/Template.php');
 
@@ -15,14 +15,14 @@
 
         // HACKish short circuit to browse on action=create
         if ($request->getArg('action') == 'create') {
-            if (! $this->current->hasDefaultContents()) 
+            if (! $this->current->hasDefaultContents())
                 $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_WYSIWYG) {
@@ -54,9 +54,9 @@
             $this->_initializeState();
             $this->_initialEdit = true;
 
-            // The edit request has specified some initial content from a template 
+            // 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();
@@ -87,7 +87,7 @@
             and ($r->getPref('editHeight') != $r->args['pref']['editHeight'])) {
             $r->_prefs->set('editHeight', $r->args['pref']['editHeight']);
         }
-        
+
         if ($this->isModerated())
             $tokens['PAGE_LOCKED_MESSAGE'] = $this->getModeratedMessage();
 
@@ -98,9 +98,9 @@
         }
         elseif ($r->getArg('save_and_redirect_to') != "") {
             if (ENABLE_CAPTCHA && $this->Captcha->Failed()) {
-		$this->tokens['PAGE_LOCKED_MESSAGE'] = 
+        $this->tokens['PAGE_LOCKED_MESSAGE'] =
                     HTML::p(HTML::h1($this->Captcha->failed_msg));
-	    }
+        }
             elseif ( $this->savePage()) {
                 // noreturn
                 $request->setArg('action', false);
@@ -111,9 +111,9 @@
         }
         elseif ($this->editaction == 'save') {
             if (ENABLE_CAPTCHA && $this->Captcha->Failed()) {
-		$this->tokens['PAGE_LOCKED_MESSAGE'] = 
+        $this->tokens['PAGE_LOCKED_MESSAGE'] =
                     HTML::p(HTML::h1($this->Captcha->failed_msg));
-	    }
+        }
             elseif ($this->savePage()) {
                 return true;    // Page saved.
             }
@@ -121,21 +121,21 @@
                 $saveFailed = true;
             }
         }
-	// coming from loadfile conflicts 
+    // coming from loadfile conflicts
         elseif ($this->editaction == 'keep_old') {
-	    // keep old page and do nothing
+        // keep old page and do nothing
             $this->_redirectToBrowsePage();
             //$r->redirect(WikiURL($r->getArg('save_and_redirect_to')));
-	    return true;
+        return true;
         }
-        elseif ($this->editaction == 'overwrite') { 
+        elseif ($this->editaction == 'overwrite') {
             // take the new content without diff
-	    $source = $this->request->getArg('loadfile');
-	    require_once('lib/loadsave.php');
-	    $this->request->setArg('loadfile', 1);
-	    $this->request->setArg('overwrite', 1);
-	    $this->request->setArg('merge', 0);
-	    LoadFileOrDir($this->request);
+        $source = $this->request->getArg('loadfile');
+        require_once('lib/loadsave.php');
+        $this->request->setArg('loadfile', 1);
+        $this->request->setArg('overwrite', 1);
+        $this->request->setArg('merge', 0);
+        LoadFileOrDir($this->request);
             $this->_redirectToBrowsePage();
             //$r->redirect(WikiURL($r->getArg('save_and_redirect_to')));
             return true;
@@ -144,7 +144,7 @@
             // run plugin UpLoad
             $plugin = WikiPluginLoader("UpLoad");
             $plugin->run();
-            // add link to content	 
+            // add link to content
             ;
         }
 
@@ -167,13 +167,13 @@
             $this->_currentVersion = $this->current->getVersion();
             $this->version = $this->_currentVersion;
             $unresolved = $diff->ConflictingBlocks;
-            $tokens['CONCURRENT_UPDATE_MESSAGE'] 
+            $tokens['CONCURRENT_UPDATE_MESSAGE']
                 = $this->getConflictMessage($unresolved);
         } elseif ($saveFailed && !$this->_isSpam) {
-            $tokens['CONCURRENT_UPDATE_MESSAGE'] = 
+            $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.")),
-            	     HTML::p(HTML::em(_("&version=-1 might help."))));
+                     HTML::p(_("Your are probably trying to edit/create an invalid version of this page.")),
+                     HTML::p(HTML::em(_("&version=-1 might help."))));
         }
 
         if ($this->editaction == 'edit_convert')
@@ -216,9 +216,9 @@
             //$tokens['PAGE_SOURCE'] = $this->WysiwygEdit->ConvertBefore($this->_content);
         }
         $template = Template($template, $this->tokens);
-	/* Tell google (and others) not to take notice of edit links */
-	if (GOOGLE_LINKS_NOFOLLOW)
-	    $args = array('ROBOTS_META' => "noindex,nofollow");
+    /* Tell google (and others) not to take notice of edit links */
+    if (GOOGLE_LINKS_NOFOLLOW)
+        $args = array('ROBOTS_META' => "noindex,nofollow");
         GeneratePage($template, $title, $rev);
         return true;
     }
@@ -248,24 +248,24 @@
             $this->page->set('locked', (bool)$this->locked);
             $this->tokens['LOCK_CHANGED_MSG']
                 .= ($this->locked
-                    ? _("Page now locked.") 
+                    ? _("Page now locked.")
                     : _("Page now unlocked.") . " ");
             $changed = true;
         }
         if (ENABLE_PAGE_PUBLIC and (bool)$this->page->get('public') != (bool)$this->public) {
             $this->page->set('public', (bool)$this->public);
             $this->tokens['LOCK_CHANGED_MSG']
-                .= ($this->public 
+                .= ($this->public
                 ? _("Page now public.")
                 : _("Page now not-public."));
             $changed = true;
         }
-        
-    	if (ENABLE_EXTERNAL_PAGES) {
+
+        if (ENABLE_EXTERNAL_PAGES) {
             if ((bool)$this->page->get('external') != (bool)$this->external) {
                 $this->page->set('external', (bool)$this->external);
                 $this->tokens['LOCK_CHANGED_MSG']
-                    = ($this->external 
+                    = ($this->external
                        ? _("Page now external.")
                        : _("Page now not-external.")) . " ";
                 $changed = true;
@@ -319,20 +319,20 @@
         $meta = $this->selected->getMetaData();
         unset($meta['pgsrc_version']);
         $meta = array_merge($meta, $this->meta);
-        
+
         // Save new revision
         $this->_content = $this->getContent();
-        $newrevision = $page->save($this->_content, 
-        			   $this->version == -1 
-                                     ? -1 
-                                     : $this->_currentVersion + 1, 
+        $newrevision = $page->save($this->_content,
+                       $this->version == -1
+                                     ? -1
+                                     : $this->_currentVersion + 1,
                                    // force new?
-        			   $meta);
+                       $meta);
         if (!isa($newrevision, 'WikiDB_PageRevision')) {
             // Save failed.  (Concurrent updates).
             return false;
         }
-        
+
         // New contents successfully saved...
         $this->updateLock();
 
@@ -341,17 +341,17 @@
         $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
         $cleaner->cleanPageRevisions($page);
 
-        /* generate notification emails done in WikiDB::save to catch 
+        /* generate notification emails done in WikiDB::save to catch
          all direct calls (admin plugins) */
 
         // look at the errorstack
         $errors   = $GLOBALS['ErrorManager']->_postponed_errors;
-        $warnings = $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML(); 
+        $warnings = $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML();
         $GLOBALS['ErrorManager']->_postponed_errors = $errors;
 
         $dbi = $request->getDbh();
         $dbi->touch();
-        
+
         global $WikiTheme;
         if (empty($warnings->_content) && ! $WikiTheme->getImageURL('signature')) {
             // Do redirect to browse page if no signature has
@@ -371,7 +371,7 @@
         $template->replace('CONTENT', $newrevision->getTransformedContent());
         if (!empty($warnings->_content)) {
             $template->replace('WARNINGS', $warnings);
-            unset($GLOBALS['ErrorManager']->_postponed_errors); 
+            unset($GLOBALS['ErrorManager']->_postponed_errors);
         }
 
         $pagelink = WikiLink($page);
@@ -402,12 +402,12 @@
         return $this->_content == $current->getPackedContent();
     }
 
-    /** 
+    /**
      * Handle AntiSpam here. How? http://wikiblacklist.blogspot.com/
-     * Need to check dynamically some blacklist wikipage settings 
+     * Need to check dynamically some blacklist wikipage settings
      * (plugin WikiAccessRestrictions) and some static blacklist.
-     * DONE: 
-     *   More than NUM_SPAM_LINKS (default: 20) new external links. 
+     * DONE:
+     *   More than NUM_SPAM_LINKS (default: 20) new external links.
      *        Disabled if NUM_SPAM_LINKS is 0
      *   ENABLE_SPAMASSASSIN:  content patterns by babycart (only php >= 4.3 for now)
      *   ENABLE_SPAMBLOCKLIST: content domain blacklist
@@ -428,7 +428,7 @@
         {
             // Allow strictly authenticated users?
             // TODO: mail the admin?
-            $this->tokens['PAGE_LOCKED_MESSAGE'] = 
+            $this->tokens['PAGE_LOCKED_MESSAGE'] =
                 HTML($this->getSpamMessage(),
                      HTML::p(HTML::strong(_("Too many external links."))));
             return true;
@@ -437,13 +437,13 @@
         // This will probably prevent from discussing sex or viagra related topics. So beware.
         if (ENABLE_SPAMASSASSIN) {
             require_once("lib/spam_babycart.php");
-            if ($babycart = check_babycart($newtext, $request->get("REMOTE_ADDR"), 
+            if ($babycart = check_babycart($newtext, $request->get("REMOTE_ADDR"),
                                            $this->user->getId())) {
                 // TODO: mail the admin
                 if (is_array($babycart))
-                    $this->tokens['PAGE_LOCKED_MESSAGE'] = 
+                    $this->tokens['PAGE_LOCKED_MESSAGE'] =
                         HTML($this->getSpamMessage(),
-                             HTML::p(HTML::em(_("SpamAssassin reports: "), 
+                             HTML::p(HTML::em(_("SpamAssassin reports: "),
                                                 join("\n", $babycart))));
                 return true;
             }
@@ -456,26 +456,26 @@
             $oldparsed = TransformLinks($oldtext);
             $oldlinks = array();
             foreach ($oldparsed->_content as $link) {
-            	if (isa($link, 'Cached_ExternalLink') and !isa($link, 'Cached_InterwikiLink')) {
+                if (isa($link, 'Cached_ExternalLink') and !isa($link, 'Cached_InterwikiLink')) {
                     $uri = $link->_getURL($this->page->getName());
                     $oldlinks[$uri]++;
-            	}
+                }
             }
             unset($oldparsed);
             foreach ($parsed->_content as $link) {
-            	if (isa($link, 'Cached_ExternalLink') and !isa($link, 'Cached_InterwikiLink')) {
+                if (isa($link, 'Cached_ExternalLink') and !isa($link, 'Cached_InterwikiLink')) {
                     $uri = $link->_getURL($this->page->getName());
                     // only check new links, so admins may add blocked links.
                     if (!array_key_exists($uri, $oldlinks) and ($res = IsBlackListed($uri))) {
                         // TODO: mail the admin
-                        $this->tokens['PAGE_LOCKED_MESSAGE'] = 
+                        $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 with %s"), 
+                                         HTML::ul(HTML::li(sprintf(_("%s is listed at %s with %s"),
                                                                    $uri." [".$res[2]."]", $res[0], $res[1])))));
                         return true;
                     }
-            	}
+                }
             }
             unset($oldlinks);
             unset($parsed);
@@ -491,7 +491,7 @@
         return substr_count($text, "http://") + substr_count($text, "https://");
     }
 
-    /** Header of the Anti Spam message 
+    /** Header of the Anti Spam message
      */
     function getSpamMessage () {
         return
@@ -505,7 +505,7 @@
     function getPreview () {
         require_once('lib/PageType.php');
         $this->_content = $this->getContent();
-	return new TransformedText($this->page, $this->_content, $this->meta);
+    return new TransformedText($this->page, $this->_content, $this->meta);
     }
 
     function getConvertedPreview () {
@@ -513,24 +513,24 @@
         $this->_content = $this->getContent();
         $this->meta['markup'] = 2.0;
         $this->_content = ConvertOldMarkup($this->_content);
-	return new TransformedText($this->page, $this->_content, $this->meta);
+    return new TransformedText($this->page, $this->_content, $this->meta);
     }
 
     function getDiff () {
         require_once('lib/diff.php');
-	$html = HTML();
-	
-	$diff = new Diff($this->current->getContent(), explode("\n", $this->getContent()));
-	if ($diff->isEmpty()) {
-	    $html->pushContent(HTML::hr(),
-			       HTML::p('[', _("Versions are identical"),
-				       ']'));
-	}
-	else {
-	    // New CSS formatted unified diffs
-	    $fmt = new HtmlUnifiedDiffFormatter;
-	    $html->pushContent($fmt->format($diff));
-	}
+    $html = HTML();
+
+    $diff = new Diff($this->current->getContent(), explode("\n", $this->getContent()));
+    if ($diff->isEmpty()) {
+        $html->pushContent(HTML::hr(),
+                   HTML::p('[', _("Versions are identical"),
+                       ']'));
+    }
+    else {
+        // New CSS formatted unified diffs
+        $fmt = new HtmlUnifiedDiffFormatter;
+        $html->pushContent($fmt->format($diff));
+    }
         return $html;
     }
 
@@ -567,7 +567,7 @@
         return
             HTML(HTML::h2(WikiLink(_("ModeratedPage"))),
                  HTML::p(fmt("You can edit away, but your changes will have to be approved by the defined moderators at the definition in %s", WikiLink(_("ModeratedPage")))),
-                 HTML::p(fmt("The approval has a grace period of 5 days. If you have your E-Mail defined in your %s, you will get a notification of approval or rejection.", 
+                 HTML::p(fmt("The approval has a grace period of 5 days. If you have your E-Mail defined in your %s, you will get a notification of approval or rejection.",
                          WikiLink(_("UserPreferences")))));
     }
     function getConflictMessage ($unresolved = false) {
@@ -623,7 +623,7 @@
                                          'readonly' => (bool) $readonly),
                                    $this->_content);
         if (ENABLE_WYSIWYG) {
-            return $this->WysiwygEdit->Textarea($textarea, $this->_wikicontent, 
+            return $this->WysiwygEdit->Textarea($textarea, $this->_wikicontent,
                                                 $textarea->getAttr('name'));
         } else
             return $textarea;
@@ -665,7 +665,7 @@
                                 'checked' => $this->meta['markup'] < 2.0,
                                 'id' => 'useOldMarkup',
                                 'onclick' => 'showOldMarkupRules(this.checked)'));
-        $el['OLD_MARKUP_CONVERT'] = ($this->meta['markup'] < 2.0) 
+        $el['OLD_MARKUP_CONVERT'] = ($this->meta['markup'] < 2.0)
             ? Button('submit:edit[edit_convert]', _("Convert"), 'wikiaction') : '';
         $el['LOCKED_CB']
             = HTML::input(array('type' => 'checkbox',
@@ -681,7 +681,7 @@
                                 'disabled' => (bool) !$this->user->isAdmin(),
                                 'checked'  => (bool) $this->page->get('public')));
         }
-    	if (ENABLE_EXTERNAL_PAGES) {
+        if (ENABLE_EXTERNAL_PAGES) {
             $el['EXTERNAL_CB']
             = HTML::input(array('type' => 'checkbox',
                                 'name' => 'edit[external]',
@@ -690,24 +690,24 @@
                                 'checked'  => (bool) $this->page->get('external')));
         }
         if (ENABLE_WYSIWYG) {
-	    if (($this->version == 0) and ($request->getArg('mode') != 'wysiwyg')) {
-		$el['WYSIWYG_B'] = Button(array("action" => "edit", "mode" => "wysiwyg"), "Wysiwyg Editor");
-	    }
-	}
+        if (($this->version == 0) and ($request->getArg('mode') != 'wysiwyg')) {
+        $el['WYSIWYG_B'] = Button(array("action" => "edit", "mode" => "wysiwyg"), "Wysiwyg Editor");
+        }
+    }
 
         $el['PREVIEW_B'] = Button('submit:edit[preview]', _("Preview"),
                                   'wikiaction',
-                                  array('accesskey'=> 'p', 
+                                  array('accesskey'=> 'p',
                                      'title' => 'Preview the current content [alt-p]'));
 
         //if (!$this->isConcurrentUpdate() && $this->canEdit())
         $el['SAVE_B'] = Button('submit:edit[save]',
                                _("Save"), 'wikiaction',
-                               array('accesskey'=> 's', 
+                               array('accesskey'=> 's',
                                      'title' => 'Save the current content as wikipage [alt-s]'));
         $el['CHANGES_B'] = Button('submit:edit[diff]',
                                _("Changes"), 'wikiaction',
-                               array('accesskey'=> 'c', 
+                               array('accesskey'=> 'c',
                                      'title' => 'Preview the current changes as diff [alt-c]'));
         $el['UPLOAD_B'] = Button('submit:edit[upload]',
                                _("Upload"), 'wikiaction',
@@ -717,7 +717,7 @@
                                 array('title' => 'Check the spelling'));
         $el['IS_CURRENT'] = $this->version == $this->current->getVersion();
 
-        $el['WIDTH_PREF'] 
+        $el['WIDTH_PREF']
             = HTML::input(array('type'     => 'text',
                                 'size'     => 3,
                                 'maxlength'=> 4,
@@ -726,7 +726,7 @@
                                 'id'       => 'pref-editWidth',
                                 'value'    => $request->getPref('editWidth'),
                                 'onchange' => 'this.form.submit();'));
-        $el['HEIGHT_PREF'] 
+        $el['HEIGHT_PREF']
             = HTML::input(array('type'     => 'text',
                                 'size'     => 3,
                                 'maxlength'=> 4,
@@ -736,9 +736,9 @@
                                 'value'    => $request->getPref('editHeight'),
                                 'onchange' => 'this.form.submit();'));
         $el['SEP'] = $WikiTheme->getButtonSeparator();
-        $el['AUTHOR_MESSAGE'] = fmt("Author will be logged as %s.", 
+        $el['AUTHOR_MESSAGE'] = fmt("Author will be logged as %s.",
                                     HTML::em($this->user->getId()));
-        
+
         return $el;
     }
 
@@ -752,8 +752,8 @@
         $posted = $request->getArg('edit');
         $request->setArg('edit', false);
 
-        if (!$posted 
-	    || !$request->isPost()
+        if (!$posted
+        || !$request->isPost()
             || !in_array($request->getArg('action'),array('edit','loadfile')))
             return false;
 
@@ -776,8 +776,8 @@
         $meta['is_minor_edit'] = !empty($posted['minor_edit']);
         $meta['pagetype'] = !empty($posted['pagetype']) ? $posted['pagetype'] : false;
         if ( ENABLE_CAPTCHA )
-	    $meta['captcha_input'] = !empty($posted['captcha_input']) ?
-		$posted['captcha_input'] : '';
+        $meta['captcha_input'] = !empty($posted['captcha_input']) ?
+        $posted['captcha_input'] : '';
 
         $this->meta = array_merge($this->meta, $meta);
         $this->locked = !empty($posted['locked']);
@@ -786,12 +786,12 @@
         if (ENABLE_EXTERNAL_PAGES)
             $this->external = !empty($posted['external']);
 
-	foreach (array('preview','save','edit_convert',
-		       'keep_old','overwrite','diff','upload') as $o) 
-	{
-	    if (!empty($posted[$o]))
-		$this->editaction = $o;
-	}
+    foreach (array('preview','save','edit_convert',
+               'keep_old','overwrite','diff','upload') as $o)
+    {
+        if (!empty($posted[$o]))
+        $this->editaction = $o;
+    }
         if (empty($this->editaction))
             $this->editaction = 'edit';
 
@@ -843,13 +843,13 @@
         if (!$this->canEdit()) {
             if ($this->isInitialEdit()) {
                 return $this->viewSource();
-	    }
+        }
             $tokens['PAGE_LOCKED_MESSAGE'] = $this->getLockedMessage();
         }
         elseif ($this->editaction == 'save') {
             if ($this->savePage()) {
                 return true;    // Page saved.
-	    }
+        }
             $saveFailed = true;
         }
 
@@ -886,29 +886,29 @@
 
         // FIXME: NOT_CURRENT_MESSAGE?
         $tokens = array_merge($tokens, $this->getFormElements());
-	// we need all GET params for loadfile overwrite
-	if ($this->request->getArg('action') == 'loadfile') {
-		
-	    $this->tokens['HIDDEN_INPUTS'] = 
-		HTML(HiddenInputs
-		    (array('source' => $this->request->getArg('source'),
-		           'merge'  => 1)),
-		     $this->tokens['HIDDEN_INPUTS']);
-	    // add two conflict resolution buttons before preview and save.
-	    $tokens['PREVIEW_B'] = HTML(
-				    Button('submit:edit[keep_old]', 
-					   _("Keep old"), 'wikiaction'),
-				    $tokens['SEP'],
-				    Button('submit:edit[overwrite]', 
-					   _("Overwrite with new"), 'wikiaction'),
-				    $tokens['SEP'],
-				    $tokens['PREVIEW_B']);
-	}
-	if (ENABLE_EDIT_TOOLBAR and !ENABLE_WYSIWYG) {
+    // we need all GET params for loadfile overwrite
+    if ($this->request->getArg('action') == 'loadfile') {
+
+        $this->tokens['HIDDEN_INPUTS'] =
+        HTML(HiddenInputs
+            (array('source' => $this->request->getArg('source'),
+                   'merge'  => 1)),
+             $this->tokens['HIDDEN_INPUTS']);
+        // add two conflict resolution buttons before preview and save.
+        $tokens['PREVIEW_B'] = HTML(
+                    Button('submit:edit[keep_old]',
+                       _("Keep old"), 'wikiaction'),
+                    $tokens['SEP'],
+                    Button('submit:edit[overwrite]',
+                       _("Overwrite with new"), 'wikiaction'),
+                    $tokens['SEP'],
+                    $tokens['PREVIEW_B']);
+    }
+    if (ENABLE_EDIT_TOOLBAR and !ENABLE_WYSIWYG) {
             include_once("lib/EditToolbar.php");
             $toolbar = new EditToolbar();
             $tokens = array_merge($tokens, $toolbar->getTokens());
-	}
+    }
 
         return $this->output('editpage', _("Merge and Edit: %s"));
     }
@@ -927,13 +927,13 @@
         }
 
         $title = new FormattedText ($title_fs, $pagelink);
-	$this->tokens['HEADER'] = $title;
-	//hack! there's no TITLE in editpage, but in the previous top template
-	if (empty($this->tokens['PAGE_LOCKED_MESSAGE']))
-	    $this->tokens['PAGE_LOCKED_MESSAGE'] = HTML::h3($title);
-	else
-	    $this->tokens['PAGE_LOCKED_MESSAGE'] = HTML(HTML::h3($title),
-							$this->tokens['PAGE_LOCKED_MESSAGE']);
+    $this->tokens['HEADER'] = $title;
+    //hack! there's no TITLE in editpage, but in the previous top template
+    if (empty($this->tokens['PAGE_LOCKED_MESSAGE']))
+        $this->tokens['PAGE_LOCKED_MESSAGE'] = HTML::h3($title);
+    else
+        $this->tokens['PAGE_LOCKED_MESSAGE'] = HTML(HTML::h3($title),
+                            $this->tokens['PAGE_LOCKED_MESSAGE']);
         $template = Template($template, $this->tokens);
 
         //GeneratePage($template, $title, $rev);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/fortune.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/fortune.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/fortune.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,13 +1,13 @@
 <?php
-// rcs_id('PHP Fortune - Made by henrik at aasted.org. HP: http://www.aasted.org');
-// rcs_id('$Id: fortune.php 7417 2010-05-19 12:57:42Z vargenau $');
-/* 
+// PHP Fortune - Made by henrik at aasted.org. HP: http://www.aasted.org
+// $Id: fortune.php 7964 2011-03-05 17:05:30Z vargenau $
+/*
 Main methods to use:
  quoteFromDir($dir):
    Quotes from any of the fortune-files in the dir.
  getRandomQuote($file):
    Quotes from the specific file.
-   
+
  Written by Henrik Aasted Sorensen, henrik at aasted.org
  Read more at http://www.aasted.org/quote
 */
@@ -16,12 +16,12 @@
     function quoteFromDir($dir) {
         $amount = 0;
         $index = 0;
-	$quotes = array();
-	$files = array();
+    $quotes = array();
+    $files = array();
 
         if ( $handle = opendir($dir) ) {
             while (false !== ($file = readdir($handle))) {
-		
+
                 if ( strpos($file, ".dat") != false) {
                     $len = strlen($file);
                     if (substr($file, $len - 4) == ".dat"){
@@ -29,27 +29,27 @@
                         $amount += $number;
                         $quotes[$index] = $amount;
                         $files[$index] = $file;
-                        $index++;					
+                        $index++;
                     }
-                }			
+                }
             }
-	
+
             srand((double)microtime()*1000000);
             $index = rand(0, $amount);
             $i = 0;
-	
-	    if ($amount)
-		while ($quotes[$i] < $index)  {
-		    $i++;	
-		}
-	    if (!empty($files))
-		return $this->getRandomQuote($dir . "/" .$files[$i]);
+
+        if ($amount)
+        while ($quotes[$i] < $index)  {
+            $i++;
         }
+        if (!empty($files))
+        return $this->getRandomQuote($dir . "/" .$files[$i]);
+        }
         return -1;
     }
 
     /*
-     Reads the number of quotes in the file. 
+     Reads the number of quotes in the file.
     */
     function getNumberOfQuotes($file) {
         $fd = fopen($file, "rb");
@@ -66,27 +66,27 @@
             echo "Input must be a file!<br/>";
             return;
         }
-	
+
         if ( ($fd = fopen($file, "rb")) == false ) {
-            echo "Cannot open $file<br/>";	
+            echo "Cannot open $file<br/>";
             return;
         }
         fseek($fd, 24 + 4 * $index);
-	
+
         $phys_index = $this->readLong($fd);
-	
+
         fclose($fd);
-	
+
         $quotefile = substr($file, 0, strlen($file) - 4);
 
         if ( ($fd = fopen($quotefile, "rb")) == false ) {
             echo "Cannot find file $quotefile!<br/>";
-        }		
-	
+        }
+
         $res = $this->getQuote($fd, $phys_index);
         fclose($fd);
-	
-        return $res;	
+
+        return $res;
     }
 
     /*
@@ -98,7 +98,7 @@
         $index = rand(0, $number - 1);
 
         return $this->getExactQuote($file, $index);
-    }	
+    }
 
     /*
      Reads a quote from the specified index.
@@ -107,7 +107,7 @@
         fseek($fd, $index);
         $line=""; $res = "";
         do {
-            $res = $res . $line;		
+            $res = $res . $line;
             $line = fgets($fd, 1024) . "<br>";
         } while ( ($line[0] != "%") && (!feof($fd)) );
 
@@ -120,7 +120,7 @@
     function getIndices($fd) {
         fseek($fd, 24, SEEK_SET);
         $i = 0;
-	
+
         while ( feof($fd) == FALSE ) {
             $res[$i] = readLong($fd);
             $i++;
@@ -157,7 +157,7 @@
                 $i++;
                 if ($length > $longest)
                     $longest = $length;
-	
+
                 if ($length < $shortest)
                     $shortest = $length;
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf/chinese.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf/chinese.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf/chinese.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: chinese.php 7617 2010-07-15 19:22:14Z vargenau $');
+// $Id: chinese.php 7956 2011-03-03 17:08:31Z vargenau $
 
 // PDF functions taken from FPDF http://www.fpdf.org
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf/japanese.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf/japanese.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf/japanese.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: japanese.php 7617 2010-07-15 19:22:14Z vargenau $');
+// $Id: japanese.php 7956 2011-03-03 17:08:31Z vargenau $
 
 // PDF functions taken from FPDF http://www.fpdf.org
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/fpdf.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -77,51 +77,51 @@
 *                                                                              *
 *******************************************************************************/
     function FPDF ($orientation='P', $unit='mm', $format='A4') {
-	//Some checks
-	$this->_dochecks();
-	//Initialization of properties
-	$this->page=0;
-	$this->n=2;
-	$this->buffer='';
-	$this->pages=array();
-	$this->OrientationChanges=array();
-	$this->state=0;
-	$this->fonts=array();
-	$this->FontFiles=array();
-	$this->diffs=array();
-	$this->images=array();
-	$this->links=array();
-	$this->InFooter=false;
-	$this->lasth=0;
-	$this->FontFamily='';
-	$this->FontStyle='';
-	$this->FontSizePt=12;
-	$this->underline=false;
-	$this->DrawColor='0 G';
-	$this->FillColor='0 g';
-	$this->TextColor='0 g';
-	$this->ColorFlag=false;
-	$this->ws=0;
-	//Standard fonts
-	$this->CoreFonts=array('japanees'=>'Japanees',
+    //Some checks
+    $this->_dochecks();
+    //Initialization of properties
+    $this->page=0;
+    $this->n=2;
+    $this->buffer='';
+    $this->pages=array();
+    $this->OrientationChanges=array();
+    $this->state=0;
+    $this->fonts=array();
+    $this->FontFiles=array();
+    $this->diffs=array();
+    $this->images=array();
+    $this->links=array();
+    $this->InFooter=false;
+    $this->lasth=0;
+    $this->FontFamily='';
+    $this->FontStyle='';
+    $this->FontSizePt=12;
+    $this->underline=false;
+    $this->DrawColor='0 G';
+    $this->FillColor='0 g';
+    $this->TextColor='0 g';
+    $this->ColorFlag=false;
+    $this->ws=0;
+    //Standard fonts
+    $this->CoreFonts=array('japanees'=>'Japanees',
                                'courier'=>'Courier','courierB'=>'Courier-Bold','courierI'=>'Courier-Oblique','courierBI'=>'Courier-BoldOblique',
                                'helvetica'=>'Helvetica','helveticaB'=>'Helvetica-Bold','helveticaI'=>'Helvetica-Oblique','helveticaBI'=>'Helvetica-BoldOblique',
                                'times'=>'Times-Roman','timesB'=>'Times-Bold','timesI'=>'Times-Italic','timesBI'=>'Times-BoldItalic',
                                'symbol'=>'Symbol','zapfdingbats'=>'ZapfDingbats');
-	//Scale factor
-	if ($unit=='pt')
+    //Scale factor
+    if ($unit=='pt')
             $this->k=1;
-	elseif ($unit=='mm')
+    elseif ($unit=='mm')
             $this->k=72/25.4;
-	elseif ($unit=='cm')
+    elseif ($unit=='cm')
             $this->k=72/2.54;
-	elseif ($unit=='in')
+    elseif ($unit=='in')
             $this->k=72;
-	else
+    else
             $this->Error('Incorrect unit: '.$unit);
-	//Page format
-	if (is_string($format))
-	{
+    //Page format
+    if (is_string($format))
+    {
             $format=strtolower($format);
             if ($format=='a3')
                 $format=array(841.89,1190.55);
@@ -137,176 +137,176 @@
                 $this->Error('Unknown page format: '.$format);
             $this->fwPt=$format[0];
             $this->fhPt=$format[1];
-	}
-	else
-	{
+    }
+    else
+    {
             $this->fwPt=$format[0]*$this->k;
             $this->fhPt=$format[1]*$this->k;
-	}
-	$this->fw=$this->fwPt/$this->k;
-	$this->fh=$this->fhPt/$this->k;
-	//Page orientation
-	$orientation=strtolower($orientation);
-	if ($orientation=='p' or $orientation=='portrait')
-	{
+    }
+    $this->fw=$this->fwPt/$this->k;
+    $this->fh=$this->fhPt/$this->k;
+    //Page orientation
+    $orientation=strtolower($orientation);
+    if ($orientation=='p' or $orientation=='portrait')
+    {
             $this->DefOrientation='P';
             $this->wPt=$this->fwPt;
             $this->hPt=$this->fhPt;
-	}
-	elseif ($orientation=='l' or $orientation=='landscape')
-	{
+    }
+    elseif ($orientation=='l' or $orientation=='landscape')
+    {
             $this->DefOrientation='L';
             $this->wPt=$this->fhPt;
             $this->hPt=$this->fwPt;
-	}
-	else
+    }
+    else
             $this->Error('Incorrect orientation: '.$orientation);
-	$this->CurOrientation=$this->DefOrientation;
-	$this->w=$this->wPt/$this->k;
-	$this->h=$this->hPt/$this->k;
-	//Page margins (1 cm)
-	$margin=28.35/$this->k;
-	$this->SetMargins($margin,$margin);
-	//Interior cell margin (1 mm)
-	$this->cMargin=$margin/10;
-	//Line width (0.2 mm)
-	$this->LineWidth=.567/$this->k;
-	//Automatic page break
-	$this->SetAutoPageBreak(true,2*$margin);
-	//Full width display mode
-	$this->SetDisplayMode('fullwidth');
-	//Compression
-	$this->SetCompression(true);
+    $this->CurOrientation=$this->DefOrientation;
+    $this->w=$this->wPt/$this->k;
+    $this->h=$this->hPt/$this->k;
+    //Page margins (1 cm)
+    $margin=28.35/$this->k;
+    $this->SetMargins($margin,$margin);
+    //Interior cell margin (1 mm)
+    $this->cMargin=$margin/10;
+    //Line width (0.2 mm)
+    $this->LineWidth=.567/$this->k;
+    //Automatic page break
+    $this->SetAutoPageBreak(true,2*$margin);
+    //Full width display mode
+    $this->SetDisplayMode('fullwidth');
+    //Compression
+    $this->SetCompression(true);
     }
 
     function SetMargins($left,$top,$right=-1) {
-	//Set left, top and right margins
-	$this->lMargin=$left;
-	$this->tMargin=$top;
-	if ($right==-1)
+    //Set left, top and right margins
+    $this->lMargin=$left;
+    $this->tMargin=$top;
+    if ($right==-1)
             $right=$left;
-	$this->rMargin=$right;
+    $this->rMargin=$right;
     }
 
     function SetLeftMargin($margin) {
-	//Set left margin
-	$this->lMargin=$margin;
-	if ($this->page>0 and $this->x<$margin)
+    //Set left margin
+    $this->lMargin=$margin;
+    if ($this->page>0 and $this->x<$margin)
             $this->x=$margin;
     }
 
     function SetTopMargin($margin) {
-	//Set top margin
-	$this->tMargin=$margin;
+    //Set top margin
+    $this->tMargin=$margin;
     }
 
     function SetRightMargin($margin) {
-	//Set right margin
-	$this->rMargin=$margin;
+    //Set right margin
+    $this->rMargin=$margin;
     }
 
     function SetAutoPageBreak($auto,$margin=0) {
-	//Set auto page break mode and triggering margin
-	$this->AutoPageBreak=$auto;
-	$this->bMargin=$margin;
-	$this->PageBreakTrigger=$this->h-$margin;
+    //Set auto page break mode and triggering margin
+    $this->AutoPageBreak=$auto;
+    $this->bMargin=$margin;
+    $this->PageBreakTrigger=$this->h-$margin;
     }
 
     function SetDisplayMode($zoom,$layout='continuous') {
-	//Set display mode in viewer
-	if ($zoom=='fullpage' or $zoom=='fullwidth' or $zoom=='real' or $zoom=='default' or !is_string($zoom))
+    //Set display mode in viewer
+    if ($zoom=='fullpage' or $zoom=='fullwidth' or $zoom=='real' or $zoom=='default' or !is_string($zoom))
             $this->ZoomMode=$zoom;
-	else
+    else
             $this->Error('Incorrect zoom display mode: '.$zoom);
-	if ($layout=='single' or $layout=='continuous' or $layout=='two' or $layout=='default')
+    if ($layout=='single' or $layout=='continuous' or $layout=='two' or $layout=='default')
             $this->LayoutMode=$layout;
-	else
+    else
             $this->Error('Incorrect layout display mode: '.$layout);
     }
 
     function SetCompression($compress) {
-	//Set page compression
-	if (function_exists('gzcompress'))
+    //Set page compression
+    if (function_exists('gzcompress'))
             $this->compress=$compress;
-	else
+    else
             $this->compress=false;
     }
 
     function SetTitle($title) {
-	//Title of document
-	$this->title=$title;
+    //Title of document
+    $this->title=$title;
     }
 
     function SetSubject($subject) {
-	//Subject of document
-	$this->subject=$subject;
+    //Subject of document
+    $this->subject=$subject;
     }
 
     function SetAuthor($author) {
-	//Author of document
-	$this->author=$author;
+    //Author of document
+    $this->author=$author;
     }
 
     function SetKeywords($keywords) {
-	//Keywords of document
-	$this->keywords=$keywords;
+    //Keywords of document
+    $this->keywords=$keywords;
     }
 
     function SetCreator($creator) {
-	//Creator of document
-	$this->creator=$creator;
+    //Creator of document
+    $this->creator=$creator;
     }
 
     function SetProducer($producer) {
-	//Producer of document
-	$this->producer=$producer;
+    //Producer of document
+    $this->producer=$producer;
     }
 
     function AliasNbPages($alias='{nb}') {
-	//Define an alias for total number of pages
-	$this->AliasNbPages=$alias;
+    //Define an alias for total number of pages
+    $this->AliasNbPages=$alias;
     }
 
     function Error($msg) {
-	//Fatal error
-	die('<B>FPDF error: </B>'.$msg);
+    //Fatal error
+    die('<B>FPDF error: </B>'.$msg);
     }
 
     function Open() {
-	//Begin document
-	if ($this->state==0)
+    //Begin document
+    if ($this->state==0)
             $this->_begindoc();
     }
 
     function Close() {
-	//Terminate document
-	if ($this->state==3)
+    //Terminate document
+    if ($this->state==3)
             return;
-	if ($this->page==0)
+    if ($this->page==0)
             $this->AddPage();
-	//Page footer
-	$this->InFooter=true;
-	$this->Footer();
-	$this->InFooter=false;
-	//Close page
-	$this->_endpage();
-	//Close document
-	$this->_enddoc();
+    //Page footer
+    $this->InFooter=true;
+    $this->Footer();
+    $this->InFooter=false;
+    //Close page
+    $this->_endpage();
+    //Close document
+    $this->_enddoc();
     }
 
     function AddPage($orientation='') {
-	//Start a new page
-	if ($this->state==0)
+    //Start a new page
+    if ($this->state==0)
             $this->Open();
-	$family=$this->FontFamily;
-	$style=$this->FontStyle.($this->underline ? 'U' : '');
-	$size=$this->FontSizePt;
-	$lw=$this->LineWidth;
-	$dc=$this->DrawColor;
-	$fc=$this->FillColor;
-	$tc=$this->TextColor;
-	$cf=$this->ColorFlag;
-	if ($this->page>0) {
+    $family=$this->FontFamily;
+    $style=$this->FontStyle.($this->underline ? 'U' : '');
+    $size=$this->FontSizePt;
+    $lw=$this->LineWidth;
+    $dc=$this->DrawColor;
+    $fc=$this->FillColor;
+    $tc=$this->TextColor;
+    $cf=$this->ColorFlag;
+    if ($this->page>0) {
             //Page footer
             $this->InFooter=true;
             $this->Footer();
@@ -314,145 +314,145 @@
             //Close page
             $this->_endpage();
         }
-	//Start new page
-	$this->_beginpage($orientation);
-	//Set line cap style to square
-	$this->_out('2 J');
-	//Set line width
-	$this->LineWidth=$lw;
-	$this->_out(sprintf('%.2f w',$lw*$this->k));
-	//Set font
-	if ($family)
+    //Start new page
+    $this->_beginpage($orientation);
+    //Set line cap style to square
+    $this->_out('2 J');
+    //Set line width
+    $this->LineWidth=$lw;
+    $this->_out(sprintf('%.2f w',$lw*$this->k));
+    //Set font
+    if ($family)
             $this->SetFont($family,$style,$size);
-	//Set colors
-	$this->DrawColor=$dc;
-	if ($dc!='0 G')
+    //Set colors
+    $this->DrawColor=$dc;
+    if ($dc!='0 G')
             $this->_out($dc);
-	$this->FillColor=$fc;
-	if ($fc!='0 g')
+    $this->FillColor=$fc;
+    if ($fc!='0 g')
             $this->_out($fc);
-	$this->TextColor=$tc;
-	$this->ColorFlag=$cf;
-	//Page header
-	$this->Header();
-	//Restore line width
-	if ($this->LineWidth!=$lw) {
+    $this->TextColor=$tc;
+    $this->ColorFlag=$cf;
+    //Page header
+    $this->Header();
+    //Restore line width
+    if ($this->LineWidth!=$lw) {
             $this->LineWidth=$lw;
             $this->_out(sprintf('%.2f w',$lw*$this->k));
         }
-	//Restore font
-	if ($family)
+    //Restore font
+    if ($family)
             $this->SetFont($family,$style,$size);
-	//Restore colors
-	if ($this->DrawColor!=$dc) {
+    //Restore colors
+    if ($this->DrawColor!=$dc) {
             $this->DrawColor=$dc;
             $this->_out($dc);
         }
-	if ($this->FillColor!=$fc) {
+    if ($this->FillColor!=$fc) {
             $this->FillColor=$fc;
             $this->_out($fc);
         }
-	$this->TextColor=$tc;
-	$this->ColorFlag=$cf;
+    $this->TextColor=$tc;
+    $this->ColorFlag=$cf;
     }
 
     function Header() {
-	//To be implemented in your own inherited class
+    //To be implemented in your own inherited class
     }
 
     function Footer() {
-	//To be implemented in your own inherited class
+    //To be implemented in your own inherited class
     }
 
     function PageNo() {
-	//Get current page number
-	return $this->page;
+    //Get current page number
+    return $this->page;
     }
 
     function SetDrawColor($r,$g=-1,$b=-1) {
-	//Set color for all stroking operations
-	if (($r==0 and $g==0 and $b==0) or $g==-1)
+    //Set color for all stroking operations
+    if (($r==0 and $g==0 and $b==0) or $g==-1)
             $this->DrawColor=sprintf('%.3f G',$r/255);
-	else
+    else
             $this->DrawColor=sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255);
-	if ($this->page>0)
+    if ($this->page>0)
             $this->_out($this->DrawColor);
     }
 
     function SetFillColor($r,$g=-1,$b=-1) {
-	//Set color for all filling operations
-	if (($r==0 and $g==0 and $b==0) or $g==-1)
+    //Set color for all filling operations
+    if (($r==0 and $g==0 and $b==0) or $g==-1)
             $this->FillColor=sprintf('%.3f g',$r/255);
-	else
+    else
             $this->FillColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag=($this->FillColor!=$this->TextColor);
-	if ($this->page>0)
+    $this->ColorFlag=($this->FillColor!=$this->TextColor);
+    if ($this->page>0)
             $this->_out($this->FillColor);
     }
 
     function SetTextColor($r,$g=-1,$b=-1) {
-	//Set color for text
-	if (($r==0 and $g==0 and $b==0) or $g==-1)
+    //Set color for text
+    if (($r==0 and $g==0 and $b==0) or $g==-1)
             $this->TextColor=sprintf('%.3f g',$r/255);
-	else
+    else
             $this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
-	$this->ColorFlag=($this->FillColor!=$this->TextColor);
+    $this->ColorFlag=($this->FillColor!=$this->TextColor);
     }
 
     function GetStringWidth($s) {
-	//Get width of a string in the current font
-	$s=(string)$s;
-	$cw=&$this->CurrentFont['cw'];
-	$w=0;
-	$l=strlen($s);
-	for($i=0;$i<$l;$i++)
+    //Get width of a string in the current font
+    $s=(string)$s;
+    $cw=&$this->CurrentFont['cw'];
+    $w=0;
+    $l=strlen($s);
+    for($i=0;$i<$l;$i++)
             $w+=$cw[$s{$i}];
-	return $w*$this->FontSize/1000;
+    return $w*$this->FontSize/1000;
     }
 
     function SetLineWidth($width) {
-	//Set line width
-	$this->LineWidth=$width;
-	if ($this->page>0)
+    //Set line width
+    $this->LineWidth=$width;
+    if ($this->page>0)
             $this->_out(sprintf('%.2f w',$width*$this->k));
     }
 
     function Line($x1,$y1,$x2,$y2) {
-	//Draw a line
-	$this->_out(sprintf('%.2f %.2f m %.2f %.2f l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
+    //Draw a line
+    $this->_out(sprintf('%.2f %.2f m %.2f %.2f l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
     }
 
     function Rect($x,$y,$w,$h,$style='') {
-	//Draw a rectangle
-	if ($style=='F')
+    //Draw a rectangle
+    if ($style=='F')
             $op='f';
-	elseif ($style=='FD' or $style=='DF')
+    elseif ($style=='FD' or $style=='DF')
             $op='B';
-	else
+    else
             $op='S';
-	$this->_out(sprintf('%.2f %.2f %.2f %.2f re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+    $this->_out(sprintf('%.2f %.2f %.2f %.2f re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
     }
 
     function AddFont($family,$style='',$file='') {
-	//Add a TrueType or Type1 font
-	$family=strtolower($family);
-	if ($family=='arial')
+    //Add a TrueType or Type1 font
+    $family=strtolower($family);
+    if ($family=='arial')
             $family='helvetica';
-	$style=strtoupper($style);
-	if ($style=='IB')
+    $style=strtoupper($style);
+    if ($style=='IB')
             $style='BI';
-	if (isset($this->fonts[$family.$style]))
+    if (isset($this->fonts[$family.$style]))
             $this->Error('Font already added: '.$family.' '.$style);
-	if ($file=='')
+    if ($file=='')
             $file=str_replace(' ','',$family).strtolower($style).'.php';
-	if (defined('FPDF_FONTPATH'))
+    if (defined('FPDF_FONTPATH'))
             $file = FPDF_FONTPATH . $file;
-	include($file);
-	if (!isset($name))
+    include($file);
+    if (!isset($name))
             $this->Error('Could not include font definition file');
-	$i=count($this->fonts)+1;
-	$this->fonts[$family.$style]=array('i'=>$i,'type'=>$type,'name'=>$name,'desc'=>$desc,'up'=>$up,'ut'=>$ut,'cw'=>$cw,'enc'=>$enc,'file'=>$file);
-	if ($diff) {
+    $i=count($this->fonts)+1;
+    $this->fonts[$family.$style]=array('i'=>$i,'type'=>$type,'name'=>$name,'desc'=>$desc,'up'=>$up,'ut'=>$ut,'cw'=>$cw,'enc'=>$enc,'file'=>$file);
+    if ($diff) {
             //Search existing encodings
             $d=0;
             $nb=count($this->diffs);
@@ -467,7 +467,7 @@
             }
             $this->fonts[$family.$style]['diff']=$d;
         }
-	if ($file) {
+    if ($file) {
             if ($type=='TrueType')
                 $this->FontFiles[$file]=array('length1'=>$originalsize);
             else
@@ -476,33 +476,33 @@
     }
 
     function SetFont($family,$style='',$size=0) {
-	//Select a font; size given in points
-	global $fpdf_charwidths;
+    //Select a font; size given in points
+    global $fpdf_charwidths;
 
-	$family=strtolower($family);
-	if ($family=='')
+    $family=strtolower($family);
+    if ($family=='')
             $family=$this->FontFamily;
-	if ($family=='arial')
+    if ($family=='arial')
             $family='helvetica';
-	elseif ($family=='symbol' or $family=='zapfdingbats')
+    elseif ($family=='symbol' or $family=='zapfdingbats')
             $style='';
-	$style=strtoupper($style);
-	if (is_int(strpos($style,'U'))) {
+    $style=strtoupper($style);
+    if (is_int(strpos($style,'U'))) {
             $this->underline=true;
             $style=str_replace('U','',$style);
         }
-	else
+    else
             $this->underline=false;
-	if ($style=='IB')
+    if ($style=='IB')
             $style='BI';
-	if ($size==0)
+    if ($size==0)
             $size=$this->FontSizePt;
-	//Test if font is already selected
-	if ($this->FontFamily==$family and $this->FontStyle==$style and $this->FontSizePt==$size)
+    //Test if font is already selected
+    if ($this->FontFamily==$family and $this->FontStyle==$style and $this->FontSizePt==$size)
             return;
-	//Test if used for the first time
-	$fontkey=$family.$style;
-	if (!isset($this->fonts[$fontkey])) {
+    //Test if used for the first time
+    $fontkey=$family.$style;
+    if (!isset($this->fonts[$fontkey])) {
             //Check if one of the standard fonts
             if (isset($this->CoreFonts[$fontkey])) {
                 if (!isset($fpdf_charwidths[$fontkey])) {
@@ -523,66 +523,66 @@
             else
                 $this->Error('Undefined font: '.$family.' '.$style);
         }
-	//Select it
-	$this->FontFamily=$family;
-	$this->FontStyle=$style;
-	$this->FontSizePt=$size;
-	$this->FontSize=$size/$this->k;
-	$this->CurrentFont=&$this->fonts[$fontkey];
-	if ($this->page>0)
+    //Select it
+    $this->FontFamily=$family;
+    $this->FontStyle=$style;
+    $this->FontSizePt=$size;
+    $this->FontSize=$size/$this->k;
+    $this->CurrentFont=&$this->fonts[$fontkey];
+    if ($this->page>0)
             $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
     }
 
     function SetFontSize($size) {
-	//Set font size in points
-	if ($this->FontSizePt==$size)
+    //Set font size in points
+    if ($this->FontSizePt==$size)
             return;
-	$this->FontSizePt=$size;
-	$this->FontSize=$size/$this->k;
-	if ($this->page>0)
+    $this->FontSizePt=$size;
+    $this->FontSize=$size/$this->k;
+    if ($this->page>0)
             $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
     }
 
     function AddLink() {
-	//Create a new internal link
-	$n=count($this->links)+1;
-	$this->links[$n]=array(0,0);
-	return $n;
+    //Create a new internal link
+    $n=count($this->links)+1;
+    $this->links[$n]=array(0,0);
+    return $n;
     }
 
     function SetLink($link,$y=0,$page=-1) {
-	//Set destination of internal link
-	if ($y==-1)
+    //Set destination of internal link
+    if ($y==-1)
             $y=$this->y;
-	if ($page==-1)
+    if ($page==-1)
             $page=$this->page;
-	$this->links[$link]=array($page,$y);
+    $this->links[$link]=array($page,$y);
     }
 
     function Link($x,$y,$w,$h,$link) {
-	//Put a link on the page
-	$this->PageLinks[$this->page][]=array($x*$this->k,$this->hPt-$y*$this->k,$w*$this->k,$h*$this->k,$link);
+    //Put a link on the page
+    $this->PageLinks[$this->page][]=array($x*$this->k,$this->hPt-$y*$this->k,$w*$this->k,$h*$this->k,$link);
     }
 
     function Text($x,$y,$txt) {
-	//Output a string
-	$s=sprintf('BT %.2f %.2f Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
-	if ($this->underline and $txt!='')
+    //Output a string
+    $s=sprintf('BT %.2f %.2f Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
+    if ($this->underline and $txt!='')
             $s.=' '.$this->_dounderline($x,$y,$txt);
-	if ($this->ColorFlag)
+    if ($this->ColorFlag)
             $s='q '.$this->TextColor.' '.$s.' Q';
-	$this->_out($s);
+    $this->_out($s);
     }
 
     function AcceptPageBreak() {
-	//Accept automatic page break or not
-	return $this->AutoPageBreak;
+    //Accept automatic page break or not
+    return $this->AutoPageBreak;
     }
 
     function Cell($w,$h=0,$txt='',$border=0,$ln=0,$align='',$fill=0,$link='') {
-	//Output a cell
-	$k=$this->k;
-	if ($this->y+$h>$this->PageBreakTrigger and !$this->InFooter and $this->AcceptPageBreak()) {
+    //Output a cell
+    $k=$this->k;
+    if ($this->y+$h>$this->PageBreakTrigger and !$this->InFooter and $this->AcceptPageBreak()) {
             //Automatic page break
             $x=$this->x;
             $ws=$this->ws;
@@ -597,17 +597,17 @@
                 $this->_out(sprintf('%.3f Tw',$ws*$k));
             }
         }
-	if ($w==0)
+    if ($w==0)
             $w=$this->w-$this->rMargin-$this->x;
-	$s='';
-	if ($fill==1 or $border==1) {
+    $s='';
+    if ($fill==1 or $border==1) {
             if ($fill==1)
                 $op=($border==1) ? 'B' : 'f';
             else
                 $op='S';
             $s=sprintf('%.2f %.2f %.2f %.2f re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
         }
-	if (is_string($border)) {
+    if (is_string($border)) {
             $x=$this->x;
             $y=$this->y;
             if (is_int(strpos($border,'L')))
@@ -619,7 +619,7 @@
             if (is_int(strpos($border,'B')))
                 $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
         }
-	if ($txt!='') {
+    if ($txt!='') {
             if ($align=='R')
                 $dx=$w-$this->cMargin-$this->GetStringWidth($txt);
             elseif ($align=='C')
@@ -637,31 +637,31 @@
             if ($link)
                 $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$this->GetStringWidth($txt),$this->FontSize,$link);
         }
-	if ($s)
+    if ($s)
             $this->_out($s);
-	$this->lasth=$h;
-	if ($ln>0) {
+    $this->lasth=$h;
+    if ($ln>0) {
             //Go to next line
             $this->y+=$h;
             if ($ln==1)
                 $this->x=$this->lMargin;
         }
-	else
+    else
             $this->x+=$w;
     }
 
     function MultiCell($w,$h,$txt,$border=0,$align='J',$fill=0) {
-	//Output text with automatic or explicit line breaks
-	$cw=&$this->CurrentFont['cw'];
-	if ($w==0)
+    //Output text with automatic or explicit line breaks
+    $cw=&$this->CurrentFont['cw'];
+    if ($w==0)
             $w=$this->w-$this->rMargin-$this->x;
-	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s=str_replace("\r",'',$txt);
-	$nb=strlen($s);
-	if ($nb>0 and $s[$nb-1]=="\n")
+    $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+    $s=str_replace("\r",'',$txt);
+    $nb=strlen($s);
+    if ($nb>0 and $s[$nb-1]=="\n")
             $nb--;
-	$b=0;
-	if ($border) {
+    $b=0;
+    if ($border) {
             if ($border==1) {
                 $border='LTRB';
                 $b='LRT';
@@ -677,13 +677,13 @@
                     $b=is_int(strpos($border,'T')) ? $b2.'T' : $b2;
                 }
         }
-	$sep=-1;
-	$i=0;
-	$j=0;
-	$l=0;
-	$ns=0;
-	$nl=1;
-	while ($i<$nb) {
+    $sep=-1;
+    $i=0;
+    $j=0;
+    $l=0;
+    $ns=0;
+    $nl=1;
+    while ($i<$nb) {
             //Get next character
             $c=$s{$i};
             if ($c=="\n") {
@@ -740,30 +740,30 @@
             else
                 $i++;
         }
-	//Last chunk
-	if ($this->ws>0) {
+    //Last chunk
+    if ($this->ws>0) {
             $this->ws=0;
             $this->_out('0 Tw');
         }
-	if ($border and is_int(strpos($border,'B')))
+    if ($border and is_int(strpos($border,'B')))
             $b.='B';
-	$this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
-	$this->x=$this->lMargin;
+    $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+    $this->x=$this->lMargin;
     }
 
     function Write($h,$txt,$link='') {
-	//Output text in flowing mode
-	$cw=&$this->CurrentFont['cw'];
-	$w=$this->w - $this->rMargin - $this->x;
-	$wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
-	$s=str_replace("\r",'',$txt);
-	$nb=strlen($s);
-	$sep=-1;
-	$i=0;
-	$j=0;
-	$l=0;
-	$nl=1;
-	while($i<$nb) {
+    //Output text in flowing mode
+    $cw=&$this->CurrentFont['cw'];
+    $w=$this->w - $this->rMargin - $this->x;
+    $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+    $s=str_replace("\r",'',$txt);
+    $nb=strlen($s);
+    $sep=-1;
+    $i=0;
+    $j=0;
+    $l=0;
+    $nl=1;
+    while($i<$nb) {
             //Get next character
             $c=$s{$i};
             if ($c=="\n") {
@@ -818,14 +818,14 @@
             else
                 $i++;
         }
-	//Last chunk
-	if ($i!=$j)
+    //Last chunk
+    if ($i!=$j)
             $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j),0,0,'',0,$link);
     }
 
     function Image($file,$x,$y,$w=0,$h=0,$type='',$link='') {
-	//Put an image on the page
-	if (!isset($this->images[$file])) {
+    //Put an image on the page
+    if (!isset($this->images[$file])) {
             //First use of image, get info
             if ($type=='') {
                 $pos=strrpos($file,'.');
@@ -854,77 +854,77 @@
             $info['i']=count($this->images)+1;
             $this->images[$file]=$info;
         }
-	else
+    else
             $info=$this->images[$file];
-	//Automatic width and height calculation if needed
-	if ($w==0 and $h==0) {
+    //Automatic width and height calculation if needed
+    if ($w==0 and $h==0) {
             //Put image at 72 dpi
             $w=$info['w']/$this->k;
             $h=$info['h']/$this->k;
         }
-	if ($w==0)
+    if ($w==0)
             $w=$h*$info['w']/$info['h'];
-	if ($h==0)
+    if ($h==0)
             $h=$w*$info['h']/$info['w'];
-	$this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
-	if ($link)
+    $this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
+    if ($link)
             $this->Link($x,$y,$w,$h,$link);
     }
 
     function Ln($h='') {
-	//Line feed; default value is last cell height
-	$this->x=$this->lMargin;
-	if (is_string($h))
+    //Line feed; default value is last cell height
+    $this->x=$this->lMargin;
+    if (is_string($h))
             $this->y+=$this->lasth;
-	else
+    else
             $this->y+=$h;
     }
 
     function GetX() {
-	//Get x position
-	return $this->x;
+    //Get x position
+    return $this->x;
     }
 
     function SetX($x) {
-	//Set x position
-	if ($x>=0)
+    //Set x position
+    if ($x>=0)
             $this->x=$x;
-	else
+    else
             $this->x=$this->w+$x;
     }
 
     function GetY() {
-	//Get y position
-	return $this->y;
+    //Get y position
+    return $this->y;
     }
 
     function SetY($y) {
-	//Set y position and reset x
-	$this->x=$this->lMargin;
-	if ($y>=0)
+    //Set y position and reset x
+    $this->x=$this->lMargin;
+    if ($y>=0)
             $this->y=$y;
-	else
+    else
             $this->y=$this->h+$y;
     }
 
     function SetXY($x,$y) {
-	//Set x and y positions
-	$this->SetY($y);
-	$this->SetX($x);
+    //Set x and y positions
+    $this->SetY($y);
+    $this->SetX($x);
     }
 
     function Output($name='',$dest='') {
-	//Output PDF to some destination
-	global $HTTP_SERVER_VARS;
+    //Output PDF to some destination
+    global $HTTP_SERVER_VARS;
 
-	//Finish document if necessary
-	if ($this->state<3)
+    //Finish document if necessary
+    if ($this->state<3)
             $this->Close();
-	//Normalize parameters
-	if (is_bool($dest))
+    //Normalize parameters
+    if (is_bool($dest))
             $dest = $dest ? 'D' : 'F';
-	$dest = strtoupper($dest);
-	if ($dest=='') {
+    $dest = strtoupper($dest);
+    if ($dest=='') {
             if ($name=='') {
                 $name='doc.pdf';
                 $dest='I';
@@ -932,7 +932,7 @@
             else
                 $dest='F';
         }
-	switch($dest) {
+    switch($dest) {
         case 'I':
             //Send to standard output
             if (isset($HTTP_SERVER_VARS['SERVER_NAME'])) {
@@ -971,7 +971,7 @@
         default:
             $this->Error('Incorrect output destination: '.$dest);
         }
-	return '';
+    return '';
     }
 
     /*******************************************************************************
@@ -980,44 +980,44 @@
      *                                                                              *
      *******************************************************************************/
     function _dochecks() {
-	//Check for locale-related bug. we must have "." as comma seperator
-	$attempts = array("C","en","en_us","English");
-	$i = 0;
-	while (1.1 == 1 and $i++ < count($attempts)) {
+    //Check for locale-related bug. we must have "." as comma seperator
+    $attempts = array("C","en","en_us","English");
+    $i = 0;
+    while (1.1 == 1 and $i++ < count($attempts)) {
             setlocale(LC_NUMERIC,$attempts[$i]);
-	}
-	if (1.1 == 1) {
+    }
+    if (1.1 == 1) {
             $this->Error('1.1 == 1: Wrong locale with comma as dot. German? Don\'t alter the locale before including class file');
-	}
-	//Check for decimal separator
-	if (sprintf('%.1f',1.0)!='1.0')
+    }
+    //Check for decimal separator
+    if (sprintf('%.1f',1.0)!='1.0')
             setlocale(LC_NUMERIC,'C');
     }
 
     function _begindoc() {
-	//Start document
-	$this->state=1;
-	$this->_out('%PDF-1.3');
+    //Start document
+    $this->state=1;
+    $this->_out('%PDF-1.3');
     }
 
     function _putpages() {
-	$nb=$this->page;
-	if (!empty($this->AliasNbPages)) {
+    $nb=$this->page;
+    if (!empty($this->AliasNbPages)) {
             //Replace number of pages
             for($n=1;$n<=$nb;$n++)
                 $this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
         }
-	if ($this->DefOrientation=='P') {
+    if ($this->DefOrientation=='P') {
             $wPt=$this->fwPt;
             $hPt=$this->fhPt;
         }
-	else
+    else
             {
-		$wPt=$this->fhPt;
-		$hPt=$this->fwPt;
+        $wPt=$this->fhPt;
+        $hPt=$this->fwPt;
             }
-	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-	for($n=1;$n<=$nb;$n++) {
+    $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+    for($n=1;$n<=$nb;$n++) {
             //Page
             $this->_newobj();
             $this->_out('<</Type /Page');
@@ -1051,33 +1051,33 @@
             $this->_putstream($p);
             $this->_out('endobj');
         }
-	//Pages root
-	$this->offsets[1]=strlen($this->buffer);
-	$this->_out('1 0 obj');
-	$this->_out('<</Type /Pages');
-	$kids='/Kids [';
-	for($i=0;$i<$nb;$i++)
+    //Pages root
+    $this->offsets[1]=strlen($this->buffer);
+    $this->_out('1 0 obj');
+    $this->_out('<</Type /Pages');
+    $kids='/Kids [';
+    for($i=0;$i<$nb;$i++)
             $kids.=(3+2*$i).' 0 R ';
-	$this->_out($kids.']');
-	$this->_out('/Count '.$nb);
-	$this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$wPt,$hPt));
-	$this->_out('>>');
-	$this->_out('endobj');
+    $this->_out($kids.']');
+    $this->_out('/Count '.$nb);
+    $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$wPt,$hPt));
+    $this->_out('>>');
+    $this->_out('endobj');
     }
 
     function _putfonts() {
-	$nf=$this->n;
-	foreach($this->diffs as $diff) {
+    $nf=$this->n;
+    foreach($this->diffs as $diff) {
             //Encodings
             $this->_newobj();
             $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
             $this->_out('endobj');
         }
-	if (!check_php_version(5,3)) {
-		$mqr=get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-	}
-	foreach($this->FontFiles as $file=>$info) {
+    if (!check_php_version(5,3)) {
+        $mqr=get_magic_quotes_runtime();
+        set_magic_quotes_runtime(0);
+    }
+    foreach($this->FontFiles as $file=>$info) {
             //Font file embedding
             $this->_newobj();
             $this->FontFiles[$file]['n']=$this->n;
@@ -1098,10 +1098,10 @@
             fclose($f);
             $this->_out('endobj');
         }
-	if (!check_php_version(5,3)) {
-		set_magic_quotes_runtime($mqr);
-	}
-	foreach($this->fonts as $k=>$font) {
+    if (!check_php_version(5,3)) {
+        set_magic_quotes_runtime($mqr);
+    }
+    foreach($this->fonts as $k=>$font) {
             //Font objects
             $this->fonts[$k]['n']=$this->n+1;
             $type=$font['type'];
@@ -1165,9 +1165,9 @@
     }
 
     function _putimages() {
-	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
-	reset($this->images);
-	while(list($file,$info)=each($this->images)) {
+    $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+    reset($this->images);
+    while(list($file,$info)=each($this->images)) {
             $this->_newobj();
             $this->images[$file]['n']=$this->n;
             $this->_out('<</Type /XObject');
@@ -1208,117 +1208,117 @@
     }
 
     function _putresources() {
-	$this->_putfonts();
-	$this->_putimages();
-	//Resource dictionary
-	$this->offsets[2]=strlen($this->buffer);
-	$this->_out('2 0 obj');
-	$this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
-	$this->_out('/Font <<');
-	foreach($this->fonts as $font)
+    $this->_putfonts();
+    $this->_putimages();
+    //Resource dictionary
+    $this->offsets[2]=strlen($this->buffer);
+    $this->_out('2 0 obj');
+    $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
+    $this->_out('/Font <<');
+    foreach($this->fonts as $font)
             $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
-	$this->_out('>>');
-	if (count($this->images)) {
+    $this->_out('>>');
+    if (count($this->images)) {
             $this->_out('/XObject <<');
             foreach($this->images as $image)
                 $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
             $this->_out('>>');
         }
-	$this->_out('>>');
-	$this->_out('endobj');
+    $this->_out('>>');
+    $this->_out('endobj');
     }
 
     function _putinfo() {
-	if (!empty($this->producer))
+    if (!empty($this->producer))
             $this->_out('/Producer '.$this->_textstring($this->producer));
-	if (!empty($this->title))
+    if (!empty($this->title))
             $this->_out('/Title '.$this->_textstring($this->title));
-	if (!empty($this->subject))
+    if (!empty($this->subject))
             $this->_out('/Subject '.$this->_textstring($this->subject));
-	if (!empty($this->author))
+    if (!empty($this->author))
             $this->_out('/Author '.$this->_textstring($this->author));
-	if (!empty($this->keywords))
+    if (!empty($this->keywords))
             $this->_out('/Keywords '.$this->_textstring($this->keywords));
-	if (!empty($this->creator))
+    if (!empty($this->creator))
             $this->_out('/Creator '.$this->_textstring($this->creator));
-	$this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis')));
+    $this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis')));
     }
 
     function _putcatalog() {
-	$this->_out('/Type /Catalog');
-	$this->_out('/Pages 1 0 R');
-	if ($this->ZoomMode=='fullpage')
+    $this->_out('/Type /Catalog');
+    $this->_out('/Pages 1 0 R');
+    if ($this->ZoomMode=='fullpage')
             $this->_out('/OpenAction [3 0 R /Fit]');
-	elseif ($this->ZoomMode=='fullwidth')
+    elseif ($this->ZoomMode=='fullwidth')
             $this->_out('/OpenAction [3 0 R /FitH null]');
-	elseif ($this->ZoomMode=='real')
+    elseif ($this->ZoomMode=='real')
             $this->_out('/OpenAction [3 0 R /XYZ null null 1]');
-	elseif (!is_string($this->ZoomMode))
+    elseif (!is_string($this->ZoomMode))
             $this->_out('/OpenAction [3 0 R /XYZ null null '.($this->ZoomMode/100).']');
-	if ($this->LayoutMode=='single')
+    if ($this->LayoutMode=='single')
             $this->_out('/PageLayout /SinglePage');
-	elseif ($this->LayoutMode=='continuous')
+    elseif ($this->LayoutMode=='continuous')
             $this->_out('/PageLayout /OneColumn');
-	elseif ($this->LayoutMode=='two')
+    elseif ($this->LayoutMode=='two')
             $this->_out('/PageLayout /TwoColumnLeft');
     }
 
     function _puttrailer() {
-	$this->_out('/Size '.($this->n+1));
-	$this->_out('/Root '.$this->n.' 0 R');
-	$this->_out('/Info '.($this->n-1).' 0 R');
+    $this->_out('/Size '.($this->n+1));
+    $this->_out('/Root '.$this->n.' 0 R');
+    $this->_out('/Info '.($this->n-1).' 0 R');
     }
 
     function _enddoc() {
-	$this->_putpages();
-	$this->_putresources();
-	//Info
-	$this->_newobj();
-	$this->_out('<<');
-	$this->_putinfo();
-	$this->_out('>>');
-	$this->_out('endobj');
-	//Catalog
-	$this->_newobj();
-	$this->_out('<<');
-	$this->_putcatalog();
-	$this->_out('>>');
-	$this->_out('endobj');
-	//Cross-ref
-	$o=strlen($this->buffer);
-	$this->_out('xref');
-	$this->_out('0 '.($this->n+1));
-	$this->_out('0000000000 65535 f ');
-	for($i=1;$i<=$this->n;$i++)
+    $this->_putpages();
+    $this->_putresources();
+    //Info
+    $this->_newobj();
+    $this->_out('<<');
+    $this->_putinfo();
+    $this->_out('>>');
+    $this->_out('endobj');
+    //Catalog
+    $this->_newobj();
+    $this->_out('<<');
+    $this->_putcatalog();
+    $this->_out('>>');
+    $this->_out('endobj');
+    //Cross-ref
+    $o=strlen($this->buffer);
+    $this->_out('xref');
+    $this->_out('0 '.($this->n+1));
+    $this->_out('0000000000 65535 f ');
+    for($i=1;$i<=$this->n;$i++)
             $this->_out(sprintf('%010d 00000 n ',$this->offsets[$i]));
-	//Trailer
-	$this->_out('trailer');
-	$this->_out('<<');
-	$this->_puttrailer();
-	$this->_out('>>');
-	$this->_out('startxref');
-	$this->_out($o);
-	$this->_out('%%EOF');
-	$this->state=3;
+    //Trailer
+    $this->_out('trailer');
+    $this->_out('<<');
+    $this->_puttrailer();
+    $this->_out('>>');
+    $this->_out('startxref');
+    $this->_out($o);
+    $this->_out('%%EOF');
+    $this->state=3;
     }
 
     function _beginpage($orientation) {
-	$this->page++;
-	$this->pages[$this->page]='';
-	$this->state=2;
-	$this->x=$this->lMargin;
-	$this->y=$this->tMargin;
-	$this->FontFamily='';
-	//Page orientation
-	if (!$orientation)
+    $this->page++;
+    $this->pages[$this->page]='';
+    $this->state=2;
+    $this->x=$this->lMargin;
+    $this->y=$this->tMargin;
+    $this->FontFamily='';
+    //Page orientation
+    if (!$orientation)
             $orientation=$this->DefOrientation;
-	else
+    else
             {
-		$orientation=strtoupper($orientation{0});
-		if ($orientation!=$this->DefOrientation)
+        $orientation=strtoupper($orientation{0});
+        if ($orientation!=$this->DefOrientation)
                     $this->OrientationChanges[$this->page]=true;
             }
-	if ($orientation!=$this->CurOrientation) {
+    if ($orientation!=$this->CurOrientation) {
             //Change orientation
             if ($orientation=='P') {
                 $this->wPt=$this->fwPt;
@@ -1339,30 +1339,30 @@
     }
 
     function _endpage() {
-	//End of page contents
-	$this->state=1;
+    //End of page contents
+    $this->state=1;
     }
 
     function _newobj() {
-	//Begin a new object
-	$this->n++;
-	$this->offsets[$this->n]=strlen($this->buffer);
-	$this->_out($this->n.' 0 obj');
+    //Begin a new object
+    $this->n++;
+    $this->offsets[$this->n]=strlen($this->buffer);
+    $this->_out($this->n.' 0 obj');
     }
 
     function _dounderline($x,$y,$txt) {
-	//Underline text
-	$up=$this->CurrentFont['up'];
-	$ut=$this->CurrentFont['ut'];
-	$w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
-	return sprintf('%.2f %.2f %.2f %.2f re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
+    //Underline text
+    $up=$this->CurrentFont['up'];
+    $ut=$this->CurrentFont['ut'];
+    $w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
+    return sprintf('%.2f %.2f %.2f %.2f re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
     }
 
-    function _parsegif ($file) 
-    { 
+    function _parsegif ($file)
+    {
         //Function by Jérôme Fenal
         //GIF class in pure PHP from Yamasoft (http://www.yamasoft.com/php-gif.zip)
-        require_once 'lib/gif.php'; 
+        require_once 'lib/gif.php';
 
         $h=0;
         $w=0;
@@ -1370,7 +1370,7 @@
 
         if (!$gif->loadFile($file, 0))
             $this->Error("GIF parser: unable to open file $file");
-  
+
         if ($gif->m_img->m_gih->m_bLocalClr) {
             $nColors = $gif->m_img->m_gih->m_nTableSize;
             $pal = $gif->m_img->m_gih->m_colorTable->toString();
@@ -1378,102 +1378,102 @@
                 $bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
             }
             $colspace='Indexed';
-	} elseif ($gif->m_gfh->m_bGlobalClr) {
+    } elseif ($gif->m_gfh->m_bGlobalClr) {
             $nColors = $gif->m_gfh->m_nTableSize;
             $pal = $gif->m_gfh->m_colorTable->toString();
             if ($bgColor != -1) {
                 $bgColor = $gif->m_gfh->m_colorTable->colorIndex($bgColor);
             }
             $colspace='Indexed';
-	} else {
+    } else {
             $nColors = 0;
             $bgColor = -1;
             $colspace='DeviceGray';
             $pal='';
-	}
+    }
 
-	$trns='';
-	if ($gif->m_img->m_bTrans && ($nColors > 0)) {
+    $trns='';
+    if ($gif->m_img->m_bTrans && ($nColors > 0)) {
             $trns=array($gif->m_img->m_nTrans);
-	}
+    }
 
-	$data=$gif->m_img->m_data;
-	$w=$gif->m_gfh->m_nWidth;
-	$h=$gif->m_gfh->m_nHeight;
+    $data=$gif->m_img->m_data;
+    $w=$gif->m_gfh->m_nWidth;
+    $h=$gif->m_gfh->m_nHeight;
 
-	if ($colspace=='Indexed' and empty($pal))
+    if ($colspace=='Indexed' and empty($pal))
             $this->Error('Missing palette in '.$file);
 
-	if ($this->compress) {
+    if ($this->compress) {
             $data = gzcompress($data);
             return array( 'w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>8, 'f'=>'FlateDecode', 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);
-	} else {
+    } else {
             return array( 'w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>8, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);
-	} 
     }
+    }
 
     function _parsejpg($file) {
-	//Extract info from a JPEG file
-	$a = GetImageSize($file);
-	if (!$a)
+    //Extract info from a JPEG file
+    $a = GetImageSize($file);
+    if (!$a)
             $this->Error('Missing or incorrect image file: '.$file);
-	if ($a[2]!=2)
+    if ($a[2]!=2)
             $this->Error('Not a JPEG file: '.$file);
-	if (!isset($a['channels']) or $a['channels']==3)
+    if (!isset($a['channels']) or $a['channels']==3)
             $colspace='DeviceRGB';
-	elseif ($a['channels']==4)
+    elseif ($a['channels']==4)
             $colspace='DeviceCMYK';
-	else
+    else
             $colspace='DeviceGray';
-	$bpc=isset($a['bits']) ? $a['bits'] : 8;
-	//Read whole file
-	$f=fopen($file,'rb');
-	$data='';
-	while(!feof($f))
+    $bpc=isset($a['bits']) ? $a['bits'] : 8;
+    //Read whole file
+    $f=fopen($file,'rb');
+    $data='';
+    while(!feof($f))
             $data.=fread($f,4096);
-	fclose($f);
-	return array('w'=>$a[0],'h'=>$a[1],'cs'=>$colspace,'bpc'=>$bpc,'f'=>'DCTDecode','data'=>$data);
+    fclose($f);
+    return array('w'=>$a[0],'h'=>$a[1],'cs'=>$colspace,'bpc'=>$bpc,'f'=>'DCTDecode','data'=>$data);
     }
 
     function _parsepng($file) {
-	//Extract info from a PNG file
-	$f=fopen($file,'rb');
-	if (!$f)
+    //Extract info from a PNG file
+    $f=fopen($file,'rb');
+    if (!$f)
             $this->Error('Can\'t open image file: '.$file);
-	//Check signature
-	if (fread($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
+    //Check signature
+    if (fread($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
             $this->Error('Not a PNG file: '.$file);
-	//Read header chunk
-	fread($f,4);
-	if (fread($f,4)!='IHDR')
+    //Read header chunk
+    fread($f,4);
+    if (fread($f,4)!='IHDR')
             $this->Error('Incorrect PNG file: '.$file);
-	$w=$this->_freadint($f);
-	$h=$this->_freadint($f);
-	$bpc=ord(fread($f,1));
-	if ($bpc>8)
+    $w=$this->_freadint($f);
+    $h=$this->_freadint($f);
+    $bpc=ord(fread($f,1));
+    if ($bpc>8)
             $this->Error('16-bit depth not supported: '.$file);
-	$ct=ord(fread($f,1));
-	if ($ct==0)
+    $ct=ord(fread($f,1));
+    if ($ct==0)
             $colspace='DeviceGray';
-	elseif ($ct==2)
+    elseif ($ct==2)
             $colspace='DeviceRGB';
-	elseif ($ct==3)
+    elseif ($ct==3)
             $colspace='Indexed';
-	else
+    else
             $this->Error('Alpha channel not supported: '.$file);
-	if (ord(fread($f,1))!=0)
+    if (ord(fread($f,1))!=0)
             $this->Error('Unknown compression method: '.$file);
-	if (ord(fread($f,1))!=0)
+    if (ord(fread($f,1))!=0)
             $this->Error('Unknown filter method: '.$file);
-	if (ord(fread($f,1))!=0)
+    if (ord(fread($f,1))!=0)
             $this->Error('Interlacing not supported: '.$file);
-	fread($f,4);
-	$parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
-	//Scan chunks looking for palette, transparency and image data
-	$pal='';
-	$trns='';
-	$data='';
-	do {
+    fread($f,4);
+    $parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
+    //Scan chunks looking for palette, transparency and image data
+    $pal='';
+    $trns='';
+    $data='';
+    do {
             $n=$this->_freadint($f);
             $type=fread($f,4);
             if ($type=='PLTE') {
@@ -1505,42 +1505,42 @@
             else
                 fread($f,$n+4);
         } while($n);
-	if ($colspace=='Indexed' and empty($pal))
+    if ($colspace=='Indexed' and empty($pal))
             $this->Error('Missing palette in '.$file);
-	fclose($f);
-	return array('w'=>$w,'h'=>$h,'cs'=>$colspace,'bpc'=>$bpc,'f'=>'FlateDecode','parms'=>$parms,'pal'=>$pal,'trns'=>$trns,'data'=>$data);
+    fclose($f);
+    return array('w'=>$w,'h'=>$h,'cs'=>$colspace,'bpc'=>$bpc,'f'=>'FlateDecode','parms'=>$parms,'pal'=>$pal,'trns'=>$trns,'data'=>$data);
     }
 
     function _freadint($f) {
-	//Read a 4-byte integer from file
-	$i=ord(fread($f,1))<<24;
-	$i+=ord(fread($f,1))<<16;
-	$i+=ord(fread($f,1))<<8;
-	$i+=ord(fread($f,1));
-	return $i;
+    //Read a 4-byte integer from file
+    $i=ord(fread($f,1))<<24;
+    $i+=ord(fread($f,1))<<16;
+    $i+=ord(fread($f,1))<<8;
+    $i+=ord(fread($f,1));
+    return $i;
     }
 
     function _textstring($s) {
-	//Format a text string
-	return '('.$this->_escape($s).')';
+    //Format a text string
+    return '('.$this->_escape($s).')';
     }
 
     function _escape($s) {
-	//Add \ before \, ( and )
-	return str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$s)));
+    //Add \ before \, ( and )
+    return str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$s)));
     }
 
     function _putstream($s) {
-	$this->_out('stream');
-	$this->_out($s);
-	$this->_out('endstream');
+    $this->_out('stream');
+    $this->_out($s);
+    $this->_out('endstream');
     }
 
     function _out($s) {
-	//Add a line to the document
-	if ($this->state == 2)
+    //Add a line to the document
+    if ($this->state == 2)
             $this->pages[$this->page].=$s."\n";
-	else
+    else
             $this->buffer.=$s."\n";
     }
 } //End of class
@@ -1548,8 +1548,8 @@
 }
 
 //Handle special IE contype request
-if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']) and 
-    $HTTP_SERVER_VARS['HTTP_USER_AGENT']=='contype') 
+if (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']) and
+    $HTTP_SERVER_VARS['HTTP_USER_AGENT']=='contype')
 {
     Header('Content-Type: application/pdf');
     exit;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/gif.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/gif.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/gif.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -81,7 +81,7 @@
             if(@fileSize($lpszFileName) > 0) {
                 return true;
             }
-          
+
             @unLink($lpszFileName);
         }
     }
@@ -106,7 +106,7 @@
     else {
         return false;
     }
-  
+
     return true;
 }
 
@@ -143,7 +143,7 @@
         while(($iIndex = $this->LZWCommand($data, false)) >= 0) {
             $ret .= chr($iIndex);
         }
-      
+
         $datLen = $stLen - strlen($data);
 
         if($iIndex != -2) {
@@ -157,7 +157,7 @@
         if($bInit) {
             $this->SetCodeSize = ord($data{0});
             $data = substr($data, 1);
-          
+
             $this->CodeSize    = $this->SetCodeSize + 1;
             $this->ClearCode   = 1 << $this->SetCodeSize;
             $this->EndCode     = $this->ClearCode + 1;
@@ -188,7 +188,7 @@
                 $this->OldCode   = $this->FirstCode;
             }
             while($this->FirstCode == $this->ClearCode);
-          
+
             return $this->FirstCode;
         }
 
@@ -233,7 +233,7 @@
             while($Code >= $this->ClearCode) {
                 $this->Stack[$this->sp] = $this->Vals[$Code];
                 $this->sp++;
-              
+
                 if($Code == $this->Next[$Code]) // Circular table entry, big GIF Error!
                     return -1;
 
@@ -282,36 +282,36 @@
                 }
                 return -1;
             }
-          
+
             $this->Buf[0] = $this->Buf[$this->LastByte - 2];
             $this->Buf[1] = $this->Buf[$this->LastByte - 1];
-          
+
             $Count = ord($data{0});
             $data  = substr($data, 1);
-          
-			if($Count) {
-				for($i = 0; $i < $Count; $i++) {
-					$this->Buf[2 + $i] = ord($data{$i});
-				}
-				$data = substr($data, $Count);
-			}
-			else {
-				$this->Done = 1;
-			}
 
-			$this->LastByte = 2 + $Count;
-			$this->CurBit   = ($this->CurBit - $this->LastBit) + 16;
-			$this->LastBit  = (2 + $Count) << 3;
-		}
+            if($Count) {
+                for($i = 0; $i < $Count; $i++) {
+                    $this->Buf[2 + $i] = ord($data{$i});
+                }
+                $data = substr($data, $Count);
+            }
+            else {
+                $this->Done = 1;
+            }
 
-		$iRet = 0;
-		for($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
-			$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
-		}
+            $this->LastByte = 2 + $Count;
+            $this->CurBit   = ($this->CurBit - $this->LastBit) + 16;
+            $this->LastBit  = (2 + $Count) << 3;
+        }
 
-		$this->CurBit += $this->CodeSize;
-		return $iRet;
-	}
+        $iRet = 0;
+        for($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
+            $iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+        }
+
+        $this->CurBit += $this->CodeSize;
+        return $iRet;
+    }
 }
 
 class CGIFCOLORTABLE
@@ -701,7 +701,7 @@
             return false;
         }
         $data = @fRead($fh, @fileSize($lpszFileName));
-        //		@fClose($fh);
+        //        @fClose($fh);
         //      $data=fread($fh,filesize($lpszFileName));
         while(!feof($fh)) {
             $data = $data . @fread($fh, 1024);
@@ -725,10 +725,10 @@
 
             $this->m_bLoaded = true;
             return true;
-	}
+    }
 
-	function getSize($lpszFileName, &$width, &$height)
-	{
+    function getSize($lpszFileName, &$width, &$height)
+    {
             if(!($fh = @fOpen($lpszFileName, "rb"))) {
                 return false;
             }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/imagecache.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/imagecache.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/imagecache.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: imagecache.php 7417 2010-05-19 12:57:42Z vargenau $');
+<?php // $Id: imagecache.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2002 Johannes Große
  *
@@ -15,9 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */ 
+ */
 
 /**
  * Gets an image from the cache and prints it to the browser.
@@ -50,7 +50,7 @@
     }
     elseif ($this->isPost()) {
         global $HTTP_GET_VARS;
-        if (isset($HTTP_GET_VARS['pagename'])) { 
+        if (isset($HTTP_GET_VARS['pagename'])) {
             return $HTTP_GET_VARS['pagename'];
         }
     }
@@ -58,7 +58,7 @@
     $query_string = $request->get('QUERY_STRING');
     if (preg_match('/^[^&=]+$/', $query_string))
         return urldecode($query_string);
-    
+
     return HOME_PAGE;
 }
 
@@ -70,7 +70,7 @@
         return $HTTP_SERVER_VARS['PHP_AUTH_USER'];
     if (!empty($HTTP_ENV_VARS['REMOTE_USER']))
         return $HTTP_ENV_VARS['REMOTE_USER'];
-    
+
     if ($user = $request->getSessionVar('wiki_user')) {
         $request->_user = $user;
         $request->_user->_authhow = 'session';
@@ -88,12 +88,12 @@
 /**
  * Initializes PhpWiki and calls the plugin specified in the url to
  * produce an image. Furthermore, allow the usage of Apache's
- * ErrorDocument mechanism in order to make this file only called when 
+ * ErrorDocument mechanism in order to make this file only called when
  * image could not be found in the cache.
  * (see doc/README.phpwiki-cache for further information).
  */
 function mainImageCache() {
-    $request = new Request;   
+    $request = new Request;
     // normalize pagename
     $request->setArg('pagename', deducePagename($request));
     $pagename = $request->getArg('pagename');
@@ -102,13 +102,13 @@
         $request->_user = new _AnonUser();
         $request->_prefs =& $request->_user->_prefs;
     } else {
-    	$request->_user = new WikiUser($request);
+        $request->_user = new WikiUser($request);
         $request->_prefs = new UserPreferences();
     }
-    
+
     // Enable the output of most of the warning messages.
     // The warnings will screw up zip files and setpref though.
-    // They will also screw up my images... But I think 
+    // They will also screw up my images... But I think
     // we should keep them.
     global $ErrorManager;
     $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE);
@@ -127,24 +127,24 @@
 
         $uri = $request->get('REDIRECT_URL');
         $query = $request->get('REDIRECT_QUERY_STRING');
-        $uri .= $query ? '?'.$query : '';        
+        $uri .= $query ? '?'.$query : '';
 
         if (!$uri) {
             $uri = $request->get('REQUEST_URI');
         }
         if (!$uri) {
-            $cache->printError( 'png', 
+            $cache->printError( 'png',
                 'Could not deduce image identifier or creation'
                 . ' parameters. (Neither REQUEST nor REDIRECT'
-                . ' obtained.)' ); 
+                . ' obtained.)' );
             return;
-        }    
+        }
         //$cacheparams = $GLOBALS['CacheParams'];
         if (!preg_match(':^(.*/)?'.PLUGIN_CACHED_FILENAME_PREFIX.'([^\?/]+)\.img(\?args=([^\?&]*))?$:', $uri, $matches)) {
             $cache->printError('png', "I do not understand this URL: $uri");
             return;
-        }        
-        
+        }
+
         $request->setArg('id', $matches[2]);
         if ($matches[4]) {
             // md5 args?
@@ -166,5 +166,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/imdb.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/imdb.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/imdb.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: imdb.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: imdb.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004 Reini Urban
  *
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -363,5 +363,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/install.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/install.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/install.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: install.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: install.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -49,7 +49,7 @@
     }
     // setup default settings
     if (!$already and !defined("_PHPWIKI_INSTALL_RUNNING")) {
-    	define("_PHPWIKI_INSTALL_RUNNING", true);
+        define("_PHPWIKI_INSTALL_RUNNING", true);
         include(dirname(__FILE__)."/../configurator.php");
     }
     $already = 1;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/interwiki.map
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/interwiki.map	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/interwiki.map	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,10 @@
 Category Category
 Help Help/
+Hilfe Hilfe/
+Ayuda Ayuda/
+Aide Aide/
+Aiuto Aiuto/
+Hj%C3%A4lp Hj%C3%A4lp/
 Relation SearchRelations?s=
 Talk %s/Discussion
 User %s

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/loadsave.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/loadsave.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/loadsave.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: loadsave.php 7739 2010-11-10 16:51:32Z vargenau $');
+// $Id: loadsave.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 1999,2000,2001,2002,2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -28,7 +28,7 @@
 /**
  * ignore fatal errors during dump
  */
-function _dump_error_handler(&$error) {
+function _dump_error_handler($error) {
     if ($error->isFatal()) {
         $error->errno = E_USER_WARNING;
         return true;
@@ -217,12 +217,12 @@
 {
     $enc = rawurlencode($pagename);
     if (!$action) {
-    	global $request;
-	$action = $request->getArg('action');
+        global $request;
+    $action = $request->getArg('action');
     }
     if ($action != 'dumpserial') { // zip, ziphtml, dumphtml
-	// For every %2F we will need to mkdir -p dirname($pagename)
-	$enc = preg_replace('/%2F/', '/', $enc);
+    // For every %2F we will need to mkdir -p dirname($pagename)
+    $enc = preg_replace('/%2F/', '/', $enc);
     }
     $enc = preg_replace('/^\./', '%2E', $enc);
     $enc = preg_replace('/%20/', ' ',   $enc);
@@ -250,7 +250,7 @@
     }
     $include_empty = false;
     if ($request->getArg('include') == 'empty') {
-	$include_empty = true;
+    $include_empty = true;
     }
 
     $zip = new ZipWriter("Created by PhpWiki " . PHPWIKI_VERSION, $zipname);
@@ -276,8 +276,8 @@
     $timeout = (! $request->getArg('start_debug')) ? 30 : 240;
 
     while ($page = $page_iter->next()) {
-	$request->args = $request_args; // some plugins might change them (esp. on POST)
-        longer_timeout($timeout); 	// Reset watchdog
+    $request->args = $request_args; // some plugins might change them (esp. on POST)
+        longer_timeout($timeout);     // Reset watchdog
 
         $current = $page->getCurrentRevision();
         if ($current->getVersion() == 0)
@@ -339,7 +339,7 @@
     }
     $include_empty = false;
     if ($request->getArg('include') == 'empty') {
-	$include_empty = true;
+    $include_empty = true;
     }
     if ($pages = $request->getArg('pages')) {  // which pagenames
         if ($pages == '[]') // current page
@@ -353,8 +353,8 @@
     $timeout = (! $request->getArg('start_debug')) ? 30 : 240;
 
     while ($page = $page_iter->next()) {
-	$request->args = $request_args; // some plugins might change them (esp. on POST)
-        longer_timeout($timeout); 	// Reset watchdog
+    $request->args = $request_args; // some plugins might change them (esp. on POST)
+        longer_timeout($timeout);     // Reset watchdog
 
         $pagename = $page->getName();
         if (!isa($request,'MockRequest')) {
@@ -412,16 +412,16 @@
 function mkdir_p($pathname, $permission = 0777) {
     $arr = explode("/", $pathname);
     if (empty($arr)) {
-	return mkdir($pathname, $permission);
+    return mkdir($pathname, $permission);
     }
     $s = array_shift($arr);
     $ok = TRUE;
     foreach ($arr as $p) {
-	$curr = "$s/$p";
-	if (!is_dir($curr))
-	    $ok = mkdir($curr, $permission);
-	$s = $curr;
-	if (!$ok) return FALSE;
+    $curr = "$s/$p";
+    if (!is_dir($curr))
+        $ok = mkdir($curr, $permission);
+    $s = $curr;
+    if (!$ok) return FALSE;
     }
     return TRUE;
 }
@@ -531,12 +531,12 @@
     global $WikiTheme, $request, $ErrorManager;
     $silent = true; $zip = false; $directory = false;
     if ($WikiTheme->DUMP_MODE == 'HTML') {
-	$directory = $target;
-	$silent = false;
+        $directory = $target;
+        $silent = false;
     } elseif ($WikiTheme->DUMP_MODE == 'PDFHTML') {
-	$directory = $target;
+        $directory = $target;
     } elseif (is_object($target)) { // $WikiTheme->DUMP_MODE == 'ZIPHTML'
-	$zip = $target;
+        $zip = $target;
     }
 
     $request->_TemplatesProcessed = array();
@@ -547,176 +547,180 @@
     }
     $WikiTheme->VALID_LINKS = array();
     if ($request->getArg('format')) { // pagelist
-	$page_iter_sav = $page_iter;
-	foreach ($page_iter_sav->asArray() as $handle) {
-	    $WikiTheme->VALID_LINKS[] = is_string($handle) ? $handle : $handle->getName();
-	}
-	$page_iter_sav->reset();
+        $page_iter_sav = $page_iter;
+        foreach ($page_iter_sav->asArray() as $handle) {
+            $WikiTheme->VALID_LINKS[] = is_string($handle) ? $handle : $handle->getName();
+        }
+        $page_iter_sav->reset();
     }
 
-    if (defined('HTML_DUMP_SUFFIX'))
+    if (defined('HTML_DUMP_SUFFIX')) {
         $WikiTheme->HTML_DUMP_SUFFIX = HTML_DUMP_SUFFIX;
-    $_bodyAttr = @$WikiTheme->_MoreAttr['body'];
-    unset($WikiTheme->_MoreAttr['body']);
+    }
+    if (isset($WikiTheme->_MoreAttr['body'])) {
+        $_bodyAttr = $WikiTheme->_MoreAttr['body'];
+        unset($WikiTheme->_MoreAttr['body']);
+    }
 
     $ErrorManager->pushErrorHandler(new WikiFunctionCb('_dump_error_handler'));
 
     // check if the dumped file will be accessible from outside
     $doc_root = $request->get("DOCUMENT_ROOT");
     if ($WikiTheme->DUMP_MODE == 'HTML') {
-	$ldir = NormalizeLocalFileName($directory);
-	$wikiroot = NormalizeLocalFileName('');
-	if (string_starts_with($ldir, $doc_root)) {
-	    $link_prefix = substr($directory, strlen($doc_root))."/";
-	} elseif (string_starts_with($ldir, $wikiroot)) {
-	    $link_prefix = NormalizeWebFileName(substr($directory, strlen($wikiroot)))."/";
-	} else {
-	    $prefix = '';
-	    if (isWindows()) {
-		$prefix = '/'; // . substr($doc_root,0,2); // add drive where apache is installed
-	    }
-	    $link_prefix = "file://".$prefix.$directory."/";
-	}
+        $ldir = NormalizeLocalFileName($directory);
+        $wikiroot = NormalizeLocalFileName('');
+        if (string_starts_with($ldir, $doc_root)) {
+            $link_prefix = substr($directory, strlen($doc_root))."/";
+        } elseif (string_starts_with($ldir, $wikiroot)) {
+            $link_prefix = NormalizeWebFileName(substr($directory, strlen($wikiroot)))."/";
+        } else {
+            $prefix = '';
+            if (isWindows()) {
+                $prefix = '/'; // . substr($doc_root,0,2); // add drive where apache is installed
+            }
+            $link_prefix = "file://".$prefix.$directory."/";
+        }
     } else {
-	$link_prefix = "";
+        $link_prefix = "";
     }
 
     $request_args = $request->args;
     $timeout = (! $request->getArg('start_debug')) ? 60 : 240;
     if ($directory) {
-    	if (isWindows())
-    	    $directory = str_replace("\\", "/", $directory); // no Win95 support.
-	@mkdir("$directory/images");
+        if (isWindows())
+            $directory = str_replace("\\", "/", $directory); // no Win95 support.
+        if (!is_dir("$directory/images"))
+            mkdir("$directory/images");
     }
     $already = array();
     $outfiles = array();
     $already_images = array();
 
     while ($page = $page_iter->next()) {
-    	if (is_string($page)) {
+        if (is_string($page)) {
             $pagename = $page;
             $page = $request->_dbi->getPage($pagename);
-    	} else {
+        } else {
             $pagename = $page->getName();
-    	}
-	if (empty($firstpage)) $firstpage = $pagename;
-	if (array_key_exists($pagename, $already))
-	    continue;
-	$already[$pagename] = 1;
+        }
+        if (empty($firstpage)) $firstpage = $pagename;
+        if (array_key_exists($pagename, $already))
+            continue;
+        $already[$pagename] = 1;
         $current = $page->getCurrentRevision();
         //if ($current->getVersion() == 0)
         //    continue;
 
-	$request->args = $request_args; // some plugins might change them (esp. on POST)
-        longer_timeout($timeout); 	// Reset watchdog
+        $request->args = $request_args; // some plugins might change them (esp. on POST)
+        longer_timeout($timeout);     // Reset watchdog
 
-	if ($zip) {
-	    $attrib = array('mtime'    => $current->get('mtime'),
+        if ($zip) {
+            $attrib = array('mtime'    => $current->get('mtime'),
                             'is_ascii' => 1);
-	    if ($page->get('locked'))
-		$attrib['write_protected'] = 1;
-	} elseif (!$silent) {
-	    if (!isa($request,'MockRequest')) {
-		PrintXML(HTML::br(), $pagename, ' ... ');
-		flush();
-	    }
+            if ($page->get('locked'))
+                $attrib['write_protected'] = 1;
+        } elseif (!$silent) {
+            if (!isa($request,'MockRequest')) {
+                PrintXML(HTML::br(), $pagename, ' ... ');
+                flush();
+            }
         }
         if (in_array($pagename, $excludeList)) {
-	    if (!$silent and !isa($request,'MockRequest')) {
-		PrintXML(_("Skipped."));
-		flush();
-	    }
+            if (!$silent and !isa($request,'MockRequest')) {
+                PrintXML(_("Skipped."));
+                flush();
+            }
             continue;
         }
         $relative_base = '';
         if ($WikiTheme->DUMP_MODE == 'PDFHTML')
-	    $request->setArg('action', 'pdf');   // to omit cache headers
+            $request->setArg('action', 'pdf');   // to omit cache headers
         $request->setArg('pagename', $pagename); // Template::_basepage fix
         $filename = FilenameForPage($pagename) . $WikiTheme->HTML_DUMP_SUFFIX;
-	$args = array('revision'      => $current,
-		      'CONTENT'       => $current->getTransformedContent(),
+        $args = array('revision'      => $current,
+                      'CONTENT'       => $current->getTransformedContent(),
                       'relative_base' => $relative_base);
-	// For every %2F will need to mkdir -p dirname($pagename)
-	if (preg_match("/(%2F|\/)/", $filename)) {
-	    // mkdir -p and set relative base for subdir pages
-	    $filename = preg_replace("/%2F/", "/", $filename);
-	    $count = substr_count($filename, "/");
-	    $dirname = dirname($filename);
-	    if ($directory)
-		mkdir_p($directory."/".$dirname);
-	    // Fails with "XX / YY", "XX" is created, "XX / YY" cannot be written
-	    // if (isWindows()) // interesting Windows bug: cannot mkdir "bla "
-	    // Since dumps needs to be copied, we have to disallow this for all platforms.
-	    $filename = preg_replace("/ \//", "/", $filename);
-	    $relative_base = "../";
-	    while ($count > 1) {
-		$relative_base .= "../";
-		$count--;
-	    }
-	    $args['relative_base'] = $relative_base;
-	}
+        // For every %2F will need to mkdir -p dirname($pagename)
+        if (preg_match("/(%2F|\/)/", $filename)) {
+            // mkdir -p and set relative base for subdir pages
+            $filename = preg_replace("/%2F/", "/", $filename);
+            $count = substr_count($filename, "/");
+            $dirname = dirname($filename);
+            if ($directory)
+                mkdir_p($directory."/".$dirname);
+            // Fails with "XX / YY", "XX" is created, "XX / YY" cannot be written
+            // if (isWindows()) // interesting Windows bug: cannot mkdir "bla "
+            // Since dumps needs to be copied, we have to disallow this for all platforms.
+            $filename = preg_replace("/ \//", "/", $filename);
+            $relative_base = "../";
+            while ($count > 1) {
+                $relative_base .= "../";
+                $count--;
+            }
+            $args['relative_base'] = $relative_base;
+        }
         $msg = HTML();
 
         $DUMP_MODE = $WikiTheme->DUMP_MODE;
         $data = GeneratePageasXML(new Template('browse', $request, $args),
-        			 $pagename, $current, $args);
+                     $pagename, $current, $args);
         $WikiTheme->DUMP_MODE = $DUMP_MODE;
 
-	if (preg_match_all("/<img .*?src=\"(\/.+?)\"/", $data, $m)) {
-	    // fix to local relative path for uploaded images, so that pdf will work
-	    foreach ($m[1] as $img_file) {
-	    	$base = basename($img_file);
-	    	$data = str_replace('src="'.$img_file.'"','src="images/'.$base.'"', $data);
-	        if (array_key_exists($img_file, $already_images))
-	            continue;
-	        $already_images[$img_file] = 1;
-		// resolve src from webdata to file
-		$src = $doc_root . $img_file;
-		if (file_exists($src) and $base) {
-		    if ($directory) {
-		        $target = "$directory/images/$base";
-			if (copy($src, $target)) {
-			    if (!$silent)
-				_copyMsg($img_file, fmt("... copied to %s", $target));
-			} else {
-			    if (!$silent)
-				_copyMsg($img_file, fmt("... not copied to %s", $target));
-			}
-		    } else {
-		    	$target = "images/$base";
-			$zip->addSrcFile($target, $src);
-		    }
-		}
-	    }
-	}
+        if (preg_match_all("/<img .*?src=\"(\/.+?)\"/", $data, $m)) {
+            // fix to local relative path for uploaded images, so that pdf will work
+            foreach ($m[1] as $img_file) {
+                $base = basename($img_file);
+                $data = str_replace('src="'.$img_file.'"','src="images/'.$base.'"', $data);
+                if (array_key_exists($img_file, $already_images))
+                    continue;
+                $already_images[$img_file] = 1;
+                // resolve src from webdata to file
+                $src = $doc_root . $img_file;
+                if (file_exists($src) and $base) {
+                    if ($directory) {
+                        $target = "$directory/images/$base";
+                        if (copy($src, $target)) {
+                            if (!$silent)
+                                _copyMsg($img_file, fmt("... copied to %s", $target));
+                        } else {
+                            if (!$silent)
+                                _copyMsg($img_file, fmt("... not copied to %s", $target));
+                        }
+                    } else {
+                        $target = "images/$base";
+                        $zip->addSrcFile($target, $src);
+                    }
+                }
+            }
+        }
 
-	if ($directory) {
-	    $outfile = $directory."/".$filename;
-	    if ( !($fd = fopen($outfile, "wb")) ) {
-		$msg->pushContent(HTML::strong(fmt("couldn't open file '%s' for writing",
-						   $outfile)));
-		$request->finish($msg);
-	    }
-	    $len = strlen($data);
-	    $num = fwrite($fd, $data, $len);
-	    if ($pagename != $filename) {
-		$link = LinkURL($link_prefix.$filename, $filename);
-		$msg->pushContent(HTML::small(_("saved as "), $link, " ... "));
-	    }
-	    $msg->pushContent(HTML::small(fmt("%s bytes written", $num), "\n"));
-	    if (!$silent) {
-		if (!isa($request, 'MockRequest')) {
-		    PrintXML($msg);
-		}
-		flush();
-		$request->chunkOutput();
-	    }
-	    assert($num == $len);
-	    fclose($fd);
-	    $outfiles[] = $outfile;
-	} else {
-	    $zip->addRegularFile($filename, $data, $attrib);
-	}
+    if ($directory) {
+        $outfile = $directory."/".$filename;
+        if ( !($fd = fopen($outfile, "wb")) ) {
+        $msg->pushContent(HTML::strong(fmt("couldn't open file '%s' for writing",
+                           $outfile)));
+        $request->finish($msg);
+        }
+        $len = strlen($data);
+        $num = fwrite($fd, $data, $len);
+        if ($pagename != $filename) {
+        $link = LinkURL($link_prefix.$filename, $filename);
+        $msg->pushContent(HTML::small(_("saved as "), $link, " ... "));
+        }
+        $msg->pushContent(HTML::small(fmt("%s bytes written", $num), "\n"));
+        if (!$silent) {
+        if (!isa($request, 'MockRequest')) {
+            PrintXML($msg);
+        }
+        flush();
+        $request->chunkOutput();
+        }
+        assert($num == $len);
+        fclose($fd);
+        $outfiles[] = $outfile;
+    } else {
+        $zip->addRegularFile($filename, $data, $attrib);
+    }
 
         if (USECACHE) {
             $request->_dbi->_cache->invalidate_cache($pagename);
@@ -729,10 +733,10 @@
         unset($msg);
         unset($current->_transformedContent);
         unset($current);
-	if (!empty($template)) {
-	    unset($template->_request);
-	    unset($template);
-	}
+    if (!empty($template)) {
+        unset($template->_request);
+        unset($template);
+    }
         unset($data);
     }
     $page_iter->free();
@@ -741,28 +745,28 @@
     if (!empty($WikiTheme->dumped_images) and is_array($WikiTheme->dumped_images)) {
         // @mkdir("$directory/images");
         foreach ($WikiTheme->dumped_images as $img_file) {
-	    if (array_key_exists($img_file, $already_images))
-	        continue;
-	    $already_images[$img_file] = 1;
+        if (array_key_exists($img_file, $already_images))
+            continue;
+        $already_images[$img_file] = 1;
             if ($img_file
                 and ($from = $WikiTheme->_findFile($img_file, true))
                 and basename($from))
             {
-		if ($directory) {
-		    $target = "$directory/images/".basename($from);
-		    if ($silent)
-			copy($WikiTheme->_path . $from, $target);
-		    else {
-			if (copy($WikiTheme->_path . $from, $target)) {
-			    _copyMsg($from, fmt("... copied to %s", $target));
-			} else {
-			    _copyMsg($from, fmt("... not copied to %s", $target));
-			}
-		    }
-		} else {
-		    $target = "images/".basename($from);
-		    $zip->addSrcFile($target, $WikiTheme->_path . $from);
-		}
+        if ($directory) {
+            $target = "$directory/images/".basename($from);
+            if ($silent)
+            copy($WikiTheme->_path . $from, $target);
+            else {
+            if (copy($WikiTheme->_path . $from, $target)) {
+                _copyMsg($from, fmt("... copied to %s", $target));
+            } else {
+                _copyMsg($from, fmt("... not copied to %s", $target));
+            }
+            }
+        } else {
+            $target = "images/".basename($from);
+            $zip->addSrcFile($target, $WikiTheme->_path . $from);
+        }
             } elseif (!$silent) {
                 _copyMsg($from, _("... not found"));
             }
@@ -772,32 +776,32 @@
     if (!empty($WikiTheme->dumped_buttons)
          and is_array($WikiTheme->dumped_buttons))
     {
-    	// Buttons also
-	if ($directory)
-	    @mkdir("$directory/images/buttons");
+        // Buttons also
+        if ($directory && !is_dir("$directory/images/buttons"))
+            mkdir("$directory/images/buttons");
         foreach ($WikiTheme->dumped_buttons as $text => $img_file) {
             if (array_key_exists($img_file, $already_images))
-	        continue;
-	    $already_images[$img_file] = 1;
+                continue;
+        $already_images[$img_file] = 1;
             if ($img_file
                 and ($from = $WikiTheme->_findFile($img_file, true))
                 and basename($from))
             {
-		if ($directory) {
-		    $target = "$directory/images/buttons/".basename($from);
-		    if ($silent)
-			copy($WikiTheme->_path . $from, $target);
-		    else {
-			if (copy($WikiTheme->_path . $from, $target)) {
-			    _copyMsg($from, fmt("... copied to %s", $target));
-			} else {
-			    _copyMsg($from, fmt("... not copied to %s", $target));
-			}
-		    }
-		} else {
-		    $target = "images/buttons/".basename($from);
-		    $zip->addSrcFile($target, $WikiTheme->_path . $from);
-		}
+        if ($directory) {
+            $target = "$directory/images/buttons/".basename($from);
+            if ($silent)
+            copy($WikiTheme->_path . $from, $target);
+            else {
+                if (copy($WikiTheme->_path . $from, $target)) {
+                    _copyMsg($from, fmt("... copied to %s", $target));
+                } else {
+                    _copyMsg($from, fmt("... not copied to %s", $target));
+                }
+            }
+        } else {
+            $target = "images/buttons/".basename($from);
+            $zip->addSrcFile($target, $WikiTheme->_path . $from);
+        }
             } elseif (!$silent) {
                 _copyMsg($from, _("... not found"));
             }
@@ -806,29 +810,29 @@
     if (!empty($WikiTheme->dumped_css) and is_array($WikiTheme->dumped_css)) {
         foreach ($WikiTheme->dumped_css as $css_file) {
             if (array_key_exists($css_file, $already_images))
-	        continue;
-	    $already_images[$css_file] = 1;
+                continue;
+        $already_images[$css_file] = 1;
             if ($css_file
                 and ($from = $WikiTheme->_findFile(basename($css_file), true))
                 and basename($from))
             {
-		// TODO: fix @import url(main.css);
-		if ($directory) {
-		    $target = "$directory/" . basename($css_file);
-		    if ($silent)
-			copy($WikiTheme->_path . $from, $target);
-		    else {
-			if (copy($WikiTheme->_path . $from, $target)) {
-			    _copyMsg($from, fmt("... copied to %s", $target));
-			} else {
-			    _copyMsg($from, fmt("... not copied to %s", $target));
-			}
-		    }
-		} else {
-		    //$attrib = array('is_ascii' => 0);
-		    $target = basename($css_file);
-		    $zip->addSrcFile($target, $WikiTheme->_path . $from);
-		}
+        // TODO: fix @import url(main.css);
+        if ($directory) {
+            $target = "$directory/" . basename($css_file);
+            if ($silent)
+            copy($WikiTheme->_path . $from, $target);
+            else {
+            if (copy($WikiTheme->_path . $from, $target)) {
+                _copyMsg($from, fmt("... copied to %s", $target));
+            } else {
+                _copyMsg($from, fmt("... not copied to %s", $target));
+            }
+            }
+        } else {
+            //$attrib = array('is_ascii' => 0);
+            $target = basename($css_file);
+            $zip->addSrcFile($target, $WikiTheme->_path . $from);
+        }
             } elseif (!$silent) {
                 _copyMsg($from, _("... not found"));
             }
@@ -836,44 +840,44 @@
     }
 
     if ($zip)
-	$zip->finish();
+    $zip->finish();
 
     if ($WikiTheme->DUMP_MODE == 'PDFHTML') {
-	if (USE_EXTERNAL_HTML2PDF and $outfiles) {
-	    $cmd = EXTERNAL_HTML2PDF_PAGELIST.' "'.join('" "', $outfiles).'"';
-	    $filename = FilenameForPage($firstpage);
-	    if (DEBUG) {
-		$tmpfile = $directory . "/createpdf.bat";
-		$fp = fopen($tmpfile, "wb");
-		fwrite($fp, $cmd . " > $filename.pdf");
-		fclose($fp);
-	    }
-	    if (!headers_sent()) {
-		Header('Content-Type: application/pdf');
-		passthru($cmd);
-	    }
-	    else {
-		$tmpdir = getUploadFilePath();
-		$s = passthru($cmd . " > $tmpdir/$filename.pdf");
-		$errormsg = "<br />\nGenerated <a href=\"".getUploadDataPath()."$filename.pdf\">Upload:$filename.pdf</a>\n";
-		$errormsg .= $s;
-		echo $errormsg;
-	    }
-	    if (!DEBUG) {
-		foreach($outfiles as $f) unlink($f);
-	    }
-	}
-	if (!empty($errormsg)) {
-	    $request->discardOutput();
-	    $GLOBALS['ErrorManager']->_postponed_errors = array();
-	}
+    if (USE_EXTERNAL_HTML2PDF and $outfiles) {
+        $cmd = EXTERNAL_HTML2PDF_PAGELIST.' "'.join('" "', $outfiles).'"';
+        $filename = FilenameForPage($firstpage);
+        if (DEBUG) {
+        $tmpfile = $directory . "/createpdf.bat";
+        $fp = fopen($tmpfile, "wb");
+        fwrite($fp, $cmd . " > $filename.pdf");
+        fclose($fp);
+        }
+        if (!headers_sent()) {
+        Header('Content-Type: application/pdf');
+        passthru($cmd);
+        }
+        else {
+        $tmpdir = getUploadFilePath();
+        $s = passthru($cmd . " > $tmpdir/$filename.pdf");
+        $errormsg = "<br />\nGenerated <a href=\"".getUploadDataPath()."$filename.pdf\">Upload:$filename.pdf</a>\n";
+        $errormsg .= $s;
+        echo $errormsg;
+        }
+        if (!DEBUG) {
+        foreach($outfiles as $f) unlink($f);
+        }
     }
+    if (!empty($errormsg)) {
+        $request->discardOutput();
+        $GLOBALS['ErrorManager']->_postponed_errors = array();
+    }
+    }
 
     $ErrorManager->popErrorHandler();
 
     $WikiTheme->HTML_DUMP_SUFFIX = '';
     $WikiTheme->DUMP_MODE = false;
-    $WikiTheme->_MoreAttr['body'] = $_bodyAttr;
+    $WikiTheme->_MoreAttr['body'] = isset($_bodyAttr) ? $_bodyAttr : '';
 }
 
 
@@ -933,14 +937,14 @@
     $skip = false;
     $edit = $request->getArg('edit');
     if ($merging) {
-    	if (isset($edit['keep_old'])) {
+        if (isset($edit['keep_old'])) {
             $merging = false;
             $skip = true;
-    	}
-    	elseif (isset($edit['overwrite'])) {
+        }
+        elseif (isset($edit['overwrite'])) {
             $merging = false;
             $overwrite = true;
-    	}
+        }
         elseif ( $current and (! $current->hasDefaultContents())
          && ($current->getPackedContent() != $content) )
         {
@@ -966,8 +970,8 @@
         $mesg->pushContent(' ', fmt("from %s", $source));
 
     if (!$current) {
-    	//FIXME: This should not happen! (empty vdata, corrupt cache or db)
-    	$current = $page->getCurrentRevision();
+        //FIXME: This should not happen! (empty vdata, corrupt cache or db)
+        $current = $page->getCurrentRevision();
     }
     if ($current->getVersion() == 0) {
         $versiondata['author'] = ADMIN_USER;
@@ -988,12 +992,12 @@
                 }
             }
             else {
-		if (isset($edit['keep_old'])) {
-		    $mesg->pushContent(' ', fmt("keep old"));
-		} else {
-		    $mesg->pushContent(' ', fmt("has edit conflicts - skipped"));
-		    $needs_merge = true; // hackish, to display the buttons
-		}
+        if (isset($edit['keep_old'])) {
+            $mesg->pushContent(' ', fmt("keep old"));
+        } else {
+            $mesg->pushContent(' ', fmt("has edit conflicts - skipped"));
+            $needs_merge = true; // hackish, to display the buttons
+        }
                 $skip = true;
             }
         }
@@ -1008,9 +1012,9 @@
     }
 
     if (! $skip ) {
-    	// in case of failures print the culprit:
+        // in case of failures print the culprit:
         if (!isa($request,'MockRequest')) {
-    	    PrintXML(HTML::p(WikiLink($pagename))); flush();
+            PrintXML(HTML::p(WikiLink($pagename))); flush();
         }
         $new = $page->save($content, WIKIDB_FORCE_CREATE, $versiondata);
         $dbi->touch();
@@ -1284,8 +1288,8 @@
 
     $default_pagename = rawurldecode($basename);
     if ( ($parts = ParseMimeifiedPages($text)) ) {
-    	if (count($parts) > 1)
-    	    $overwrite = $request->getArg('overwrite');
+        if (count($parts) > 1)
+            $overwrite = $request->getArg('overwrite');
         usort($parts, 'SortByPageVersion');
         foreach ($parts as $pageinfo) {
             // force overwrite
@@ -1298,7 +1302,7 @@
             if ($overwrite)
                 $request->setArg('overwrite', $overwrite);
             else
-	        unset($request->_args['overwrite']);
+            unset($request->_args['overwrite']);
     }
     else if ( ($pageinfo = ParseSerializedPage($text, $default_pagename,
                                                $request->getUser())) ) {
@@ -1343,7 +1347,7 @@
             flush();
             continue;
         }
-        longer_timeout($timeout); 	// longer timeout per page
+        longer_timeout($timeout);     // longer timeout per page
         LoadFile($request, $fn, $data, $attrib['mtime']);
     }
 }
@@ -1368,7 +1372,7 @@
     }
     $timeout = (! $request->getArg('start_debug')) ? 20 : 120;
     foreach ($files as $file) {
-        longer_timeout($timeout); 	// longer timeout per page
+        longer_timeout($timeout);     // longer timeout per page
         if (substr($file,-1,1) != '~')  // refuse to load backup files
             LoadFile($request, "$dirname/$file");
     }
@@ -1476,8 +1480,8 @@
     $source = $request->getArg('source');
     $finder = new FileFinder;
     $source = $finder->slashifyPath($source);
-    StartLoadDump($request, 
-    	sprintf(_("Loading '%s'"), $source));
+    StartLoadDump($request,
+        sprintf(_("Loading '%s'"), $source));
     LoadAny($request, $source);
     EndLoadDump($request);
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/main.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/main.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/main.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: main.php 7737 2010-11-10 08:47:34Z rurban $');
+// $Id: main.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -67,12 +67,12 @@
             // UserPreferences POST Update doesn't reach this.
             foreach ($GLOBALS['USER_AUTH_ORDER'] as $method) {
                 include_once("lib/WikiUser/$method.php");
-            	if ($method == 'Db')
-            	    switch( DATABASE_TYPE ) {
-            	    	case 'SQL'  : include_once("lib/WikiUser/PearDb.php"); break;
-            	    	case 'ADODB': include_once("lib/WikiUser/AdoDb.php"); break;
+                if ($method == 'Db')
+                    switch( DATABASE_TYPE ) {
+                        case 'SQL'  : include_once("lib/WikiUser/PearDb.php"); break;
+                        case 'ADODB': include_once("lib/WikiUser/AdoDb.php"); break;
                         case 'PDO'  : include_once("lib/WikiUser/PdoDb.php"); break;
-            	    }
+                    }
             }
             unset($method);
         }
@@ -95,7 +95,7 @@
         $this->setArg('action', $this->_deduceAction());
 
         if ((DEBUG & _DEBUG_SQL)
-	    or (DATABASE_OPTIMISE_FREQUENCY > 0 and
+        or (DATABASE_OPTIMISE_FREQUENCY > 0 and
                 (time() % DATABASE_OPTIMISE_FREQUENCY == 0))) {
             if ($this->_dbi->_backend->optimize())
                 trigger_error(_("Optimizing database"), E_USER_NOTICE);
@@ -119,27 +119,27 @@
                 {
                     $this->_user = WikiUser($userid, $this->_user->_prefs);
                 }
-	        // revive other db handle
-	        if (isset($this->_user->_prefs->_method)
+            // revive other db handle
+            if (isset($this->_user->_prefs->_method)
                     and ($this->_user->_prefs->_method == 'SQL'
                          or $this->_user->_prefs->_method == 'ADODB'
                          or $this->_user->_prefs->_method == 'PDO'
                          or $this->_user->_prefs->_method == 'HomePage')) {
-	            $this->_user->_HomePagehandle = $this->getPage($userid);
-	        }
-	        // need to update the lockfile filehandle
-	        if ( isa($this->_user, '_FilePassUser')
+                $this->_user->_HomePagehandle = $this->getPage($userid);
+            }
+            // need to update the lockfile filehandle
+            if ( isa($this->_user, '_FilePassUser')
                      and $this->_user->_file->lockfile
                      and !$this->_user->_file->fplock )
-	        {
-	            //$level = $this->_user->_level;
-	            $this->_user = UpgradeUser($this->_user,
-	                                       new _FilePassUser($userid,
+            {
+                //$level = $this->_user->_level;
+                $this->_user = UpgradeUser($this->_user,
+                                           new _FilePassUser($userid,
                                                                  $this->_user->_prefs,
                                                                  $this->_user->_file->filename));
                     //$this->_user->_level = $level;
                 }
-            	$this->_prefs = & $this->_user->_prefs;
+                $this->_prefs = & $this->_user->_prefs;
             } else {
                 $user = WikiUser($userid);
                 $this->_user = & $user;
@@ -170,11 +170,11 @@
 
     function initializeTheme ($when = 'default') {
         global $WikiTheme;
-	// if when = 'default', then first time init (default theme, ...)
-	// if when = 'login', then check some callbacks
-	//                    and maybe the theme changed (other theme defined in pref)
-	// if when = 'logout', then check other callbacks
-	//                    and maybe the theme changed (back to default theme)
+    // if when = 'default', then first time init (default theme, ...)
+    // if when = 'login', then check some callbacks
+    //                    and maybe the theme changed (other theme defined in pref)
+    // if when = 'logout', then check other callbacks
+    //                    and maybe the theme changed (back to default theme)
 
         // Load non-default theme (when = login)
         if (!empty($this->_prefs->_prefs['theme'])) {
@@ -201,12 +201,12 @@
         }
         if (empty($WikiTheme) and $user_theme) {
             if (strcspn($user_theme,"./\x00]") != strlen($user_theme)) {
-            	trigger_error(sprintf("invalid theme '%s': Invalid characters detected",
+                trigger_error(sprintf("invalid theme '%s': Invalid characters detected",
                                       $user_theme),
-            	              E_USER_WARNING);
+                              E_USER_WARNING);
                 $user_theme = "default";
             }
-	    if (!$user_theme) $user_theme = "default";
+        if (!$user_theme) $user_theme = "default";
             include_once("themes/$user_theme/themeinfo.php");
         }
         if (empty($WikiTheme) and defined('THEME'))
@@ -215,28 +215,28 @@
             include_once("themes/default/themeinfo.php");
         assert(!empty($WikiTheme));
 
-	// Do not execute global init code anymore
+    // Do not execute global init code anymore
 
-	// WikiTheme callbacks
-	if ($when == 'login') {
-	    $WikiTheme->CbUserLogin($this, $this->_user->_userid);
-	    if (!$this->_user->hasHomePage()) { // NewUser
-		$WikiTheme->CbNewUserLogin($this, $this->_user->_userid);
-		if (in_array($this->getArg('action'), array('edit','create')))
-		    $WikiTheme->CbNewUserEdit($this, $this->_user->_userid);
-	    }
-	}
-	elseif ($when == 'logout') {
-	    $WikiTheme->CbUserLogout($this, $this->_user->_userid);
-	}
-	elseif ($when == 'default') {
-	    $WikiTheme->load();
-	    if ($this->_user->_level > 0 and !$this->_user->hasHomePage()) { // NewUser
-		if (in_array($this->getArg('action'), array('edit','create')))
-		    $WikiTheme->CbNewUserEdit($this, $this->_user->_userid);
-	    }
-	}
+    // WikiTheme callbacks
+    if ($when == 'login') {
+        $WikiTheme->CbUserLogin($this, $this->_user->_userid);
+        if (!$this->_user->hasHomePage()) { // NewUser
+        $WikiTheme->CbNewUserLogin($this, $this->_user->_userid);
+        if (in_array($this->getArg('action'), array('edit','create')))
+            $WikiTheme->CbNewUserEdit($this, $this->_user->_userid);
+        }
     }
+    elseif ($when == 'logout') {
+        $WikiTheme->CbUserLogout($this, $this->_user->_userid);
+    }
+    elseif ($when == 'default') {
+        $WikiTheme->load();
+        if ($this->_user->_level > 0 and !$this->_user->hasHomePage()) { // NewUser
+        if (in_array($this->getArg('action'), array('edit','create')))
+            $WikiTheme->CbNewUserEdit($this, $this->_user->_userid);
+        }
+    }
+    }
 
     // This really maybe should be part of the constructor, but since it
     // may involve HTML/template output, the global $request really needs
@@ -266,9 +266,9 @@
         // Save preferences in session and cookie
         if ((defined('WIKI_XMLRPC') and !WIKI_XMLRPC) or $action != 'xmlrpc') {
             if (isset($this->_user) and $this->_user->_userid) {
-            	if (!isset($this->_user->_authhow) or $this->_user->_authhow != 'session') {
+                if (!isset($this->_user->_authhow) or $this->_user->_authhow != 'session') {
                     $this->_user->setPreferences($this->_prefs, true);
-            	}
+                }
             }
             $tmpuser = $this->_user; // clone it
             $this->setSessionVar('wiki_user', $tmpuser);
@@ -278,13 +278,13 @@
         // Ensure user has permissions for action
         // HACK ALERT: We may not set the request arg to create,
         // since the pageeditor has an ugly logic for action == create.
-  	if ($action == 'edit' or $action == 'create') {
+      if ($action == 'edit' or $action == 'create') {
             $page = $this->getPage();
             if (! $page->exists() )
                 $action = 'create';
             else
                 $action = 'edit';
-  	}
+      }
         if (! ENABLE_PAGEPERM) { // Bug #1438392 by Matt Brown
             $require_level = $this->requiredAuthority($action);
             if (! $this->_user->hasAuthority($require_level))
@@ -311,7 +311,7 @@
         if (isset($this->_user) and isset($this->_user->_group))
             return $this->_user->_group;
         else {
-	    // Debug Strict: Only variable references should be returned by reference
+        // Debug Strict: Only variable references should be returned by reference
             $this->_user->_group = WikiGroup::getGroup();
             return $this->_user->_group;
         }
@@ -442,10 +442,10 @@
         if (defined('MAIN_setUser')) return; // don't set cookies twice
         $this->setCookieVar(getCookieName(), $user->getAuthenticatedId(),
                             COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN);
-	$isSignedIn = $user->isSignedIn();
+    $isSignedIn = $user->isSignedIn();
         if ($isSignedIn) {
             $user->_authhow = 'signin';
-	}
+    }
 
         // Save userid to prefs..
         if ( empty($this->_user->_prefs)) {
@@ -468,9 +468,9 @@
 
     /* Permission system */
     function getLevelDescription($level) {
-    	static $levels = false;
-    	if (!$levels) // This looks like a Visual Basic hack. For the very same reason. "0"
-    	    $levels = array('x-1' => _("FORBIDDEN"),
+        static $levels = false;
+        if (!$levels) // This looks like a Visual Basic hack. For the very same reason. "0"
+            $levels = array('x-1' => _("FORBIDDEN"),
                             'x0'  => _("ANON"),
                             'x1'  => _("BOGO"),
                             'x2'  => _("USER"),
@@ -502,17 +502,17 @@
         $pass_required = ($require_level >= WIKIAUTH_USER);
         if ($require_level == WIKIAUTH_UNOBTAINABLE) {
             global $DisabledActions;
-	    if ($DisabledActions and in_array($action, $DisabledActions)) {
-            	$msg = fmt("%s is disallowed on this wiki.",
+        if ($DisabledActions and in_array($action, $DisabledActions)) {
+                $msg = fmt("%s is disallowed on this wiki.",
                            $this->getDisallowedActionDescription($this->getArg('action')));
-		$this->finish();
-		return;
-	    }
-	    // Is the reason a missing ACL or just wrong user or password?
+        $this->finish();
+        return;
+        }
+        // Is the reason a missing ACL or just wrong user or password?
             if (class_exists('PagePermission')) {
                 $user =& $this->_user;
-            	$status = $user->isAuthenticated() ? _("authenticated") : _("not authenticated");
-            	$msg = fmt("%s %s %s is disallowed on this wiki for %s user '%s' (level: %s).",
+                $status = $user->isAuthenticated() ? _("authenticated") : _("not authenticated");
+                $msg = fmt("%s %s %s is disallowed on this wiki for %s user '%s' (level: %s).",
                            _("Missing PagePermission:"),
                            action2access($this->getArg('action')),
                            $this->getArg('pagename'),
@@ -520,34 +520,34 @@
                 // TODO: add link to action=setacl
                 $user->PrintLoginForm($this, compact('pass_required'), $msg);
                 $this->finish();
-		return;
+        return;
             } else {
-            	$msg = fmt("%s is disallowed on this wiki.",
+                $msg = fmt("%s is disallowed on this wiki.",
                            $this->getDisallowedActionDescription($this->getArg('action')));
                 $this->_user->PrintLoginForm($this, compact('require_level','pass_required'), $msg);
-		$this->finish();
-		return;
+        $this->finish();
+        return;
             }
         }
         elseif ($require_level == WIKIAUTH_BOGO)
             $msg = fmt("You must sign in to %s.", $what);
         elseif ($require_level == WIKIAUTH_USER) {
-	    // LoginForm should display the relevant messages...
-	    $msg = "";
-	    /*if (!ALLOW_ANON_USER)
-		$msg = fmt("You must log in first to %s", $what);
-	    else
+        // LoginForm should display the relevant messages...
+        $msg = "";
+        /*if (!ALLOW_ANON_USER)
+        $msg = fmt("You must log in first to %s", $what);
+        else
                 $msg = fmt("You must log in to %s.", $what);
-	    */
+        */
         } elseif ($require_level == WIKIAUTH_ANON)
             $msg = fmt("Access for you is forbidden to %s.", $what);
         else
             $msg = fmt("You must be an administrator to %s.", $what);
 
         $this->_user->PrintLoginForm($this, compact('require_level','pass_required'),
-				     $msg);
-	if (!$GLOBALS['WikiTheme']->DUMP_MODE)
-	    $this->finish();    // NORETURN
+                     $msg);
+    if (!$GLOBALS['WikiTheme']->DUMP_MODE)
+        $this->finish();    // NORETURN
     }
 
     // Fixme: for PagePermissions we'll need other strings,
@@ -589,9 +589,9 @@
         if ($DisabledActions and in_array($action, $DisabledActions))
             return WIKIAUTH_UNOBTAINABLE;
 
-    	if (ENABLE_PAGEPERM and class_exists("PagePermission")) {
-    	   return requiredAuthorityForPage($action);
- 
+        if (ENABLE_PAGEPERM and class_exists("PagePermission")) {
+           return requiredAuthorityForPage($action);
+
 => Browsing pages is disallowed on this wiki for authenticated user 'rurban' (level: BOGO).
     */
     function getDisallowedActionDescription($action) {
@@ -653,9 +653,9 @@
         if ($DisabledActions and in_array($action, $DisabledActions))
             return WIKIAUTH_UNOBTAINABLE;
 
-    	if (ENABLE_PAGEPERM and class_exists("PagePermission")) {
-    	   return requiredAuthorityForPage($action);
-    	} else {
+        if (ENABLE_PAGEPERM and class_exists("PagePermission")) {
+           return requiredAuthorityForPage($action);
+        } else {
           // FIXME: clean up.
           switch ($action) {
             case 'browse':
@@ -673,20 +673,20 @@
             case 'soap':
             case 'dumphtml':
                 if (INSECURE_ACTIONS_LOCALHOST_ONLY and !is_localhost())
-		    return WIKIAUTH_ADMIN;
-		return WIKIAUTH_ANON;
+            return WIKIAUTH_ADMIN;
+        return WIKIAUTH_ANON;
 
             case 'ziphtml':
                 if (ZIPDUMP_AUTH)
                     return WIKIAUTH_ADMIN;
                 if (INSECURE_ACTIONS_LOCALHOST_ONLY and !is_localhost())
-		    return WIKIAUTH_ADMIN;
-		return WIKIAUTH_ANON;
+            return WIKIAUTH_ADMIN;
+        return WIKIAUTH_ANON;
 
             case 'dumpserial':
                 if (INSECURE_ACTIONS_LOCALHOST_ONLY and is_localhost())
-		    return WIKIAUTH_ANON;
-		return WIKIAUTH_ADMIN;
+            return WIKIAUTH_ANON;
+        return WIKIAUTH_ADMIN;
 
             case 'zip':
                 if (ZIPDUMP_AUTH)
@@ -781,8 +781,8 @@
                 require_once("lib/WikiPlugin.php");
                 $loader = new WikiPluginLoader();
                 $plugin = $loader->getPlugin("ModeratedPage");
-            	if ($plugin->handler($this, $page)) {
-            	    $CONTENT = HTML::div
+                if ($plugin->handler($this, $page)) {
+                    $CONTENT = HTML::div
                         (
                          array('class' => 'wiki-edithelp'),
                          fmt("%s: action forwarded to a moderator.",
@@ -796,11 +796,11 @@
                              _("You must wait for moderator approval."));
                     else
                         $plugin->_tokens['CONTENT'] = $CONTENT;
-            	    $title = WikiLink($page->getName());
-            	    $title->pushContent(' : ', WikiLink(_("ModeratedPage")));
-	            GeneratePage(Template('browse', $plugin->_tokens),
-	                         $title,
-	                         $page->getCurrentRevision());
+                    $title = WikiLink($page->getName());
+                    $title->pushContent(' : ', WikiLink(_("ModeratedPage")));
+                GeneratePage(Template('browse', $plugin->_tokens),
+                             $title,
+                             $page->getCurrentRevision());
                     $this->finish();
                 }
             }
@@ -842,7 +842,7 @@
             unset($this->_user->_auth_dbi);
             unset($this->_user->_dbi);
             unset($this->_user->_request);
-	}
+    }
         Request::finish();
         exit;
     }
@@ -965,7 +965,7 @@
             }
         }
 
-	// Sessions override http auth
+    // Sessions override http auth
         if (!empty($HTTP_SERVER_VARS['PHP_AUTH_USER']))
             return $HTTP_SERVER_VARS['PHP_AUTH_USER'];
         // pubcookie et al
@@ -982,8 +982,8 @@
         }
 
         if ($this->getArg('action') == 'xmlrpc') { // how about SOAP?
-	    if (empty($GLOBALS['HTTP_RAW_POST_DATA']))
-		trigger_error("Wrong always_populate_raw_post_data = Off setting in your php.ini\nCannot use xmlrpc!", E_USER_ERROR);
+        if (empty($GLOBALS['HTTP_RAW_POST_DATA']))
+        trigger_error("Wrong always_populate_raw_post_data = Off setting in your php.ini\nCannot use xmlrpc!", E_USER_ERROR);
             // wiki.putPage has special otional userid/passwd arguments. check that later.
             $userid = '';
             if (isset($HTTP_SERVER_VARS['REMOTE_USER']))
@@ -1026,7 +1026,7 @@
             require_once("lib/plugin/_WikiTranslation.php");
             $trans = new WikiPlugin__WikiTranslation();
             $trans->lang = $LANG;
-	    $default = $trans->translate_to_en($action, $LANG);
+        $default = $trans->translate_to_en($action, $LANG);
             if ($default and isActionPage($default))
                 return $cache[$action] = $default;
         } else {
@@ -1113,23 +1113,23 @@
     }
 
     function action_search () {
-    	// Decide between title or fulltextsearch (e.g. both buttons available).
+        // Decide between title or fulltextsearch (e.g. both buttons available).
         // Reformulate URL and redirect.
-	$searchtype = $this->getArg('searchtype');
-	$args = array('s' => $this->getArg('searchterm')
-	                       ? $this->getArg('searchterm')
-	                       : $this->getArg('s'));
+    $searchtype = $this->getArg('searchtype');
+    $args = array('s' => $this->getArg('searchterm')
+                           ? $this->getArg('searchterm')
+                           : $this->getArg('s'));
         if ($searchtype == 'full' or $searchtype == 'fulltext') {
             $search_page = _("FullTextSearch");
         }
         elseif ($searchtype == 'external') {
             $s = $args['s'];
-	    $link = new WikiPageName("Search:$s"); // Expand interwiki url. I use xapian-omega
+        $link = new WikiPageName("Search:$s"); // Expand interwiki url. I use xapian-omega
             $this->redirect($link->url);
         }
         else {
             $search_page = _("TitleSearch");
-	    $args['auto_redirect'] = 1;
+        $args['auto_redirect'] = 1;
         }
         $this->redirect(WikiURL($search_page, $args, 'absolute_url'));
     }
@@ -1209,12 +1209,12 @@
     }
 
     function action_soap () {
-	if (defined("WIKI_SOAP") and WIKI_SOAP) // already loaded
-	    return;
-	/*
-	  allow VIRTUAL_PATH or action=soap SOAP access
-	 */
-	include_once("SOAP.php");
+    if (defined("WIKI_SOAP") and WIKI_SOAP) // already loaded
+        return;
+    /*
+      allow VIRTUAL_PATH or action=soap SOAP access
+     */
+    include_once("SOAP.php");
     }
 
     function action_revert () {
@@ -1262,8 +1262,8 @@
     }
 
     function action_pdf () {
-    	include_once("lib/pdf.php");
-    	ConvertAndDisplayPdf($this);
+        include_once("lib/pdf.php");
+        ConvertAndDisplayPdf($this);
     }
 
     function action_captcha () {
@@ -1279,11 +1279,11 @@
     }
 
     function action_setpref () {
-	$what = $this->getArg('pref');
-	$value = $this->getArg('value');
-	$prefs =& $this->_user->_prefs;
-	$prefs->set($what, $value);
-	$num = $this->_user->setPreferences($prefs);
+    $what = $this->getArg('pref');
+    $value = $this->getArg('value');
+    $prefs =& $this->_user->_prefs;
+    $prefs->set($what, $value);
+    $num = $this->_user->setPreferences($prefs);
     }
 }
 
@@ -1351,9 +1351,9 @@
 
     $action = $request->getArg('action');
     if (substr($action, 0, 3) != 'zip') {
-    	if ($action == 'pdf')
-    	    $ErrorManager->setPostponedErrorMask(-1); // everything
-    	//else // reject postponing of warnings
+        if ($action == 'pdf')
+            $ErrorManager->setPostponedErrorMask(-1); // everything
+        //else // reject postponing of warnings
         //    $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE);
     }
 
@@ -1404,7 +1404,7 @@
     // to go the paranoid route here pending further study and testing.)
     // access hits and edit stats in the footer violate strong ETags also.
     if (1 or DEBUG) {
-	$validators['%weak'] = true;
+    $validators['%weak'] = true;
     }
     $request->setValidators($validators);
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/nusoap/nusoap.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/nusoap/nusoap.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/nusoap/nusoap.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -19,8 +19,8 @@
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+License along with this library; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 If you have any questions or comments, please email:
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/pdf.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/pdf.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/pdf.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: pdf.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: pdf.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2003 Olivier PLATHEY
  * Copyright (C) 200? Don Sebà
@@ -18,9 +18,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */ 
+ */
 
 //define("USE_EXTERNAL_HTML2PDF", "htmldoc --quiet --format pdf14 --jpeg --webpage --no-toc --no-title %s");
 /**
@@ -45,13 +45,13 @@
     $cache = new WikiPluginCached;
     $cache->newCache();
     $tmpfile = $cache->tempnam();
-    $tmpdir = dirname($tmpfile); 
+    $tmpdir = dirname($tmpfile);
     unlink ($tmpfile);
 
     $WikiTheme->DUMP_MODE = 'PDFHTML';
-    _DumpHtmlToDir($tmpdir, 
-    		   new WikiDB_Array_generic_iter($pagelist->_pages),
-    		   $request->getArg('exclude'));
+    _DumpHtmlToDir($tmpdir,
+               new WikiDB_Array_generic_iter($pagelist->_pages),
+               $request->getArg('exclude'));
     $WikiTheme->DUMP_MODE = false;
     return;
 }
@@ -75,7 +75,7 @@
     displayPage($request, new Template('htmldump', $request));
     $html = ob_get_contents();
     $WikiTheme->DUMP_MODE = false;
-    
+
     // check hook for external converters
     if (defined('USE_EXTERNAL_HTML2PDF')
         and USE_EXTERNAL_HTML2PDF)
@@ -97,7 +97,7 @@
     // clean the hints errors
     global $ErrorManager;
     $ErrorManager->destroyPostponedErrors();
-    
+
     if (!empty($errormsg)) {
         $request->discardOutput();
     }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/pear/DB/Pager.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/pear/DB/Pager.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/pear/DB/Pager.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -20,13 +20,12 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 //
-// $Id: Pager.php 7417 2010-05-19 12:57:42Z vargenau $
+// $Id: Pager.php 8075 2011-05-18 16:10:53Z vargenau $
 ///
 // Based on DB_Pager 0.7 from the pear.php.net repository. 
 // The only modifications made have been modification of the include paths.
 //
-// rcs_id('$Id: Pager.php 7417 2010-05-19 12:57:42Z vargenau $');
-// rcs_id('From Pear CVS: Id: Pager.php,v 1.3 2002/05/12 13:59:40 cox Exp');
+// From Pear CVS: Id: Pager.php,v 1.3 2002/05/12 13:59:40 cox Exp
 
 require_once 'PEAR.php';
 require_once 'DB.php';

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/pear/DB/ldap.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/pear/DB/ldap.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/pear/DB/ldap.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -23,13 +23,12 @@
 // - Piotr Roszatycki <Piotr_Roszatycki at netia.net.pl>
 //   DB_ldap::base() method, support for LDAP sequences, various fixes
 //
-// $Id: ldap.php 7703 2010-09-21 06:28:07Z rurban $
+// $Id: ldap.php 8075 2011-05-18 16:10:53Z vargenau $
 //
 // Based on DB 1.3 from the pear.php.net repository. 
 // The only modifications made have been modification of the include paths. 
 //
-// rcs_id('$Id: ldap.php 7703 2010-09-21 06:28:07Z rurban $');
-// rcs_id('From Pear CVS: Id: ldap.php,v 1.9 2002/02/11 12:59:37 mj Exp');
+// From Pear CVS: Id: ldap.php,v 1.9 2002/02/11 12:59:37 mj Exp
 
 require_once 'DB/common.php';
 define("DB_ERROR_BIND_FAILED",     -26);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/pear/PEAR.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/pear/PEAR.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/pear/PEAR.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -18,8 +18,8 @@
 // |          Tomas V.V.Cox <cox at idecnet.com>                             |
 // +----------------------------------------------------------------------+
 //
-// rcs_id('$Id: PEAR.php 7639 2010-08-11 12:15:16Z vargenau $');
-// rcs_id('From Pear CVS: Id: PEAR.php,v 1.59 2003/04/03 23:10:10 ssb Exp');
+// $Id: PEAR.php 7956 2011-03-03 17:08:31Z vargenau $
+// From Pear CVS: Id: PEAR.php,v 1.59 2003/04/03 23:10:10 ssb Exp
 //
 
 define('PEAR_ERROR_RETURN',   1);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AddComment.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AddComment.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AddComment.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: AddComment.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: AddComment.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AllPages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AllPages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AllPages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: AllPages.php 7681 2010-09-10 11:31:37Z vargenau $');
+// $Id: AllPages.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AllUsers.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AllUsers.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AllUsers.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: AllUsers.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: AllUsers.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002,2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AnalyseAccessLogSql.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AnalyseAccessLogSql.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: AnalyseAccessLogSql.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: AnalyseAccessLogSql.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005 Charles Corrigan and $ThePhpWikiProgrammingTeam
  *
@@ -16,9 +16,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 /**
  * A plugin that provides a framework and some useful queries to analyse the SQL
  * access log. This information may be sensitive and so is limited to

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AppendText.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AppendText.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AppendText.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: AppendText.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: AppendText.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -122,7 +122,8 @@
         $meta = $current->_data;
         $meta['summary'] = sprintf(_("AppendText to %s"), $pagename);
         if ($page->save($newtext, $current->getVersion() + 1, $meta)) {
-            $message->pushContent(_("Page successfully updated."), HTML::br());
+            $message->pushContent(HTML::p(array('class' => 'feedback'),
+                                          _("Page successfully updated.")));
         }
 
         // AppendText has been called from the same page that got modified

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AsciiMath.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AsciiMath.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AsciiMath.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: AsciiMath.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: AsciiMath.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AsciiSVG.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AsciiSVG.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AsciiSVG.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: AsciiSVG.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: AsciiSVG.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AtomFeed.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AtomFeed.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AtomFeed.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// $Id: AtomFeed.php 7466 2010-06-07 08:12:29Z rurban $
+// $Id: AtomFeed.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2010 Sébastien Le Callonnec
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AuthorHistory.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AuthorHistory.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/AuthorHistory.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: AuthorHistory.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: AuthorHistory.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BackLinks.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BackLinks.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BackLinks.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: BackLinks.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: BackLinks.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BlogArchives.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BlogArchives.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BlogArchives.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: BlogArchives.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: BlogArchives.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BlogJournal.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BlogJournal.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BlogJournal.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: BlogJournal.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: BlogJournal.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2005 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BoxRight.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BoxRight.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/BoxRight.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: BoxRight.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: BoxRight.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2006 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CacheTest.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CacheTest.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CacheTest.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CacheTest.php 7639 2010-08-11 12:15:16Z vargenau $');
+// $Id: CacheTest.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2002 Johannes Große
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Calendar.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Calendar.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Calendar.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Calendar.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: Calendar.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CalendarList.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CalendarList.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CalendarList.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CalendarList.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: CalendarList.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /**
  * * Copyright 1999-2002,2005-2007 $ThePhpWikiProgrammingTeam
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CategoryPage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CategoryPage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CategoryPage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CategoryPage.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: CategoryPage.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Chart.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Chart.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Chart.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Chart.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: Chart.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Comment.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Comment.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Comment.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Comment.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: Comment.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright (C) 2003 Martin Geisler
@@ -19,9 +19,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /**
  * A WikiPlugin for putting comments in WikiPages

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreateBib.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreateBib.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreateBib.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CreateBib.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: CreateBib.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -46,12 +46,6 @@
                       );
     }
 
-    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)
     {

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreatePage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreatePage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreatePage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CreatePage.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: CreatePage.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreateToc.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreateToc.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CreateToc.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CreateToc.php 7709 2010-09-30 15:48:54Z vargenau $');
+// $Id: CreateToc.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2005 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -122,11 +122,6 @@
         return $str;
     }
 
-    function preg_quote ($heading) {
-        return str_replace(array("/",".","?","*"),
-                               array('\/','\.','\?','\*'), $heading);
-    }
-
     // Get HTML header corresponding to current level (level is set of ! or =)
     function _getHeader($level) {
 
@@ -214,7 +209,9 @@
                 }
             }
         }
-        trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
+        // Do not trigger error, it happens e.g. for "<<CreateToc pagename=AnotherPage>>"
+        // trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
+
         return 0;
     }
 
@@ -386,6 +383,11 @@
         if (($notoc) or ($liststyle == 'ol')) {
             $with_counter = 1;
         }
+        if ($firstlevelstyle and ($firstlevelstyle != 'number') 
+                             and ($firstlevelstyle != 'letter')
+                             and ($firstlevelstyle != 'roman')) {
+            return $this->error(_("Error: firstlevelstyle must be 'number', 'letter' or 'roman'"));
+        }
 
         // Check if page exists.
         if (!($dbi->isWikiPage($pagename))) {
@@ -401,6 +403,9 @@
         $page = $dbi->getPage($pagename);
 
         if ($version) {
+            if (!is_whole_number($version) or !($version>0)) {
+                return $this->error(_("Error: version must be a positive integer."));
+            }
             $r = $page->getRevision($version);
             if ((!$r) || ($r->hasDefaultContents())) {
                 return $this->error(sprintf(_("%s: no such revision %d."),

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CurrentTime.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CurrentTime.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/CurrentTime.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CurrentTime.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: CurrentTime.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/DeadEndPages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/DeadEndPages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/DeadEndPages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: DeadEndPages.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: DeadEndPages.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * This file is part of PhpWiki.
  *
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Diff.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Diff.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Diff.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Diff.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: Diff.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/DynamicIncludePage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/DynamicIncludePage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/DynamicIncludePage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: DynamicIncludePage.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: DynamicIncludePage.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2009 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/EditMetaData.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/EditMetaData.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/EditMetaData.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: EditMetaData.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: EditMetaData.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ExternalSearch.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ExternalSearch.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ExternalSearch.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ExternalSearch.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: ExternalSearch.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FacebookLike.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FacebookLike.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FacebookLike.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: FacebookLike.php 7639 2010-08-11 12:15:16Z vargenau $');
+// $Id: FacebookLike.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2010 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FileInfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FileInfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FileInfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: FileInfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: FileInfo.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FoafViewer.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FoafViewer.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FoafViewer.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: FoafViewer.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: FoafViewer.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FrameInclude.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FrameInclude.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FrameInclude.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: FrameInclude.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: FrameInclude.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -73,19 +73,20 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        global $WikiTheme;
 
         $args = ($this->getArgs($argstr, $request));
         extract($args);
 
-        if ($request->getArg('action') != 'browse')
-            return $this->disabled("(action != 'browse')");
-        if (! $request->isGetOrHead())
+        if ($request->getArg('action') != 'browse') {
+            return $this->disabled(_("Plugin not run: not in browse mode"));
+        }
+        if (! $request->isGetOrHead()) {
             return $this->disabled("(method != 'GET')");
+        }
 
         if (!$src and $page) {
             if ($page == $request->get('pagename')) {
-                return $this->error(sprintf(_("recursive inclusion of page %s"),
+                return $this->error(sprintf(_("Recursive inclusion of page %s"),
                                             $page));
             }
             $src = WikiURL($page);
@@ -97,7 +98,7 @@
 
         // FIXME: How to normalize url's to compare against recursion?
         if ($src == $request->getURLtoSelf() ) {
-            return $this->error(sprintf(_("recursive inclusion of url %s"),
+            return $this->error(sprintf(_("Recursive inclusion of url %s"),
                                         $src));
         }
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FullTextSearch.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FullTextSearch.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FullTextSearch.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: FullTextSearch.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: FullTextSearch.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 1999-2002,2004,2005,2007,2009 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FuzzyPages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FuzzyPages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/FuzzyPages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: FuzzyPages.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: FuzzyPages.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GoTo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GoTo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GoTo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: GoTo.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: GoTo.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GoogleMaps.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GoogleMaps.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GoogleMaps.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: GoogleMaps.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: GoogleMaps.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2005 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GooglePlugin.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GooglePlugin.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GooglePlugin.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: GooglePlugin.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: GooglePlugin.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GraphViz.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GraphViz.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/GraphViz.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: GraphViz.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: GraphViz.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -13,11 +13,11 @@
  * 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- * GNU General Public License for more details.
  */
 
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/HelloWorld.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/HelloWorld.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/HelloWorld.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: HelloWorld.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: HelloWorld.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/HtmlConverter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/HtmlConverter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/HtmlConverter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: HtmlConverter.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: HtmlConverter.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005 Wincor Nixdorf International GmbH
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Imdb.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Imdb.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Imdb.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Imdb.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: Imdb.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludePage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludePage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludePage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,8 +1,8 @@
 <?php // -*-php-*-
-// rcs_id('$Id: IncludePage.php 7700 2010-09-20 16:03:26Z vargenau $');
+// $Id: IncludePage.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
- * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -41,7 +41,6 @@
     function getDefaultArguments() {
         return array( 'page'    => false, // the page to include
                       'rev'     => false, // the revision (defaults to most recent)
-                      'version' => false, // same as "rev"
                       'quiet'   => false, // if set, inclusion appears as normal content
                       'bytes'   => false, // maximum number of bytes to include
                       'words'   => false, // maximum number of words to include
@@ -70,12 +69,6 @@
         $args = $this->getArgs($argstr, $request);
         extract($args);
 
-        if ($version && $rev) {
-            return $this->error(_("Choose only one of 'version' or 'rev' parameters."));
-        } elseif ($version) {
-            $rev = $version;
-        }
-
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);
@@ -89,7 +82,7 @@
         // TextFormattingRules).
         static $included_pages = array();
         if (in_array($page, $included_pages)) {
-            return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
+            return $this->error(sprintf(_("Recursive inclusion of page %s ignored"),
                                         $page));
         }
 
@@ -106,6 +99,9 @@
 
         $p = $dbi->getPage($page);
         if ($rev) {
+            if (!is_whole_number($rev) or !($rev>0)) {
+                return $this->error(_("Error: rev must be a positive integer."));
+            }
             $r = $p->getRevision($rev);
             if ((!$r) || ($r->hasDefaultContents())) {
                 return $this->error(sprintf(_("%s: no such revision %d."),
@@ -129,7 +125,7 @@
             }
             // trap recursive redirects
             if (in_array($m[1], $included_pages)) {
-                return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
+                return $this->error(sprintf(_("Recursive inclusion of page %s ignored"),
                                                 $page.' => '.$m[1]));
             }
             $page = $m[1];
@@ -157,11 +153,13 @@
         if ($quiet)
             return $content;
 
-        return HTML(HTML::p(array('class' => 'transclusion-title'),
-                            fmt("Included from %s", WikiLink($page))),
-
-                    HTML::div(array('class' => 'transclusion'),
-                              false, $content));
+        if ($rev) {
+            $transclusion_title = fmt("Included from %s (revision %d)", WikiLink($page), $rev);
+        } else {
+            $transclusion_title = fmt("Included from %s", WikiLink($page));
+        }
+        return HTML(HTML::p(array('class' => 'transclusion-title'), $transclusion_title),
+                    HTML::div(array('class' => 'transclusion'), false, $content));
     }
 
     /**
@@ -200,26 +198,6 @@
     }
 };
 
-// This is an excerpt from the css file I use:
-//
-// .transclusion-title {
-//   font-style: oblique;
-//   font-size: 0.75em;
-//   text-decoration: underline;
-//   text-align: right;
-// }
-//
-// DIV.transclusion {
-//   background: lightgreen;
-//   border: thin;
-//   border-style: solid;
-//   padding-left: 0.8em;
-//   padding-right: 0.8em;
-//   padding-top: 0px;
-//   padding-bottom: 0px;
-//   margin: 0.5ex 0px;
-// }
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludePages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludePages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludePages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: IncludePages.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: IncludePages.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -40,18 +40,18 @@
     }
 
     function getDefaultArguments() {
-            return array_merge(
-                           array( 'pages'   => false,  // the pages to include
+        return array_merge(array( 'pages'   => false,  // the pages to include
                                   'exclude' => false), // the pages to exclude
                            WikiPlugin_IncludePage::getDefaultArguments()
-                           );
+                          );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
-            $html = HTML();
-        if (empty($args['pages']))
+        $html = HTML();
+        if (empty($args['pages'])) {
             return $html;
+        }
         $include = new WikiPlugin_IncludePage();
 
         if (is_string($args['exclude']) and !empty($args['exclude'])) {
@@ -67,11 +67,17 @@
             $argstr = preg_replace("/pages=<\?plugin-list.*?\>/", "", $argstr);
         }
 
-            foreach ($args['pages'] as $page) {
+        // IncludePage plugin has no "pages" argument.
+        // Remove it to avoid warning.
+        $argstr = preg_replace('/pages=".*?"/', "", $argstr);
+        $argstr = preg_replace('/pages=\S*\s/', "", $argstr);
+        $argstr = preg_replace('/pages=\S*/', "", $argstr);
+
+        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));
             }
-            }
+        }
         return $html;
     }
 };

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludeSiteMap.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludeSiteMap.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludeSiteMap.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: IncludeSiteMap.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: IncludeSiteMap.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2003,2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludeTree.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludeTree.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/IncludeTree.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: IncludeTree.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: IncludeTree.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2003,2004,2009 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/InterWikiSearch.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/InterWikiSearch.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/InterWikiSearch.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: InterWikiSearch.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: InterWikiSearch.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/JabberPresence.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/JabberPresence.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/JabberPresence.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: JabberPresence.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: JabberPresence.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LdapSearch.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LdapSearch.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LdapSearch.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- // rcs_id('$Id: LdapSearch.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // -*-php-*- // $Id: LdapSearch.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004 John Lines
  * Copyright 2007 $ThePhpWikiProgrammingTeam
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LikePages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LikePages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LikePages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: LikePages.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: LikePages.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LinkDatabase.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LinkDatabase.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LinkDatabase.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: LinkDatabase.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: LinkDatabase.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LinkSearch.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LinkSearch.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/LinkSearch.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: LinkSearch.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: LinkSearch.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListPages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListPages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListPages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ListPages.php 7506 2010-06-09 10:06:37Z vargenau $');
+// $Id: ListPages.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListRelations.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListRelations.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListRelations.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ListRelations.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: ListRelations.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2006 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListSubpages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListSubpages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ListSubpages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ListSubpages.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ListSubpages.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -91,7 +91,7 @@
             // A page cannot include itself. Avoid doublettes.
             static $included_pages = array();
             if (in_array($page, $included_pages)) {
-                $content->pushContent(HTML::p(sprintf(_("recursive inclusion of page %s ignored"),
+                $content->pushContent(HTML::p(sprintf(_("Recursive inclusion of page %s ignored"),
                                                       $page)));
                 continue;
             }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/MediawikiTable.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/MediawikiTable.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/MediawikiTable.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: MediawikiTable.php 7735 2010-11-09 13:45:32Z vargenau $');
+// $Id: MediawikiTable.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2003 Sameer D. Sahasrabuddhe
  * Copyright (C) 2005 $ThePhpWikiProgrammingTeam
@@ -18,9 +18,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ModeratedPage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ModeratedPage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/ModeratedPage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ModeratedPage.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: ModeratedPage.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2005 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -253,10 +253,10 @@
             require_once("lib/MailNotify.php");
             $pagename = $page->getName();
             $mailer = new MailNotify($pagename);
-            $subject = "[".WIKI_NAME.'] '.$action.': '._("ModeratedPage").' '.$pagename;
+            $subject = "[".WIKI_NAME.'] '.$action._(": ")._("ModeratedPage").' '.$pagename;
             $content =         "You are approved as Moderator of the ".WIKI_NAME. " wiki.\n".
                      "Someone wanted to edit a moderated page, which you have to approve or reject.\n\n".
-                     $action.': '._("ModeratedPage").' '.$pagename."\n"
+                     $action._(": ")._("ModeratedPage").' '.$pagename."\n"
                      //. serialize($moderated['data'][$id])
                      ."\n<".WikiURL($pagename, array('action' => _("ModeratedPage"),
                                                      'id' => $id, 'pass' => 'approve'), 1).">"
@@ -348,7 +348,7 @@
             $status = $this->getSiteStatus($request, $action_page);
             require_once("lib/MailNotify.php");
             $mailer = new MailNotify($pagename);
-            $subject = "[".WIKI_NAME."] $pass $action "._("ModeratedPage").': '.$pagename;
+            $subject = "[".WIKI_NAME."] $pass $action "._("ModeratedPage")._(": ").$pagename;
             $mailer->from = $request->_user->UserFrom();
             $content = sprintf(_("%s approved your wiki action from %s"),
                                  $mailer->from,CTime($moderation['timestamp']))

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/MostPopular.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/MostPopular.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/MostPopular.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: MostPopular.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: MostPopular.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/NewPagesPerUser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/NewPagesPerUser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/NewPagesPerUser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: NewPagesPerUser.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: NewPagesPerUser.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2007 AVL
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/NoCache.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/NoCache.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/NoCache.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: NoCache.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: NoCache.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/OldStyleTable.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/OldStyleTable.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/OldStyleTable.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: OldStyleTable.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: OldStyleTable.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/OrphanedPages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/OrphanedPages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/OrphanedPages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: OrphanedPages.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: OrphanedPages.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * This file is part of PhpWiki.
  *
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageDump.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageDump.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageDump.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PageDump.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PageDump.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2003 $ThePhpWikiProgrammingTeam
  *
@@ -16,13 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /**
  * PhpWikiPlugin for PhpWiki developers to generate single page dumps
- * for checking into cvs, or for users or the admin to produce a
+ * for checking into Subversion, or for users or the admin to produce a
  * downloadable page dump of a single page.
  *
  * This plugin will also be useful to (semi-)automatically sync pages
@@ -36,7 +36,7 @@
  *
  * Usage:
  *  Direct URL access:
- *   http://...phpwiki/PageDump?page=HomePage?format=forcvs
+ *   http://...phpwiki/PageDump?page=HomePage?format=forsvn
  *   http://...phpwiki/index.php?PageDump&page=HomePage
  *   http://...phpwiki/index.php?PageDump&page=HomePage&download=1
  *  Static:
@@ -63,7 +63,7 @@
         return array('s'    => false,
                      'page' => '[pagename]',
                      //'encoding' => 'binary', // 'binary', 'quoted-printable'
-                     'format' => false, // 'normal', 'forcvs', 'backup'
+                     'format' => false, // 'normal', 'forsvn', 'forcvs', 'backup'
                      // display within WikiPage or give a downloadable
                      // raw pgsrc?
                      'download' => false);
@@ -91,7 +91,7 @@
         $mailified = MailifyPage($p, ($format == 'backup') ? 99 : 1);
 
         // fixup_headers massages the page dump headers depending on
-        // the 'format' argument, 'normal'(default) or 'forcvs'.
+        // the 'format' argument, 'normal'(default) or 'forsvn'.
         //
         // Normal: Don't add X-Rcs-Id, add unique Message-Id, don't
         // strip any fields from Content-Type.
@@ -102,8 +102,8 @@
 
         $this->pagename = $page;
         $this->generateMessageId($mailified);
-        if ($format == 'forcvs')
-            $this->fixup_headers_forcvs($mailified);
+        if (($format == 'forsvn') || ($format == 'forcvs'))
+            $this->fixup_headers_forsvn($mailified);
         else // backup or normal
             $this->fixup_headers($mailified);
 
@@ -142,11 +142,11 @@
         // text if it is too long--unless quoted-printable (TODO).
         $mailified = wordwrap($mailified, 70);
 
-        $dlcvs = Button(array(//'page' => $page,
+        $dlsvn = Button(array(//'page' => $page,
                               'action' => $this->getName(),
-                              'format'=> 'forcvs',
+                              'format'=> 'forsvn',
                               'download'=> true),
-                        _("Download for CVS"),
+                        _("Download for Subversion"),
                         $page);
         $dl = Button(array(//'page' => $page,
                            'action' => $this->getName(),
@@ -166,7 +166,7 @@
         if (!$Sep = $WikiTheme->getButtonSeparator())
             $Sep = " ";
 
-        if ($format == 'forcvs') {
+        if ($format == 'forsvn') {
             $desc = _("(formatted for PhpWiki developers as pgsrc template, not for backing up)");
             $altpreviewbuttons = HTML(
                                       Button(array('action' => $this->getName()),
@@ -183,7 +183,7 @@
             $desc = _("(formatted for backing up: all revisions)"); // all revisions
             $altpreviewbuttons = HTML(
                                       Button(array('action' => $this->getName(),
-                                                   'format'=> 'forcvs'),
+                                                   'format'=> 'forsvn'),
                                              _("Preview as developer format"),
                                              $page),
                                       $Sep,
@@ -196,7 +196,7 @@
             $desc = _("(normal formatting: latest revision only)");
             $altpreviewbuttons = HTML(
                                       Button(array('action' => $this->getName(),
-                                                   'format'=> 'forcvs'),
+                                                   'format'=> 'forsvn'),
                                              _("Preview as developer format"),
                                              $page),
                                       $Sep,
@@ -212,17 +212,17 @@
 _("The wordwrap of the preview doesn't take nested markup or list indentation into consideration!")
 . " ",
 HTML::em(
-_("PhpWiki developers should manually inspect the downloaded file for nested markup before rewrapping with emacs and checking into CVS.")
+_("PhpWiki developers should manually inspect the downloaded file for nested markup before rewrapping with emacs and checking into Subversion.")
          )
                         );
 
         return HTML($h2, HTML::em($desc),
                     HTML::pre($mailified),
                     $altpreviewbuttons,
-                    HTML::div(array('class' => 'errors'),
+                    HTML::div(array('class' => 'error'),
                               HTML::strong(_("Warning:")),
                               " ", $warning),
-                    $dl, $Sep, $dlall, $Sep, $dlcvs
+                    $dl, $Sep, $dlall, $Sep, $dlsvn
                     );
     }
 
@@ -269,10 +269,10 @@
         $mailified = implode("\n", array_values($return));
     }
 
-    function fixup_headers_forcvs(&$mailified) {
+    function fixup_headers_forsvn(&$mailified) {
         $array = explode("\n", $mailified);
 
-        // Massage headers to prepare for developer checkin to CVS.
+        // Massage headers to prepare for developer checkin to Subversion.
         $item_to_insert = "X-Rcs-Id: \$Id\$";
         $insert_into_key_position = 2;
         $returnval_ignored = array_splice($array,

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageGroup.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageGroup.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageGroup.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PageGroup.php 7700 2010-09-20 16:03:26Z vargenau $');
+// $Id: PageGroup.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageHistory.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageHistory.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageHistory.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PageHistory.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PageHistory.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002, 2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageInfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageInfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageInfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PageInfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PageInfo.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageTrail.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageTrail.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageTrail.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PageTrail.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PageTrail.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PasswordReset.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PasswordReset.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PasswordReset.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PasswordReset.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PasswordReset.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright (C) 2006 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhotoAlbum.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhotoAlbum.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhotoAlbum.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PhotoAlbum.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PhotoAlbum.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2003,2004,2005,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhpHighlight.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhpHighlight.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhpHighlight.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PhpHighlight.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PhpHighlight.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhpWeather.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhpWeather.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PhpWeather.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id PhpWeather.php 2002-08-26 15:30:13 rurban$');
+// $Id: PhpWeather.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Ploticus.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Ploticus.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Ploticus.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Ploticus.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: Ploticus.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PluginManager.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PluginManager.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PluginManager.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PluginManager.php 7659 2010-08-31 14:55:29Z vargenau $');
+// $Id: PluginManager.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopUp.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopUp.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopUp.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PopUp.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: PopUp.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004 Nicolas Noble <pixels at users.sf.net>
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopularNearby.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopularNearby.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopularNearby.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PopularNearby.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: PopularNearby.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopularTags.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopularTags.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PopularTags.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PopularTags.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: PopularTags.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PreferenceApp.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PreferenceApp.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PreferenceApp.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: PreferenceApp.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: PreferenceApp.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PrevNext.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PrevNext.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PrevNext.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PrevNext.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: PrevNext.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Processing.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Processing.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Processing.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Processing.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: Processing.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2009 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RandomPage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RandomPage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RandomPage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RandomPage.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: RandomPage.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2005 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -50,9 +50,15 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
+
         $args = $this->getArgs($argstr, $request);
         extract($args);
 
+        // Redirect would break HTML dump
+        if ($request->getArg('action') != 'browse') {
+            return $this->disabled(_("Plugin not run: not in browse mode"));
+        }
+
         // fix deprecated arg
         if (is_integer($pages)) {
             $numpages = $pages;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RateIt.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RateIt.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RateIt.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RateIt.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RateIt.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2007,2009 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -177,7 +177,7 @@
         } else {
             header('Content-type: image/png');
             echo base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAQMAAABIeJ9nAAAAA1BMVEX///'
-			         .'+nxBvIAAAAAXRSTlMAQObYZgAAABNJREFUeF4NwAEBAAAAgJD+r5YGAAQAAXHhfPAAAAAASUVORK5CYII=');
+                     .'+nxBvIAAAAAXRSTlMAQObYZgAAABNJREFUeF4NwAEBAAAAgJD+r5YGAAQAAXHhfPAAAAAASUVORK5CYII=');
         }
         exit;
     }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RawHtml.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RawHtml.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RawHtml.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RawHtml.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RawHtml.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentChanges.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentChanges.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentChanges.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RecentChanges.php 7664 2010-08-31 15:42:34Z vargenau $');
+// $Id: RecentChanges.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentChangesCached.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentChangesCached.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentChangesCached.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RecentChangesCached.php 7639 2010-08-11 12:15:16Z vargenau $');
+// $Id: RecentChangesCached.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2002 Johannes Große                                   |
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentComments.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentComments.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentComments.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RecentComments.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RecentComments.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentEdits.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentEdits.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentEdits.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RecentEdits.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RecentEdits.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentReferrers.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentReferrers.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RecentReferrers.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RecentReferrers.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RecentReferrers.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RedirectTo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RedirectTo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RedirectTo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RedirectTo.php 7653 2010-08-30 10:41:28Z vargenau $');
+// $Id: RedirectTo.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -85,8 +85,9 @@
             return $this->error(fmt("Recursive redirect to self: '%s'", $url));
         }
 
-        if ($request->getArg('action') != 'browse')
-            return $this->disabled("(action != 'browse')");
+        if ($request->getArg('action') != 'browse') {
+            return $this->disabled(_("Plugin not run: not in browse mode"));
+        }
 
         $redirectfrom = $request->getArg('redirectfrom');
         if ($redirectfrom !== false) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RelatedChanges.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RelatedChanges.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RelatedChanges.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RelatedChanges.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RelatedChanges.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RichTable.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RichTable.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RichTable.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RichTable.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RichTable.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2003 Sameer D. Sahasrabuddhe
  * Copyright (C) 2005 $ThePhpWikiProgrammingTeam
@@ -18,9 +18,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /**
  * RichTablePlugin

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RssFeed.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RssFeed.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/RssFeed.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RssFeed.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: RssFeed.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2003 Arnaud Fontaine
  *
@@ -16,9 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 /**
  * @author: Arnaud Fontaine
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SearchHighlight.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SearchHighlight.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SearchHighlight.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SearchHighlight.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: SearchHighlight.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticRelations.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticRelations.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticRelations.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SemanticRelations.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: SemanticRelations.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticSearch.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticSearch.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticSearch.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SemanticSearch.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: SemanticSearch.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 Reini Urban
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -154,7 +154,7 @@
                                       )),
                              HTML::tbody
                              (HTML::tr(
-                                       HTML::td($pagefilter, ": "),
+                                       HTML::td($pagefilter, _(": ")),
                                        HTML::td($relation),
                                        HTML::td(HTML::strong(HTML::tt('  ::  '))),
                                        HTML::td($queryrel),
@@ -237,7 +237,7 @@
                                       )),
                              HTML::tbody
                              (HTML::tr(
-                                       HTML::td($pagefilter, ": "),
+                                       HTML::td($pagefilter, _(": ")),
                                        HTML::td($attribute),
                                        HTML::td($attr_op),
                                        HTML::td($queryatt),

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticSearchAdvanced.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SemanticSearchAdvanced.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SemanticSearchAdvanced.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: SemanticSearchAdvanced.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 Reini Urban
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SiteMap.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SiteMap.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SiteMap.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SiteMap.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: SiteMap.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SpellCheck.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SpellCheck.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SpellCheck.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SpellCheck.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: SpellCheck.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2006,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -175,7 +175,7 @@
                                               'href' => "javascript:do_replace('$word','$s')"),
                                         $s),", ");
             }
-            $list->pushContent(HTML::li($w, ": ", $r));
+            $list->pushContent(HTML::li($w, _(": "), $r));
         }
         $html->pushContent($list);
         return $html;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SqlResult.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SqlResult.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SqlResult.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SqlResult.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: SqlResult.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SyncWiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SyncWiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SyncWiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SyncWiki.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: SyncWiki.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2006 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -66,10 +66,12 @@
         $args = $this->getArgs($argstr, $request);
         $args['action'] = 'syncwiki';
         extract($args);
-        if (empty($args['url']))
+        if (empty($args['url'])) {
             return $this->error(fmt("A required argument '%s' is missing.", "url"));
-        if ($request->getArg('action') != 'browse')
-            return $this->disabled("(action != 'browse')");
+        }
+        if ($request->getArg('action') != 'browse') {
+            return $this->disabled(_("Plugin not run: not in browse mode"));
+        }
         $posted = $request->getArg('wikiadminutils');
         if ($request->isPost()
             and $posted['action'] == $action

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SyntaxHighlighter.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SyntaxHighlighter.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SyntaxHighlighter.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SyntaxHighlighter.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: SyntaxHighlighter.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SystemInfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SystemInfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/SystemInfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: SystemInfo.php 7562 2010-06-23 15:31:48Z vargenau $');
+// $Id: SystemInfo.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright (C) 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -397,9 +397,9 @@
             $pagesize = $content['pagesize'];
         }
 
-        $s  = sprintf(_("Application size: %d Kb"), $appsize);
+        $s  = sprintf(_("Application size: %d KiB"), $appsize);
         if ($pagesize)
-            $s  .= ", " . sprintf(_("Pagedata size: %d Kb", $pagesize));
+            $s  .= ", " . sprintf(_("Pagedata size: %d KiB", $pagesize));
         return $s;
     }
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TeX2png.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TeX2png.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TeX2png.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: TeX2png.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: TeX2png.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) Copyright 2004 Pierrick Meignen
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Template.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Template.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Template.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,8 +1,8 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Template.php 7700 2010-09-20 16:03:26Z vargenau $');
+// $Id: Template.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005,2007 $ThePhpWikiProgrammingTeam
- * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright 2008-2011 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -70,7 +70,6 @@
                      'page'    => false, // the page to include
                      'vars'    => false, // TODO: get rid of this, all remaining args should be vars
                      'rev'     => false, // the revision (defaults to most recent)
-                     'version' => false, // same as "rev"
                      'section' => false, // just include a named section
                      'sectionhead' => false // when including a named section show the heading
                      );
@@ -84,7 +83,7 @@
     // TODO: check if page can really be pulled from the args, or if it is just the basepage.
     function getWikiPageLinks($argstr, $basepage) {
         $args = $this->getArgs($argstr);
-        $page = @$args['page'];
+        $page = isset($args['page'])? $args['page']: '';
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);
@@ -100,12 +99,6 @@
         $vars = $args['vars'] ? $args['vars'] : $this->vars;
         $page = $args['page'];
 
-        if ($args['version'] && $args['rev']) {
-            return $this->error(_("Choose only one of 'version' or 'rev' parameters."));
-        } elseif ($args['version']) {
-            $args['rev'] = $args['version'];
-        }
-
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);
@@ -127,7 +120,7 @@
         // Protect from recursive inclusion. A page can include itself once
         static $included_pages = array();
         if (in_array($page, $included_pages)) {
-            return $this->error(sprintf(_("recursive inclusion of page %s"),
+            return $this->error(sprintf(_("Recursive inclusion of page %s"),
                                         $page));
         }
 
@@ -144,6 +137,9 @@
 
         $p = $dbi->getPage($page);
         if ($args['rev']) {
+            if (!is_whole_number($args['rev']) or !($args['rev']>0)) {
+                return $this->error(_("Error: rev must be a positive integer."));
+            }
             $r = $p->getRevision($args['rev']);
             if ((!$r) || ($r->hasDefaultContents())) {
                 return $this->error(sprintf(_("%s: no such revision %d."),
@@ -168,7 +164,7 @@
             }
             // trap recursive redirects
             if (in_array($m[1], $included_pages)) {
-                return $this->error(sprintf(_("recursive inclusion of page %s ignored"),
+                return $this->error(sprintf(_("Recursive inclusion of page %s ignored"),
                                                 $page.' => '.$m[1]));
             }
             $page = $m[1];
@@ -253,8 +249,9 @@
                 $var['BASE_URL'] = PHPWIKI_BASE_URL;
 
             foreach ($var as $key => $val) {
-                //$content = preg_replace("/%%".preg_quote($key,"/")."%%/", $val, $content);
-                $content = str_replace("%%".$key."%%", $val, $content);
+                // We have to decode the double quotes that have been encoded
+                // in inline or block parser.
+                $content = str_replace("%%".$key."%%", htmlspecialchars_decode($val), $content);
             }
         }
         return $content;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TexToPng.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TexToPng.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TexToPng.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: TexToPng.php 7639 2010-08-11 12:15:16Z vargenau $');
+// $Id: TexToPng.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2002 Johannes Große
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TitleSearch.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TitleSearch.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TitleSearch.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: TitleSearch.php 7554 2010-06-21 08:56:10Z rurban $');
+// $Id: TitleSearch.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2004,2005,2010 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Transclude.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Transclude.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Transclude.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Transclude.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: Transclude.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2006 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -85,7 +85,7 @@
         // FIXME: Better recursion detection.
         // FIXME: Currently this doesnt work at all.
         if ($src == $request->getURLtoSelf() ) {
-            return $this->error(fmt("recursive inclusion of url %s", $src));
+            return $this->error(fmt("Recursive inclusion of url %s", $src));
         }
         if (! IsSafeURL($src)) {
             return $this->error(_("Bad url in src: remove all of <, >, \""));
@@ -143,7 +143,7 @@
                 frame.height = content.height + 2 * frame.marginHeight;
             }
             catch (e) {
-              // Can not get content.height unless transcluded doc
+              // Cannot get content.height unless transcluded doc
               // is from the same server...
               return;
             }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TranslateText.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TranslateText.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/TranslateText.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: TranslateText.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: TranslateText.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UnfoldSubpages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UnfoldSubpages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UnfoldSubpages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: UnfoldSubpages.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: UnfoldSubpages.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002,2004,2005 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -97,7 +97,7 @@
                     continue;
             // A page cannot include itself. Avoid doublettes.
             if (in_array($cpagename, $included_pages)) {
-                $content->pushContent(HTML::p(sprintf(_("recursive inclusion of page %s ignored"),
+                $content->pushContent(HTML::p(sprintf(_("Recursive inclusion of page %s ignored"),
                                                       $cpagename)));
                 continue;
             }
@@ -127,7 +127,7 @@
                     if (in_array($m[1], $included_pages)) {
                             if (!$quiet)
                             $content->pushContent(
-                                HTML::p(sprintf(_("recursive inclusion of page %s ignored"),
+                                HTML::p(sprintf(_("Recursive inclusion of page %s ignored"),
                                                 $cpagename.' => '.$m[1])));
                         continue;
                     }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UpLoad.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UpLoad.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UpLoad.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: UpLoad.php 7719 2010-10-22 09:30:47Z vargenau $');
+// $Id: UpLoad.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2003,2004,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,8 +17,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
  */
 
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UriResolver.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UriResolver.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UriResolver.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: UriResolver.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: UriResolver.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UserPreferences.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UserPreferences.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UserPreferences.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: UserPreferences.php 7659 2010-08-31 14:55:29Z vargenau $');
+// $Id: UserPreferences.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright (C) 2001,2002,2003,2004,2005 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -70,7 +70,7 @@
             return '';
         if (defined('FUSIONFORGE') and FUSIONFORGE) {
             if (!($user->isAuthenticated())) {
-                return HTML::div(array('class' => 'errors'),
+                return HTML::p(array('class' => 'error'),
                                  _("Error: You are not logged in, cannot display UserPreferences."));
             }
         }
@@ -81,7 +81,7 @@
             or (isa($user,'_ForbiddenUser')))
         {
             $no_args = $this->getDefaultArguments();
-            $no_args['errmsg'] = HTML::div(array('class' => 'errors'),
+            $no_args['errmsg'] = HTML::p(array('class' => 'error'),
                                            _("Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."));
             $no_args['isForm'] = false;
             return Template('userprefs', $no_args);

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UserRatings.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UserRatings.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/UserRatings.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: UserRatings.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: UserRatings.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004 Dan Frankowski
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Video.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Video.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/Video.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Video.php 7676 2010-09-08 10:08:16Z vargenau $');
+// $Id: Video.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2009 Roger Guignard and Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/VisualWiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/VisualWiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/VisualWiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: VisualWiki.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: VisualWiki.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2002 Johannes Große (Johannes Große)
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WantedPages.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WantedPages.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WantedPages.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WantedPages.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: WantedPages.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2002, 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WantedPagesOld.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WantedPagesOld.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WantedPagesOld.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WantedPagesOld.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: WantedPagesOld.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * This file is part of PhpWiki.
  *
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WatchPage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WatchPage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WatchPage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WatchPage.php 7666 2010-08-31 16:02:45Z vargenau $');
+// $Id: WatchPage.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright (C) 2006 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -89,7 +89,7 @@
                                        HTML::Raw(' '),
                                        Button('submit:cancel', _("Cancel"))));
         }
-        $fieldset = HTML::fieldset(HTML::legend("Watch Page"), $form);
+        $fieldset = HTML::fieldset(HTML::legend(_("Watch Page")), $form);
         return $fieldset;
     }
 
@@ -116,8 +116,8 @@
             if (!defined('FUSIONFORGE') or !FUSIONFORGE) {
                 $email = $pref->get("email");
                 if (empty($email)) {
-                    return HTML::div(
-                             array('class' => 'errors'),
+                    return HTML::p(
+                             array('class' => 'error'),
                              _("ERROR: No email defined! You need to do this in your "),
                              WikiLink(_("UserPreferences")));
                 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WhoIsOnline.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WhoIsOnline.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WhoIsOnline.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WhoIsOnline.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WhoIsOnline.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminChmod.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminChmod.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminChmod.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminChmod.php 7647 2010-08-23 15:10:10Z vargenau $');
+// $Id: WikiAdminChmod.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -76,21 +76,22 @@
                 }
             }
         } else {
-            $ul->pushContent(HTML::li(fmt("Invalid chmod string")));
+            $ul->pushContent(HTML::li(_("Invalid chmod string")));
         }
         if ($count) {
             $dbi->touch();
             return HTML($ul,
-                        HTML::p(fmt("%s pages have been changed.",$count)));
+                        HTML::p(fmt("%d pages have been changed.", $count)));
         } else {
             return HTML($ul,
-                        HTML::p(fmt("No pages changed.")));
+                        HTML::p(_("No pages changed.")));
         }
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if (!DEBUG)
+        if (!DEBUG) {
             return $this->disabled("WikiAdminChmod not yet enabled. Set DEBUG to try it.");
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminChown.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminChown.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminChown.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminChown.php 7448 2010-05-31 12:01:38Z vargenau $');
+// $Id: WikiAdminChown.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -88,23 +88,25 @@
             $dbi->touch();
             $result->setAttr('class', 'feedback');
             if ($count == 1) {
-                $result->pushContent(HTML::p("One page has been permanently changed:"));
+                $result->pushContent(HTML::p(_("One page has been changed:")));
             } else {
-                $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+                $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
             }
             $result->pushContent($ul);
             return $result;
         } else {
             $result->setAttr('class', 'error');
-            $result->pushContent(HTML::p("No pages changed."));
+            $result->pushContent(HTML::p(_("No pages changed.")));
             return $result;
         }
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if (!$request->getArg('action') == _("PhpWikiAdministration/Chown"))
-                return $this->disabled("(action != 'browse')");
+        if ($request->getArg('action') != 'browse') {
+            if (!$request->getArg('action') == _("PhpWikiAdministration/Chown")) {
+                return $this->disabled(_("Plugin not run: not in browse mode"));
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
@@ -168,7 +170,7 @@
             $button_label = _("Yes");
             $header->pushContent(
               HTML::p(HTML::strong(
-                _("Are you sure you want to permanently change the owner of the selected pages?"))));
+                _("Are you sure you want to change the owner of the selected pages?"))));
             $header = $this->chownForm($header, $post_args);
         }
         else {
@@ -195,8 +197,7 @@
     }
 
     function chownForm(&$header, $post_args) {
-        $header->pushContent(_("Change owner")." ");
-        $header->pushContent(' '._("to").': ');
+        $header->pushContent(_("Change owner to: "));
         $header->pushContent(HTML::input(array('name' => 'admin_chown[user]',
                                                'value' => $post_args['user'],
                                                'size' => 40)));

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminMarkup.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminMarkup.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminMarkup.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminMarkup.php 7448 2010-05-31 12:01:38Z vargenau $');
+// $Id: WikiAdminMarkup.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -91,23 +91,25 @@
             $dbi->touch();
             $result->setAttr('class', 'feedback');
             if ($count == 1) {
-                $result->pushContent(HTML::p("One page has been permanently changed:"));
+                $result->pushContent(HTML::p(_("One page has been changed:")));
             } else {
-                $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+                $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
             }
             $result->pushContent($ul);
             return $result;
         } else {
             $result->setAttr('class', 'error');
-            $result->pushContent(HTML::p("No pages changed."));
+            $result->pushContent(HTML::p(_("No pages changed.")));
             return $result;
         }
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if (!$request->getArg('action') == _("PhpWikiAdministration/Markup"))
-                return $this->disabled("(action != 'browse')");
+        if ($request->getArg('action') != 'browse') {
+            if (!$request->getArg('action') == _("PhpWikiAdministration/Markup")) {
+                return $this->disabled(_("Plugin not run: not in browse mode"));
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
@@ -160,7 +162,7 @@
             $button_label = _("Yes");
             $header->pushContent(
               HTML::p(HTML::strong(
-                _("Are you sure you want to permanently change the markup type of the selected files?"))));
+                _("Are you sure you want to change the markup type of the selected files?"))));
             $header = $this->chmarkupForm($header, $post_args);
         }
         else {
@@ -187,8 +189,7 @@
     }
 
     function chmarkupForm(&$header, $post_args) {
-        $header->pushContent(_("Change markup")." ");
-        $header->pushContent(' '._("to").': ');
+        $header->pushContent(_("Change markup to: "));
         $header->pushContent(HTML::input(array('name' => 'admin_markup[markup]',
                                                'value' => $post_args['markup'])));
         return $header;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminPurge.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminPurge.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminPurge.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminPurge.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: WikiAdminPurge.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002,2004 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -74,23 +74,25 @@
             $dbi->touch();
             $result->setAttr('class', 'feedback');
             if ($count == 1) {
-                $result->pushContent(HTML::p("One page has been permanently purged:"));
+                $result->pushContent(HTML::p(_("One page has been permanently purged:")));
             } else {
-                $result->pushContent(HTML::p(fmt("%s pages have been permanently purged:", $count)));
+                $result->pushContent(HTML::p(fmt("%d pages have been permanently purged:", $count)));
             }
             $result->pushContent($ul);
             return $result;
         } else {
             $result->setAttr('class', 'error');
-            $result->pushContent(HTML::p("No pages purged."));
+            $result->pushContent(HTML::p(_("No pages purged.")));
             return $result;
         }
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if ($request->getArg('action') != _("PhpWikiAdministration/Purge"))
-                return $this->disabled("(action != 'browse')");
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/Purge")) {
+                return $this->disabled(_("Plugin not run: not in browse mode"));
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args =& $args;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminRemove.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminRemove.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminRemove.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminRemove.php 7448 2010-05-31 12:01:38Z vargenau $');
+// $Id: WikiAdminRemove.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002,2004 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -118,23 +118,25 @@
             $dbi->touch();
             $result->setAttr('class', 'feedback');
             if ($count == 1) {
-                $result->pushContent(HTML::p("One page has been permanently removed:"));
+                $result->pushContent(HTML::p(_("One page has been removed:")));
             } else {
-                $result->pushContent(HTML::p(fmt("%s pages have been permanently removed:", $count)));
+                $result->pushContent(HTML::p(fmt("%d pages have been removed:", $count)));
             }
             $result->pushContent($ul);
             return $result;
         } else {
             $result->setAttr('class', 'error');
-            $result->pushContent(HTML::p("No pages removed."));
+            $result->pushContent(HTML::p(_("No pages removed.")));
             return $result;
         }
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if ($request->getArg('action') != _("PhpWikiAdministration/Remove"))
-                return $this->disabled("(action != 'browse')");
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/Remove")) {
+                return $this->disabled(_("Plugin not run: not in browse mode"));
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         if (!is_numeric($args['min_age']))
@@ -194,7 +196,7 @@
         if ($next_action == 'verify') {
             $button_label = _("Yes");
             $header->pushContent(HTML::p(HTML::strong(
-                _("Are you sure you want to permanently remove the selected files?"))));
+                _("Are you sure you want to remove the selected files?"))));
         }
         else {
             $button_label = _("Remove selected pages");

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminRename.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminRename.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminRename.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminRename.php 7448 2010-05-31 12:01:38Z vargenau $');
+// $Id: WikiAdminRename.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2005,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -53,12 +53,13 @@
     }
 
     function renameHelper($name, $from, $to, $options = false) {
-            if ($options['regex'])
-                return preg_replace('/'.$from.'/'.($options['icase']?'i':''), $to, $name);
-            elseif ($options['icase'])
-                return str_ireplace($from, $to, $name);
-            else
+        if (isset($options['regex'])) {
+            return preg_replace('/'.$from.'/'.(isset($options['icase'])?'i':''), $to, $name);
+        } elseif (isset($options['icase'])) {
+            return str_ireplace($from, $to, $name);
+        } else {
             return str_replace($from, $to, $name);
+        }
     }
 
     function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks=false,
@@ -120,10 +121,10 @@
             $result->setAttr('class', 'feedback');
             if ($count == 1) {
                 $result->pushContent(HTML::p(
-                  "One page has been permanently renamed:"));
+                  _("One page has been renamed:")));
             } else {
                 $result->pushContent(HTML::p(
-                  fmt("%s pages have been permanently renamed:", $count)));
+                  fmt("%d pages have been renamed:", $count)));
             }
             $result->pushContent($ul);
             return $result;
@@ -136,10 +137,11 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-            $action = $request->getArg('action');
+        $action = $request->getArg('action');
         if ($action != 'browse' and $action != 'rename'
-                                and $action != _("PhpWikiAdministration")."/"._("Rename"))
-            return $this->disabled("(action != 'browse')");
+                                and $action != _("PhpWikiAdministration")."/"._("Rename")) {
+            return $this->disabled(_("Plugin not run: not in browse mode"));
+        }
 
         if ($action == 'rename') {
             // We rename a single page.
@@ -206,7 +208,7 @@
             $button_label = _("Yes");
             $header->pushContent(
               HTML::p(HTML::strong(
-                _("Are you sure you want to permanently rename the selected pages?"))));
+                _("Are you sure you want to rename the selected pages?"))));
             $header = $this->renameForm($header, $post_args, $singlepage);
         } else {
             if ($singlepage === true) {
@@ -236,7 +238,7 @@
         return HTML::form(array('action' => $request->getPostURL(),
                                 'method' => 'post'),
                           HTML::fieldset(
-                              HTML::legend("Rename page"),
+                              HTML::legend(_("Rename page")),
                               $header,
                               $buttons,
                               $list,
@@ -263,11 +265,11 @@
 
     function renameForm(&$header, $post_args, $singlepage) {
         $table = HTML::table();
-        $this->_tablePush($table, _("Rename"). " ". _("from").': ',
+        $this->_tablePush($table, _("Rename"). " ". _("from")._(": "),
                           HTML::input(array('name' => 'admin_rename[from]',
                                             'size' => 90,
                                             'value' => $post_args['from'])));
-        $this->_tablePush($table, _("to").': ',
+        $this->_tablePush($table, _("to")._(": "),
                           HTML::input(array('name' => 'admin_rename[to]',
                                             'size' => 90,
                                             'value' => $post_args['to'])));
@@ -298,9 +300,9 @@
     function _getValue ($page_handle, &$revision_handle) {
         global $request;
         $post_args = $request->getArg('admin_rename');
-        $options = array('regex' => @$post_args['regex'],
-                         'icase' => @$post_args['icase']);
-
+        $options =
+          array('regex' => isset($post_args['regex']) ? $post_args['regex'] : null,
+                'icase' => isset($post_args['icase']) ? $post_args['icase'] : null);
         $value = $post_args
             ? WikiPlugin_WikiAdminRename::renameHelper
                 ($page_handle->getName(),

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSearchReplace.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSearchReplace.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminSearchReplace.php 7448 2010-05-31 12:01:38Z vargenau $');
+// $Id: WikiAdminSearchReplace.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -103,22 +103,23 @@
             $dbi->touch();
             $result->setAttr('class', 'feedback');
             if ($count == 1) {
-                $result->pushContent(HTML::p("One page has been permanently changed:"));
+                $result->pushContent(HTML::p(_("One page has been changed:")));
             } else {
-                $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+                $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
             }
             $result->pushContent($ul);
         } else {
             $result->setAttr('class', 'error');
-            $result->pushContent(HTML::p("No pages changed."));
+            $result->pushContent(HTML::p(_("No pages changed.")));
         }
         return $result;
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-            // no action=replace support yet
-        if ($request->getArg('action') != 'browse')
-            return $this->disabled("(action != 'browse')");
+        // no action=replace support yet
+        if ($request->getArg('action') != 'browse') {
+            return $this->disabled(_("Plugin not run: not in browse mode"));
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
@@ -186,7 +187,7 @@
             $button_label = _("Yes");
             $header->pushContent(
               HTML::p(HTML::strong(
-                                   _("Are you sure you want to permanently replace text in the selected files?"))));
+                                   _("Are you sure you want to replace text in the selected files?"))));
             $this->replaceForm($header, $post_args);
         } else {
             $button_label = _("Search & Replace");
@@ -227,11 +228,11 @@
                                        _("Replace all occurences of the given string in the content of all pages.")),
                              HTML::br());
         $table = HTML::table();
-        $this->_tablePush($table, _("Replace").": ",
+        $this->_tablePush($table, _("Replace")._(": "),
                           HTML::input(array('name' => 'admin_replace[from]',
                                             'size' => 90,
                                             'value' => $post_args['from'])));
-        $this->_tablePush($table, _("by").': ',
+        $this->_tablePush($table, _("by")._(": "),
                           HTML::input(array('name' => 'admin_replace[to]',
                                             'size' => 90,
                                             'value' => $post_args['to'])));

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSelect.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSelect.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSelect.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminSelect.php 7447 2010-05-31 11:29:39Z vargenau $');
+// $Id: WikiAdminSelect.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetAcl.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetAcl.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminSetAcl.php 7651 2010-08-24 14:24:17Z vargenau $');
+// $Id: WikiAdminSetAcl.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -120,27 +120,30 @@
                 }
             }
         } else {
-            $result->pushContent(HTML::p(fmt("Invalid ACL")));
+            $result->pushContent(HTML::p(_("Invalid ACL")));
         }
         if ($count) {
             $dbi->touch();
             $result->setAttr('class', 'feedback');
             if ($count > 1) {
-                $result->pushContent(HTML::p(fmt("%s pages have been changed.",$count)));
+                $result->pushContent(HTML::p(fmt("%d pages have been changed.", $count)));
             }
         } else {
             $result->setAttr('class', 'error');
-            $result->pushContent(HTML::p(fmt("No pages changed.")));
+            $result->pushContent(HTML::p(_("No pages changed.")));
         }
         return $result;
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if ($request->getArg('action') != _("PhpWikiAdministration/SetAcl"))
-                return $this->disabled("(action != 'browse')");
-        if (!ENABLE_PAGEPERM)
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/SetAcl")) {
+                return $this->disabled(_("Plugin not run: not in browse mode"));
+            }
+        }
+        if (!ENABLE_PAGEPERM) {
             return $this->disabled("ENABLE_PAGEPERM = false");
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;
@@ -241,10 +244,10 @@
             $type = _("individual page permission");
         elseif ($type == 'default')
             $type = _("default page permission");
-        $header->pushContent(HTML::strong(_("Type").': '), HTML::tt($type),HTML::br());
-        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclLines()),HTML::br());
+        $header->pushContent(HTML::strong(_("Type")._(": ")), HTML::tt($type),HTML::br());
+        $header->pushContent(HTML::strong(_("ACL")._(": ")), HTML::tt($perm->asAclLines()),HTML::br());
 
-        $header->pushContent(HTML::p(HTML::strong(_("Description").': '),
+        $header->pushContent(HTML::p(HTML::strong(_("Description")._(": ")),
                                      _("Selected Grant checkboxes allow access, unselected checkboxes deny access."),
                                      _("To ignore delete the line."),
                                      _("To add check 'Add' near the dropdown list.")

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetAclSimple.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetAclSimple.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminSetAclSimple.php 7644 2010-08-13 13:34:26Z vargenau $');
+// $Id: WikiAdminSetAclSimple.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -43,11 +43,14 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple"))
-                return $this->disabled("(action != 'browse')");
-        if (!ENABLE_PAGEPERM)
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple")) {
+                return $this->disabled(_("Plugin not run: not in browse mode"));
+            }
+        }
+        if (!ENABLE_PAGEPERM) {
             return $this->disabled("ENABLE_PAGEPERM = false");
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetExternal.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminSetExternal.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminSetExternal.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: WikiAdminSetExternal.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2005 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -77,23 +77,25 @@
             $dbi->touch();
             $result->setAttr('class', 'feedback');
             if ($count == 1) {
-                $result->pushContent(HTML::p("One page has been permanently changed:"));
+                $result->pushContent(HTML::p(_("One page has been changed:")));
             } else {
-                $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+                $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
             }
             $result->pushContent($ul);
             return $result;
         } else {
             $result->setAttr('class', 'error');
-            $result->pushContent(HTML::p("No pages changed."));
+            $result->pushContent(HTML::p(_("No pages changed.")));
             return $result;
         }
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal"))
-                return $this->disabled("(action != 'browse')");
+        if ($request->getArg('action') != 'browse') {
+            if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal")) {
+                return $this->disabled(_("Plugin not run: not in browse mode"));
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminUtils.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminUtils.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiAdminUtils.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiAdminUtils.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikiAdminUtils.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2003,2004,2006 $ThePhpWikiProgrammingTeam
  * Copyright 2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -54,13 +54,15 @@
         $args['action'] = strtolower($args['action']);
         extract($args);
 
-        if (!$action)
+        if (!$action) {
             $this->error("No action specified");
+        }
         if (!($default_label = $this->_getLabel($action))) {
             return HTML::div(array('class' => "error"), fmt("Bad action requested: %s", $action));
         }
-        if ($request->getArg('action') != 'browse')
-            return $this->disabled("(action != 'browse')");
+        if ($request->getArg('action') != 'browse') {
+            return $this->disabled(_("Plugin not run: not in browse mode"));
+        }
 
         $posted = $request->getArg('wikiadminutils');
 
@@ -144,7 +146,7 @@
         if (!$count)
             return _("No pages with bad names had to be deleted.");
         else {
-            return HTML(fmt("Deleted %s pages with invalid names:", $count),
+            return HTML(fmt("Deleted %d pages with invalid names:", $count),
                         HTML::div(array('align'=>'left'), $list));
         }
     }
@@ -177,7 +179,7 @@
         if (!$count)
             return _("No empty, unreferenced pages were found.");
         else
-            return HTML(fmt("Deleted %s unreferenced pages:", $count),
+            return HTML(fmt("Deleted %d unreferenced pages:", $count),
                         HTML::div(array('align'=>'left'), $list),
                         ($notpurgable ?
         fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiBlog.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiBlog.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiBlog.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiBlog.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikiBlog.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2002,2003,2007,2009 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiForm.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiForm.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiForm.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiForm.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikiForm.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiFormRich.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiFormRich.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiFormRich.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiFormRich.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikiFormRich.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2006,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -172,6 +172,7 @@
         if (empty($action)) {
             return $this->error(fmt("A required argument '%s' is missing.", "action"));
         }
+
         $form = HTML::form(array('action' => $request->getPostURL(),
                                  'method' => strtolower($method),
                                  'class'  => 'wikiformrich',
@@ -241,7 +242,7 @@
               case 'combobox': // text left
                   $input['autocomplete'] = 1;
               case 'pulldown':
-                  $values = @$input['value'];
+                  $values = isset($input['value']) ? $input['value'] : '';
                   unset($input['value']);
                   unset($input['type']);
                   if (is_string($values)) $values = explode(",", $values);
@@ -321,7 +322,7 @@
         // only match begin: autocomplete_matchbegin, or
         $input['autocomplete_matchsubstring'] = "true";
         if (empty($values)) {
-            if ($input['method']) {
+            if (isset($input['method']) && $input['method']) {
                 if (empty($input['args'])) {
                     if (preg_match("/^(.*?) (.*)$/",$input['method'],$m)) {
                         $input['method'] = $m[1];

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiForum.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiForum.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiForum.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiForum.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikiForum.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiPoll.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiPoll.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikiPoll.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikiPoll.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikiPoll.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikicreoleTable.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikicreoleTable.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/WikicreoleTable.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,7 +1,7 @@
 <?php // -*-php-*-
-// rcs_id('$Id: WikicreoleTable.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: WikicreoleTable.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
- * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2008-2009, 2011 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -84,9 +84,7 @@
             if ($line[strlen($line)-1] == '|') {
                 $line = substr($line, 0, -1);
             }
-            if ($line[0] != '|') {
-                // trigger_error(sprintf(_("Line %s does not begin with a '|'."), $line), E_USER_WARNING);
-            } else {
+            if ($line[0] == '|') {
                 $table[] = $this->_parse_row($line, $basepage);
             }
         }
@@ -96,12 +94,19 @@
         if ($nbrows == 0) {
             return HTML::raw('');
         }
-        $nbcols = sizeof($table[0]);
 
+        // Number of columns is the number of cells in the longer row
+        $nbcols = 0;
         for ($i=0; $i<$nbrows; $i++) {
+            $nbcols = max($nbcols, sizeof($table[$i]));
+        }
+
+        for ($i=0; $i<$nbrows; $i++) {
             for ($j=0; $j<$nbcols; $j++) {
-                if (preg_match('/@@/', $table[$i][$j])) {
-                    $table[$i][$j] = compute_tablecell($table, $i, $j, $nbrows, $nbcols);
+                if (!isset($table[$i][$j])) {
+                    $table[$i][$j] = '';
+                } else if (preg_match('/@@/', $table[$i][$j])) {
+                    $table[$i][$j] = $this->_compute_tablecell($table, $i, $j, $nbrows, $nbcols);
                 }
             }
         }
@@ -142,6 +147,156 @@
         return $row;
     }
 
+    /**
+     * Compute cell in spreadsheet table
+     * $table: two-dimensional table
+     * $i and $j: indexes of cell to compute
+     * $imax and $jmax: table dimensions
+     */
+    function _compute_tablecell ($table, $i, $j, $imax, $jmax) {
+
+        // What is implemented:
+        // @@=SUM(R)@@ : sum of cells in current row
+        // @@=SUM(C)@@ : sum of cells in current column
+        // @@=AVERAGE(R)@@ : average of cells in current row
+        // @@=AVERAGE(C)@@ : average of cells in current column
+        // @@=MAX(R)@@ : maximum value of cells in current row
+        // @@=MAX(C)@@ : maximum value of cells in current column
+        // @@=MIN(R)@@ : minimum value of cells in current row
+        // @@=MIN(C)@@ : minimum value of cells in current column
+        // @@=COUNT(R)@@ : number of cells in current row
+        //                (numeric or not, excluding headers and current cell)
+        // @@=COUNT(C)@@ : number of cells in current column
+        //                (numeric or not, excluding headers and current cell)
+
+        $result=0;
+        $counter=0;
+        $found=false;
+
+        if (strpos($table[$i][$j], "@@=SUM(C)@@") !== false) {
+            for ($index=0; $index<$imax; $index++) {
+                if (is_numeric($table[$index][$j])) {
+                    $result += $table[$index][$j];
+                }
+            }
+            return str_replace("@@=SUM(C)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) {
+            for ($index=0; $index<$jmax; $index++) {
+                if (is_numeric($table[$i][$index])) {
+                    $result += $table[$i][$index];
+                }
+            }
+            return str_replace("@@=SUM(R)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) {
+            for ($index=0; $index<$imax; $index++) {
+                if (is_numeric($table[$index][$j])) {
+                    $result += $table[$index][$j];
+                    $counter++;
+                }
+            }
+            $result=$result/$counter;
+            return str_replace("@@=AVERAGE(C)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) {
+            for ($index=0; $index<$jmax; $index++) {
+                if (is_numeric($table[$i][$index])) {
+                    $result += $table[$i][$index];
+                    $counter++;
+                }
+            }
+            $result=$result/$counter;
+            return str_replace("@@=AVERAGE(R)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) {
+            for ($index=0; $index<$imax; $index++) {
+                if (is_numeric($table[$index][$j])) {
+                    if (!$found) {
+                        $found=true;
+                        $result=$table[$index][$j];
+                    } else {
+                        $result = max($result, $table[$index][$j]);
+                    }
+                }
+            }
+            if (!$found) {
+                $result="";
+            }
+            return str_replace("@@=MAX(C)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) {
+            for ($index=0; $index<$jmax; $index++) {
+                if (is_numeric($table[$i][$index])) {
+                    if (!$found) {
+                        $found=true;
+                        $result=$table[$i][$index];
+                    } else {
+                        $result = max($result, $table[$i][$index]);
+                    }
+                }
+            }
+            if (!$found) {
+                $result="";
+            }
+            return str_replace("@@=MAX(R)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) {
+            for ($index=0; $index<$imax; $index++) {
+                if (is_numeric($table[$index][$j])) {
+                    if (!$found) {
+                        $found=true;
+                        $result=$table[$index][$j];
+                    } else {
+                        $result = min($result, $table[$index][$j]);
+                    }
+                }
+            }
+            if (!$found) {
+                $result="";
+            }
+            return str_replace("@@=MIN(C)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) {
+            for ($index=0; $index<$jmax; $index++) {
+                if (is_numeric($table[$i][$index])) {
+                    if (!$found) {
+                        $found=true;
+                        $result=$table[$i][$index];
+                    } else {
+                        $result = min($result, $table[$i][$index]);
+                    }
+                }
+            }
+            if (!$found) {
+                $result="";
+            }
+            return str_replace("@@=MIN(R)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) {
+            for ($index=0; $index<$imax; $index++) {
+                // exclude header
+                if (!string_starts_with(trim($table[$index][$j]), "=")) {
+                    $counter++;
+                }
+            }
+            $result = $counter-1; // exclude self
+            return str_replace("@@=COUNT(C)@@", $result, $table[$i][$j]);
+
+        } else if (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) {
+            for ($index=0; $index<$jmax; $index++) {
+                // exclude header
+                if (!string_starts_with(trim($table[$i][$index]), "=")) {
+                    $counter++;
+                }
+            }
+            $result = $counter-1; // exclude self
+            return str_replace("@@=COUNT(R)@@", $result, $table[$i][$j]);
+        }
+
+        return $table[$i][$j];
+    }
+
 }
 
 // Local Variables:

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/YouTube.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/YouTube.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/YouTube.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: YouTube.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: YouTube.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2007 Reini Urban
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_AuthInfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_AuthInfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_AuthInfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: _AuthInfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: _AuthInfo.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_BackendInfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_BackendInfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_BackendInfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: _BackendInfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: _BackendInfo.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999,2000,2001,2002,2006,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_GroupInfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_GroupInfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_GroupInfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: _GroupInfo.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: _GroupInfo.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_PreferencesInfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_PreferencesInfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_PreferencesInfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: _PreferencesInfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: _PreferencesInfo.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_Retransform.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_Retransform.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_Retransform.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: _Retransform.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: _Retransform.php 8071 2011-05-18 14:56:14Z vargenau $
 /**
  * Copyright 2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_WikiTranslation.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_WikiTranslation.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/_WikiTranslation.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: _WikiTranslation.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: _WikiTranslation.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2005 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -44,48 +44,52 @@
 
 /* Container for untranslated pagenames. Needed to show up in locale/po/phpwiki.pot */
 $pgsrc_container =
-    _("AddCommentPlugin")  .','.
-    _("AddingPages")  .','.
     _("AllPagesCreatedByMe")  .','.
     _("AllPagesLastEditedByMe")  .','.
     _("AllPagesOwnedByMe")  .','.
-    _("AuthorHistoryPlugin") .','.
     _("BackLinks") .','.
-    _("CalendarListPlugin") .','.
-    _("CalendarPlugin") .','.
     _("CategoryCategory")  .','.
     _("CategoryHomePages")  .','.
-    _("CommentPlugin")  .','.
-    _("CreateTocPlugin")  .','.
     _("DebugInfo") .','.
     _("EditMetaData") .','.
-    _("EditMetaDataPlugin") .','.
-    _("ExternalSearchPlugin") .','.
     _("FindPage") .','.
-    _("FoafViewerPlugin") .','.
-    _("FrameIncludePlugin") .','.
     _("FullRecentChanges") .','.
-    _("HelloWorldPlugin") .','.
+    _("Help/AddingPages")  .','.
+    _("Help/AddCommentPlugin")  .','.
+    _("Help/AuthorHistoryPlugin") .','.
+    _("Help/CalendarListPlugin") .','.
+    _("Help/CalendarPlugin") .','.
+    _("Help/CommentPlugin")  .','.
+    _("Help/CreateTocPlugin")  .','.
+    _("Help/EditMetaDataPlugin") .','.
+    _("Help/ExternalSearchPlugin") .','.
+    _("Help/FoafViewerPlugin") .','.
+    _("Help/FrameIncludePlugin") .','.
+    _("Help/HelloWorldPlugin") .','.
+    _("Help/IncludePagePlugin") .','.
+    _("Help/LinkIcons") .','.
+    _("Help/MagicPhpWikiURLs") .','.
+    _("Help/MoreAboutMechanics") .','.
+    _("Help/OldStyleTablePlugin") .','.
+    _("Help/PhotoAlbumPlugin") .','.
+    _("Help/PhpHighlightPlugin") .','.
+    _("Help/PhpWeatherPlugin") .','.
+    _("Help/PhpWiki") .','.
+    _("Help/PloticusPlugin") .','.
+    _("Help/RawHtmlPlugin") .','.
+    _("Help/RedirectToPlugin") .','.
+    _("Help/RichTablePlugin") .','.
+    _("Help/SystemInfoPlugin") .','.
+    _("Help/TranscludePlugin") .','.
+    _("Help/UnfoldSubpagesPlugin") .','.
+    _("Help/UpLoadPlugin") .','.
+    _("Help/WabiSabi") .','.
+    _("Help/WikiBlogPlugin") .','.
+    _("Help/WikiPlugin") .','.
+    _("Help/WikiWikiWeb");
     _("HomePageAlias") .','.
-    _("IncludePagePlugin") .','.
     _("InterWiki") .','.
-    _("LinkIcons") .','.
-    _("MagicPhpWikiURLs") .','.
-    _("MoreAboutMechanics") .','.
-    _("NewMarkupTestPage") .','.
-    _("OldMarkupTestPage") .','.
-    _("OldStyleTablePlugin") .','.
 //  _("PageDump") .','.
-    _("PageGroupTest") .','.
-    _("PageGroupTest/Four") .','.
-    _("PageGroupTest/One") .','.
-    _("PageGroupTest/Three") .','.
-    _("PageGroupTest/Two") .','.
-    _("PgsrcTranslation") .','.
-    _("PhotoAlbumPlugin") .','.
-    _("PhpHighlightPlugin") .','.
-    _("PhpWeatherPlugin") .','.
-    _("PhpWiki") .','.
     _("PhpWikiAdministration/Chmod") .','.
     _("PhpWikiAdministration/Chown") .','.
     _("PhpWikiAdministration/Remove") .','.
@@ -94,33 +98,12 @@
     _("PhpWikiAdministration/SetAcl") .','.
     _("PhpWikiDocumentation") .','.
     _("PhpWikiPoll") .','.
-    _("PloticusPlugin") .','.
-    _("PgsrcTranslation") .','.
-    _("PgsrcTranslation/de") .','.
-    _("PgsrcTranslation/fr") .','.
-    _("PgsrcTranslation/it") .','.
-    _("PgsrcTranslation/es") .','.
-    _("PgsrcTranslation/nl") .','.
-    _("PgsrcTranslation/sv") .','.
-    _("PgsrcTranslation/ja") .','.
-    _("PgsrcTranslation/zh") .','.
-    _("RawHtmlPlugin") .','.
     _("RecentVisitors") .','.
-    _("RedirectToPlugin") .','.
     _("ReleaseNotes") .','.
-    _("RichTablePlugin") .','.
 //    _("SpellCheck") .','.
     _("SteveWainstead") .','.
-    _("SystemInfoPlugin") .','.
-    _("TranscludePlugin") .','.
     _("TranslateText") .','.
-    _("UnfoldSubpagesPlugin") .','.
     _("UpLoad") .','.
-    _("UpLoadPlugin") .','.
-    _("WabiSabi") .','.
-    _("WikiBlogPlugin") .','.
-    _("WikiPlugin") .','.
-    _("WikiWikiWeb");
 
 require_once('lib/PageList.php');
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/text2png.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/text2png.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/text2png.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: text2png.php 7639 2010-08-11 12:15:16Z vargenau $');
+// $Id: text2png.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 1999,2000,2001,2002,2007 $ThePhpWikiProgrammingTeam
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/prepend.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/prepend.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/prepend.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -3,7 +3,7 @@
  *
  * Things which must be done and defined before anything else.
  */
-// rcs_id('$Id: prepend.php 7684 2010-09-10 12:13:48Z vargenau $');
+// $Id: prepend.php 7964 2011-03-05 17:05:30Z vargenau $
 
 // see lib/stdlib.php: phpwiki_version()
 define('PHPWIKI_VERSION', '1.4.0RC1');
@@ -34,9 +34,9 @@
 // A new php-5.1.x feature: Turn off php-5.1.x auto_globals_jit = On, or use this mess below.
 if (empty($GLOBALS['HTTP_SERVER_VARS'])) {
     $GLOBALS['HTTP_SERVER_VARS']  =& $_SERVER;
-    $GLOBALS['HTTP_ENV_VARS'] 	  =& $_ENV;
-    $GLOBALS['HTTP_GET_VARS'] 	  =& $_GET;
-    $GLOBALS['HTTP_POST_VARS'] 	  =& $_POST;
+    $GLOBALS['HTTP_ENV_VARS']       =& $_ENV;
+    $GLOBALS['HTTP_GET_VARS']       =& $_GET;
+    $GLOBALS['HTTP_POST_VARS']       =& $_POST;
     $GLOBALS['HTTP_SESSION_VARS'] =& $_SESSION;
     $GLOBALS['HTTP_COOKIE_VARS']  =& $_COOKIE;
     $GLOBALS['HTTP_REQUEST_VARS'] =& $_REQUEST;
@@ -64,7 +64,7 @@
 }
 if (defined('DEBUG') and (DEBUG & 32) and extension_loaded("apd")) {
     apd_set_pprof_trace();
-    /*	FUNCTION_TRACE      1
+    /*    FUNCTION_TRACE      1
         ARGS_TRACE          2
         ASSIGNMENT_TRACE    4
         STATEMENT_TRACE     8
@@ -110,7 +110,7 @@
                        $this->getTime('utime', $now),
                        $this->getTime('stime', $now));
     }
-      
+
     function _CLK_TCK() {
         // FIXME: this is clearly not always right.
         // But how to figure out the right value?
@@ -125,7 +125,7 @@
 $RUNTIMER = new DebugTimer;
 /*
 if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
-    error_reporting(E_ALL & ~E_STRICT); 	// exclude E_STRICT
+    error_reporting(E_ALL & ~E_STRICT);     // exclude E_STRICT
 else
     error_reporting(E_ALL); // php4
 //echo " prepend: ", error_reporting();
@@ -144,12 +144,12 @@
 
     if ($in_exit)
         exit;
-  
+
     $in_exit = true;
 
     global $ErrorManager;
     $ErrorManager->flushPostponedErrors();
- 
+
     if(!empty($errormsg)) {
         PrintXML(HTML::br(), $errormsg);
         print "\n</body></html>";
@@ -169,5 +169,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/purgepage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/purgepage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/purgepage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: purgepage.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: purgepage.php 8065 2011-05-04 10:27:44Z vargenau $
 require_once('lib/Template.php');
 
 function PurgePage (&$request) {
@@ -50,7 +50,7 @@
         $dbi = $request->getDbh();
         $dbi->purgePage($pagename);
         $dbi->touch();
-        $html = HTML::div(array('class' => 'feedback'), fmt("Purged page '%s' successfully.", $pagename));
+        $html = HTML::p(array('class' => 'feedback'), fmt("Purged page '%s' successfully.", $pagename));
     }
 
     GeneratePage($html, _("Purge Page"));

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/removepage.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/removepage.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/removepage.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: removepage.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: removepage.php 8065 2011-05-04 10:27:44Z vargenau $
 require_once('lib/Template.php');
 
 function RemovePage (&$request) {
@@ -50,7 +50,7 @@
         $dbi = $request->getDbh();
         $dbi->deletePage($pagename);
         $dbi->touch();
-        $html = HTML::div(array('class' => 'feedback'), fmt("Removed page '%s' successfully.", $pagename));
+        $html = HTML::p(array('class' => 'feedback'), fmt("Removed page '%s' successfully.", $pagename));
     }
 
     GeneratePage($html, _("Remove Page"));

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/spam_babycart.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/spam_babycart.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/spam_babycart.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,12 +1,11 @@
 <?php
-// rcs_id('$Id: spam_babycart.php 7417 2010-05-19 12:57:42Z vargenau $');
 /*
-* $Id: spam_babycart.php 7417 2010-05-19 12:57:42Z vargenau $
+* $Id: spam_babycart.php 7964 2011-03-05 17:05:30Z vargenau $
 * Author: Bob Apthorpe <apthorpe+babycart at cynistar.net>
 * Proof-of-concept PHP fragment to flag blog/wiki spam
 *
 * URL: <http://www.cynistar.net/~apthorpe/code/babycart/babycart.html>
-* INSTALL: 
+* INSTALL:
 *   cpan Blog::SpamAssassin
 *   copy contrib/babycart to /usr/local/bin/
 */
@@ -28,10 +27,10 @@
     $descriptorspec = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => array("pipe", "w"));
     $process = proc_open(BABYCART_PATH, $descriptorspec, $pipes);
     if (is_resource($process)) {
-	// $pipes now looks like this:
-	// 0 => writeable handle connected to child stdin
-	// 1 => readable handle connected to child stdout
-	// Any error output will be appended to $pipes[2]
+    // $pipes now looks like this:
+    // 0 => writeable handle connected to child stdin
+    // 1 => readable handle connected to child stdout
+    // Any error output will be appended to $pipes[2]
 
         // Send comment out for analysis
         fwrite($pipes[0], $comment);
@@ -56,7 +55,7 @@
         $return_value = proc_close($process);
 
         // Interpret results and yield judgment
-        
+
         // print "Response: $response\n";
         // split into status, note, score, rules...
         if ($response) {
@@ -67,7 +66,7 @@
              0 - verdict (OK or SUSPICIOUS)
              1 - note (additional info on verdict, whether tests ran, etc.)
              2 - numeric score; anything greater than 5-7 is suspect
-             3 - comma-delimited list of rules hit (may be empty) 
+             3 - comma-delimited list of rules hit (may be empty)
             */
             return explode(',', $response, 4);
         }
@@ -75,4 +74,4 @@
     trigger_error("Couldn't process ".BABYCART_PATH.".\n".$error, E_USER_WARNING);
     return -1; // process error
 }
-?>
\ No newline at end of file
+?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/stdlib.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/stdlib.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/stdlib.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: stdlib.php 7716 2010-10-20 16:19:40Z vargenau $');
+<?php // $Id: stdlib.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -36,7 +36,7 @@
     ConvertOldMarkup ($content, $markup_type = "block")
     MangleXmlIdentifier($str)
     UnMangleXmlIdentifier($str)
-  
+
     class Stack { push($item), pop(), cnt(), top() }
     class Alert { show() }
     class WikiPageName {getParent(),isValid(),getWarnings() }
@@ -97,10 +97,10 @@
     is_localhost($url)
     javascript_quote_string($s)
     isSerialized($s)
+    is_whole_number($var)
     parse_attributes($line)
     is_image ($filename)
     is_video ($filename)
-    compute_tablecell ($table, $i, $j, $imax, $jmax)
 
   function: linkExistingWikiWord($wikiword, $linktext, $version)
   moved to: lib/WikiTheme.php
@@ -109,7 +109,7 @@
 else define('_PHPWIKI_STDLIB_LOADED', true);
 
 define('MAX_PAGENAME_LENGTH', 100);
-          
+
 /**
  * Convert string to a valid XML identifier.
  *
@@ -136,7 +136,7 @@
 function MangleXmlIdentifier($str) {
     if (!$str)
         return 'empty.';
-  
+
     return preg_replace('/[^-_:A-Za-z0-9]|(?<=^)[^A-Za-z]/e',
                         "'x' . sprintf('%02x', ord('\\0')) . '.'",
                         $str);
@@ -151,20 +151,20 @@
 }
 
 /**
- * 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() {
+* 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.
- * 			  If a WikiDB_PageRevision object function will extract the name to link to.
+ *               If a WikiDB_Page object function will extract the name to link to.
+ *               If a WikiDB_PageRevision object function will extract the name to link to.
  * @param array $args
  * @param boolean $get_abs_url Default value is false.
  * @return string The absolute URL to the page passed as $pagename.
@@ -191,21 +191,21 @@
         }
     }
     if (!$get_abs_url and DEBUG and $request->getArg('start_debug')) {
-    	if (!$args)
-    	    $args = 'start_debug=' . $request->getArg('start_debug');
-    	elseif (is_array($args))
-    	    $args['start_debug'] = $request->getArg('start_debug');
-    	else
-    	    $args .= '&start_debug=' . $request->getArg('start_debug');
+        if (!$args)
+            $args = 'start_debug=' . $request->getArg('start_debug');
+        elseif (is_array($args))
+            $args['start_debug'] = $request->getArg('start_debug');
+        else
+            $args .= '&start_debug=' . $request->getArg('start_debug');
     }
     if (is_array($args)) {
         $enc_args = array();
         foreach ($args as $key => $val) {
             // avoid default args
             if (USE_PATH_INFO and $key == 'pagename')
-            	;
+                ;
             elseif ($key == 'action' and $val == 'browse')
-        	;
+            ;
             elseif (!is_array($val)) // ugly hack for getURLtoSelf() which also takes POST vars
               $enc_args[] = urlencode($key) . '=' . urlencode($val);
         }
@@ -214,24 +214,24 @@
 
     if (USE_PATH_INFO or !empty($WikiTheme->HTML_DUMP_SUFFIX)) {
         $url = $get_abs_url ? (SERVER_URL . VIRTUAL_PATH . "/") : "";
-	$base = preg_replace('/%2f/i', '/', rawurlencode($pagename));
-	$url .= $base;
+    $base = preg_replace('/%2f/i', '/', rawurlencode($pagename));
+    $url .= $base;
         if (!empty($WikiTheme->HTML_DUMP_SUFFIX)) {
-	    if (!empty($WikiTheme->VALID_LINKS) and $request->getArg('action') == 'pdf') {
-	    	if (!in_array($pagename, $WikiTheme->VALID_LINKS))
-	    	    $url = '';
-	    	else  
-		    $url = $base . $WikiTheme->HTML_DUMP_SUFFIX;
-	    } else {
-		$url .= $WikiTheme->HTML_DUMP_SUFFIX;
-		if ($args)
-		    $url .= "?$args";
-	    }
+        if (!empty($WikiTheme->VALID_LINKS) and $request->getArg('action') == 'pdf') {
+            if (!in_array($pagename, $WikiTheme->VALID_LINKS))
+                $url = '';
+            else
+            $url = $base . $WikiTheme->HTML_DUMP_SUFFIX;
         } else {
-	    if ($args)
-		$url .= "?$args";
-	}
+        $url .= $WikiTheme->HTML_DUMP_SUFFIX;
+        if ($args)
+            $url .= "?$args";
+        }
+        } else {
+        if ($args)
+        $url .= "?$args";
     }
+    }
     else {
         $url = $get_abs_url ? SERVER_URL . SCRIPT_NAME : basename(SCRIPT_NAME);
         $url .= "?pagename=" . rawurlencode($pagename);
@@ -419,9 +419,6 @@
     // support new syntax: [prefix/image.jpg size=50% border=n]
     if (empty($alt)) $alt = "";
 
-    // Extract URL
-    $arr = explode(' ',$url);
-    if (!empty($arr)) $url = $arr[0];
     if (! IsSafeURL($url)) {
         $link = HTML::span(array('class' => 'error'), _("BAD URL -- remove all of <, >, \""));
         return $link;
@@ -429,9 +426,13 @@
     // spaces in inline images must be %20 encoded!
     $link = HTML::img(array('src' => $url));
 
-    // Extract attributes
-    $arr = parse_attributes(strstr($ori_url, " "));
+    // Extract attributes and shorten url
+    $arr = parse_attributes(strstr($url, " "));
     foreach ($arr as $attr => $value) {
+        // strip attr=... url suffix
+        $i = strpos($url, $attr);
+        $url = substr($url, 0, $i-1);
+        $link->setAttr('src', $url);
         // These attributes take strings: lang, id, title, alt
         if (($attr == "lang")
           || ($attr == "id")
@@ -477,9 +478,9 @@
         }
     }
     // Correct silently the most common error
-    if ($url != $ori_url and empty($arr) and !preg_match("/^http/",$url)) {
-	// space belongs to the path
-	$file = NormalizeLocalFileName($ori_url);
+    if (strstr($ori_url, " ") and !preg_match("/^http/",$url)) {
+    // space belongs to the path
+    $file = NormalizeLocalFileName($ori_url);
         if (file_exists($file)) {
              $link = HTML::img(array('src' => $ori_url));
              trigger_error(
@@ -489,7 +490,7 @@
              $file = substr($file, strlen(getUploadDataPath()));
              $path = getUploadFilePath().$file;
              if (file_exists($path)) {
-             	 trigger_error(sprintf(_("Invalid image link fixed \"%s\" => \"%s\".\n Spaces must be quoted with %%20."),
+                  trigger_error(sprintf(_("Invalid image link fixed \"%s\" => \"%s\".\n Spaces must be quoted with %%20."),
                                        $url, $ori_url), E_USER_WARNING);
                  $link->setAttr('src', getUploadDataPath() . $file);
                  $url = $ori_url;
@@ -577,6 +578,7 @@
  *   http://www.alleged.org.uk/pdc/2002/svg-object.html
  *
  * Allowed object tags:
+ *   ID
  *   DATA=URI (object data)
  *   CLASSID=URI (location of implementation)
  *   ARCHIVE=CDATA (archive files)
@@ -594,30 +596,30 @@
  */
 function ImgObject($img, $url) {
     // get the url args: data="sample.svgz" type="image/svg+xml" width="400" height="300"
-    $params = explode(",","data,classid,archive,codebase,name,usemap,type,".
-			  "codetype,standby,tabindex,declare");
+    $params = explode(",","id,width,height,data,classid,archive,codebase,name,usemap,type,".
+              "codetype,standby,tabindex,declare");
     if (is_array($url)) {
-    	$args = $url;
- 	$found = array();
+        $args = $url;
+     $found = array();
         foreach ($args as $attr => $value) {
-	    foreach ($params as $param) {
-		if ($param == $attr) {
-		    $img->setAttr($param, $value);
-		    if (isset($found[$param])) $found[$param]++;
-		    else $found[$param] = 1;
-		    break;
-		}
-	    }
+        foreach ($params as $param) {
+        if ($param == $attr) {
+            $img->setAttr($param, $value);
+            if (isset($found[$param])) $found[$param]++;
+            else $found[$param] = 1;
+            break;
         }
-	// now all remaining args are added as <param> to the object
-	$params = array();
+        }
+        }
+    // now all remaining args are added as <param> to the object
+    $params = array();
         foreach ($args as $attr => $value) {
-	    if (!isset($found[$attr])) {
-		$params[] = HTML::param(array('name'  => $attr,
+        if (!isset($found[$attr])) {
+        $params[] = HTML::param(array('name'  => $attr,
                                               'value' => $value));
-	    }
-	}
-	$url = $img->getAttr('src');
+        }
+    }
+    $url = $img->getAttr('src');
         $force_img = "png|jpg|gif|jpeg|bmp";
         if (!preg_match("/\.(".$force_img.")/i", $url)) {
             $img->setAttr('src', false);
@@ -628,23 +630,23 @@
           $url = array_shift($args);
           $found = array();
           foreach ($args as $attr) {
-	    foreach ($params as $param) {
-		if (preg_match("/^$param=(\S+)$/i",$attr,$m)) {
-		    $img->setAttr($param, $m[1]);
-		    if (isset($found[$param])) $found[$param]++;
-		    else $found[$param] = 1;
-		    break;
-		}
-	    }
+        foreach ($params as $param) {
+        if (preg_match("/^$param=(\S+)$/i",$attr,$m)) {
+            $img->setAttr($param, $m[1]);
+            if (isset($found[$param])) $found[$param]++;
+            else $found[$param] = 1;
+            break;
         }
-	// now all remaining args are added as <param> to the object
-	$params = array();
+        }
+        }
+    // now all remaining args are added as <param> to the object
+    $params = array();
         foreach ($args as $attr) {
-	    if (!isset($found[$attr]) and preg_match("/^(\S+)=(\S+)$/i",$attr,$m)) {
-		$params[] = HTML::param(array('name'  => $m[1],
+        if (!isset($found[$attr]) and preg_match("/^(\S+)=(\S+)$/i",$attr,$m)) {
+        $params[] = HTML::param(array('name'  => $m[1],
                                               'value' => $m[2]));
-	    }
-	}
+        }
+    }
       }
     }
     $type = $img->getAttr('type');
@@ -655,10 +657,10 @@
     }
     $object = HTML::object(array_merge($img->_attr,
                                        array('type' => $type)), //'src' => $url
-    			$img->_content);
+                $img->_content);
     $object->setAttr('class', 'inlineobject');
     if ($params) {
-	foreach ($params as $param) $object->pushContent($param);
+    foreach ($params as $param) $object->pushContent($param);
     }
     if (isBrowserSafari() and !isBrowserSafari(532)) { // recent chrome can do OBJECT
         return HTML::embed($object->_attr, $object->_content);
@@ -680,7 +682,7 @@
         $this->size++;
         return true;
     }
-  
+
     function pop() {
         if ($this->size == 0) {
             return false; // stack is empty
@@ -688,18 +690,18 @@
         $this->size--;
         return $this->items[$this->size];
     }
-  
+
     function cnt() {
         return $this->size;
     }
-  
+
     function top() {
         if($this->size)
             return $this->items[$this->size - 1];
         else
             return '';
     }
-  
+
 }
 // end class definition
 
@@ -716,7 +718,7 @@
 
 function LinkPhpwikiURL($url, $text = '', $basepage = false) {
     $args = array();
-  
+
     if (!preg_match('/^ phpwiki: ([^?]*) [?]? (.*) $/x', $url, $m)) {
         return HTML::span(array('class' => 'error'), _("BAD phpwiki: URL"));
     }
@@ -724,7 +726,7 @@
     if ($m[1])
         $pagename = urldecode($m[1]);
     $qargs = $m[2];
-  
+
     if (empty($pagename) &&
         preg_match('/^(diff|edit|links|info)=([^&]+)$/', $qargs, $m)) {
         // Convert old style links (to not break diff links in
@@ -741,7 +743,7 @@
 
     if (isset($args['action']) && $args['action'] == 'browse')
         unset($args['action']);
-  
+
     /*FIXME:
       if (empty($args['action']))
       $class = 'wikilink';
@@ -759,7 +761,7 @@
                               HTML::u(_("Lock page to enable link")));
         $class = 'wikiadmin';
     }
-  
+
     if (!$text)
         $text = HTML::span(array('class' => 'rawurl'), $url);
 
@@ -768,7 +770,7 @@
         global $WikiTheme;
         return $WikiTheme->linkBadWikiWord($wikipage, $url);
     }
-  
+
     return HTML::a(array('href'  => WikiURL($pagename, $args),
                          'class' => $class),
                    $text);
@@ -794,13 +796,13 @@
      * This is the full name of the page (without anchor).
      */
     //var $name;
-  
+
     /** The anchor.
      *
      * This is the referenced anchor within the page, or the empty string.
      */
     //var $anchor;
-  
+
     /** Constructor
      *
      * @param mixed $name Page name.
@@ -818,7 +820,7 @@
             $this->shortName = $name;
             if (strstr($name, ':')) {
                 list($moniker, $shortName) = explode (":", $name, 2);
-	  	$map = getInterwikiMap(); // allow overrides to custom maps
+          $map = getInterwikiMap(); // allow overrides to custom maps
                 if (isset($map->_map[$moniker])) {
                     $url = $map->_map[$moniker];
                     if (strstr($url, '%s'))
@@ -837,17 +839,17 @@
                     }
                     if (strstr($shortName, '?')) {
                         list($shortName, $dummy) = explode("\?", $shortName, 2);
-		    }
+            }
                     $this->shortName = $shortName;
                 }
             }
-	    // FIXME: We should really fix the cause for "/PageName" in the WikiDB
+        // FIXME: We should really fix the cause for "/PageName" in the WikiDB
             if ($name == '' or $name[0] == SUBPAGE_SEPARATOR) {
                 if ($basename)
                     $name = $this->_pagename($basename) . $name;
                 else {
                     $name = $this->_normalize_bad_pagename($name);
-		    $this->shortName = $name;
+            $this->shortName = $name;
                 }
             }
         }
@@ -861,9 +863,9 @@
     }
 
     function getName() {
-    	return $this->name;
+        return $this->name;
     }
-  
+
     function getParent() {
         $name = $this->name;
         if (!($tail = strrchr($name, SUBPAGE_SEPARATOR)))
@@ -885,26 +887,26 @@
             $warnings = array_merge($warnings, $this->_errors);
         if (!$warnings)
             return false;
-      
+
         return sprintf(_("'%s': Bad page name: %s"),
                        $this->shortName, join(', ', $warnings));
     }
-  
+
     function _pagename($page) {
-	if (isa($page, 'WikiDB_Page'))
-	    return $page->getName();
+    if (isa($page, 'WikiDB_Page'))
+        return $page->getName();
         elseif (isa($page, 'WikiDB_PageRevision'))
-	    return $page->getPageName();
+        return $page->getPageName();
         elseif (isa($page, 'WikiPageName'))
-	    return $page->name;
+        return $page->name;
         // '0' or e.g. '1984' should be allowed though
         if (!is_string($page) and !is_integer($page)) {
             trigger_error(sprintf("Non-string pagename '%s' (%s)(%s)",
                                   $page, gettype($page), get_class($page)),
                           E_USER_NOTICE);
         }
-	//assert(is_string($page));
-	return $page;
+    //assert(is_string($page));
+    return $page;
     }
 
     function _normalize_bad_pagename($name) {
@@ -932,7 +934,7 @@
         $pagename = preg_replace('/[\s\xa0]+/', ' ', $orig = $pagename);
         if ($pagename != $orig)
             $this->_warnings[] = _("White space converted to single space");
-  
+
         // Delete any control characters.
         if (DATABASE_TYPE == 'cvs' or DATABASE_TYPE == 'file' or DATABASE_TYPE == 'flatfile') {
             $pagename = preg_replace('/[\x00-\x1f\x7f\x80-\x9f]/', '', $orig = $pagename);
@@ -954,7 +956,7 @@
             $this->_warnings[] = _("';' is deprecated");
             $pagename = str_replace(';', '', $pagename);
         }*/
-      
+
         // not only for SQL, also to restrict url length
         if (strlen($pagename) > MAX_PAGENAME_LENGTH) {
             $pagename = substr($pagename, 0, MAX_PAGENAME_LENGTH);
@@ -971,7 +973,7 @@
             $pagename = str_replace('..', '', $pagename);
             $pagename = str_replace(':', '', $pagename);
         }
-      
+
         return $pagename;
     }
 }
@@ -1002,7 +1004,7 @@
 
     static $subs;
     static $block_re;
-  
+
     // FIXME:
     // Trying to detect why the 2nd paragraph of OldTextFormattingRules or
     // AnciennesR%E8glesDeFormatage crashes.
@@ -1013,9 +1015,9 @@
     if (in_array(php_sapi_name(),array('apache2handler','apache2filter','isapi'))
         and preg_match("/plugin CreateToc/", $text))
     {
-    	trigger_error(_("The CreateTocPlugin is not yet old markup compatible! ")
-    	             ._("Please remove the CreateToc line to be able to reformat this page to old markup. ")
-    	             ._("Skipped."), E_USER_WARNING);
+        trigger_error(_("The CreateTocPlugin is not yet old markup compatible! ")
+                     ._("Please remove the CreateToc line to be able to reformat this page to old markup. ")
+                     ._("Skipped."), E_USER_WARNING);
         $debug_skip = true;
         //if (!DEBUG) return $text;
         return $text;
@@ -1055,7 +1057,7 @@
         // Escape '<'s
         //$orig[] = '/<(?!\?plugin)|(?<!^)</m';
         //$repl[] = '~<';
-      
+
         // Convert footnote references.
         $orig[] = '/(?<=.)(?<!~)\[\s*(\d+)\s*\]/m';
         $repl[] = '#[|ftnt_ref_\\1]<sup>~[[\\1|#ftnt_\\1]~]</sup>';
@@ -1069,7 +1071,7 @@
         // Escape nestled markup.
         $orig[] = '/^(?<=^|\s)[=_](?=\S)|(?<=\S)[=_*](?=\s|$)/m';
         $repl[] = '~\\0';
-      
+
         // in old markup headings only allowed at beginning of line
         $orig[] = '/!/';
         $repl[] = '~!';
@@ -1105,15 +1107,15 @@
         // Section Title
         $blockpats[] = '!{1,3}[^!]';
         /*
-	removed .|\n in the anchor not to crash on /m because with /m "." already includes \n
-	this breaks headings but it doesn't crash anymore (crash on non-cgi, non-cli only)
-	*/
+    removed .|\n in the anchor not to crash on /m because with /m "." already includes \n
+    this breaks headings but it doesn't crash anymore (crash on non-cgi, non-cli only)
+    */
         $block_re = ( '/\A((?:.|\n)*?)(^(?:'
                       . join("|", $blockpats)
                       . ').*$)\n?/m' );
-      
+
     }
-  
+
     if ($markup_type != "block") {
         list ($orig, $repl) = $subs[$markup_type];
         return preg_replace($orig, $repl, $text);
@@ -1121,15 +1123,15 @@
     else {
         list ($orig, $repl) = $subs['inline'];
         $out = '';
-	//FIXME:
-	// php crashes here in the 2nd paragraph of OldTextFormattingRules,
-	// AnciennesR%E8glesDeFormatage and more
-	// See http://www.pcre.org/pcre.txt LIMITATIONS
-	 while (preg_match($block_re, $text, $m)) {
+    //FIXME:
+    // php crashes here in the 2nd paragraph of OldTextFormattingRules,
+    // AnciennesR%E8glesDeFormatage and more
+    // See http://www.pcre.org/pcre.txt LIMITATIONS
+     while (preg_match($block_re, $text, $m)) {
             $text = substr($text, strlen($m[0]));
             list (,$leading_text, $block) = $m;
             $suffix = "\n";
-          
+
             if (strchr(" \t", $block[0])) {
                 // Indented block
                 $prefix = "<pre>\n";
@@ -1145,7 +1147,7 @@
                 preg_match('/^([#*;]*)([*#]|;.*?:) */', $block, $m);
                 list (,$ind,$bullet) = $m;
                 $block = substr($block, strlen($m[0]));
-              
+
                 $indent = str_repeat('     ', strlen($ind));
                 if ($bullet[0] == ';') {
                     //$term = ltrim(substr($bullet, 1));
@@ -1223,10 +1225,10 @@
  * @return string The split name.
  */
 function SplitPagename ($page) {
-  
+
     if (preg_match("/\s/", $page))
         return $page;           // Already split --- don't split any more.
-  
+
     // This algorithm is specialized for several languages.
     // (Thanks to Pierrick MEIGNEN)
     // Improvements for other languages welcome.
@@ -1246,7 +1248,7 @@
             $RE[] = '/([[:lower:]])((?<!Mc|Di)[[:upper:]]|\d)/';
             break;
         }
-	$sep = preg_quote(SUBPAGE_SEPARATOR, '/');
+    $sep = preg_quote(SUBPAGE_SEPARATOR, '/');
         // This the single-letter words 'I' and 'A' from any following
         // capitalized words.
         switch ($GLOBALS['LANG']) {
@@ -1265,13 +1267,13 @@
         // Split at subpage seperators. TBD in WikiTheme.php
         $RE[] = "/([^${sep}]+)(${sep})/";
         $RE[] = "/(${sep})([^${sep}]+)/";
-      
+
         foreach ($RE as $key)
             $RE[$key] = $key;
     }
 
     foreach ($RE as $regexp) {
-	$page = preg_replace($regexp, '\\1 \\2', $page);
+    $page = preg_replace($regexp, '\\1 \\2', $page);
     }
     return $page;
 }
@@ -1407,7 +1409,7 @@
 
 
 /**
- * Format number as kilobytes or bytes.
+ * Format number as kibibytes or bytes.
  * Short format is used for PageList
  * Long format is used in PageInfo
  *
@@ -1420,16 +1422,16 @@
         return fmt("-???");
     if ($bytes < 1024) {
         if (! $longformat)
-            $size = fmt("%s b", $bytes);
+            $size = fmt("%s B", $bytes);
         else
             $size = fmt("%s bytes", $bytes);
     }
     else {
         $kb = round($bytes / 1024, 1);
         if (! $longformat)
-            $size = fmt("%s k", $kb);
+            $size = fmt("%s KiB", $kb);
         else
-            $size = fmt("%s Kb (%s bytes)", $kb, $bytes);
+            $size = fmt("%s KiB (%s bytes)", $kb, $bytes);
     }
     return $size;
 }
@@ -1509,7 +1511,7 @@
     $fmt = gettext($fmt);
     // PHP's sprintf doesn't support variable with specifiers,
     // like sprintf("%*s", 10, "x"); --- so we won't either.
-  
+
     if (preg_match_all('/(?<!%)%(\d+)\$/x', $fmt, $m)) {
         // Format string has '%2$s' style argument reordering.
         // PHP doesn't support this.
@@ -1518,10 +1520,10 @@
             // strings uncluttered
             trigger_error(sprintf(_("Can't mix '%s' with '%s' type format strings"),
                                   '%1\$s','%s'), E_USER_WARNING); //php+locale error
-      
+
         $fmt = preg_replace('/(?<!%)%\d+\$/x', '%', $fmt);
         $newargs = array();
-      
+
         // Reorder arguments appropriately.
         foreach($m[1] as $argnum) {
             if ($argnum < 1 || $argnum > count($args))
@@ -1531,7 +1533,7 @@
         }
         $args = $newargs;
     }
-  
+
     // Not all PHP's have vsprintf, so...
     array_unshift($args, $fmt);
     return call_user_func_array('sprintf', $args);
@@ -1635,22 +1637,22 @@
 class ListRegexExpand {
     //var $match, $list, $index, $case_sensitive;
     function ListRegexExpand (&$list, $match, $case_sensitive = true) {
-    	$this->match = $match;
-    	$this->list = &$list;
-    	$this->case_sensitive = $case_sensitive;
+        $this->match = $match;
+        $this->list = &$list;
+        $this->case_sensitive = $case_sensitive;
         //$this->index = false;
     }
     function listMatchCallback ($item, $key) {
         $quoted = str_replace('/','\/',$item);
-    	if (preg_match('/' . $this->match . ($this->case_sensitive ? '/' : '/i'),
+        if (preg_match('/' . $this->match . ($this->case_sensitive ? '/' : '/i'),
                        $quoted)) {
-	    unset($this->list[$this->index]);
+        unset($this->list[$this->index]);
             $this->list[] = $item;
         }
     }
     function expandRegex ($index, &$pages) {
-    	$this->index = $index;
-    	array_walk($pages, array($this, 'listMatchCallback'));
+        $this->index = $index;
+        array_walk($pages, array($this, 'listMatchCallback'));
         return $this->list;
     }
 }
@@ -1705,10 +1707,10 @@
         for ($i = 0, $max = sizeof($list); $i < $max; $i++) {
             $f = $list[$i];
             if (preg_match('/[\?\*]/',$f)) {
-            	reset($allnames);
-            	$expand = new ListRegexExpand($list,
+                reset($allnames);
+                $expand = new ListRegexExpand($list,
                     $glob_style ? glob_to_pcre($f) : $f, $case_sensitive);
-            	$expand->expandRegex($i, $allnames);
+                $expand->expandRegex($i, $allnames);
             }
         }
     }
@@ -1717,7 +1719,7 @@
 
 // echo implode(":",explodeList("Test*",array("xx","Test1","Test2")));
 function explodePageList($input, $include_empty=false, $sortby='pagename',
-			 $limit='', $exclude='') {
+             $limit='', $exclude='') {
     include_once("lib/PageList.php");
     return PageList::explodePageList($input, $include_empty, $sortby, $limit, $exclude);
 }
@@ -1774,8 +1776,8 @@
              and ! isset($disabled[strtolower($function_name)])
              );
 }
-  
-  
+
+
 /** Hash a value.
  *
  * This is used for generating ETags.
@@ -1784,7 +1786,7 @@
     if (is_scalar($x)) {
         return $x;
     }
-    elseif (is_array($x)) {          
+    elseif (is_array($x)) {
         ksort($x);
         return md5(serialize($x));
     }
@@ -1881,7 +1883,9 @@
 
     global $AllActionPages;
 
-    return (in_array($filename, $AllActionPages));
+    $localizedAllActionPages = array_map("gettext", $AllActionPages);
+
+    return (in_array($filename, $localizedAllActionPages));
 }
 
 /**
@@ -1908,13 +1912,13 @@
         if ($buttons === false)
             $buttons = array();
 
-	if (is_array($body)) {
-	    $html = HTML::ol();
-	    foreach ($body as $li) {
-		$html->pushContent(HTML::li($li));
-	    }
-	    $body = $html;
-	}
+    if (is_array($body)) {
+        $html = HTML::ol();
+        foreach ($body as $li) {
+        $html->pushContent(HTML::li($li));
+        }
+        $body = $html;
+    }
         $this->_tokens = array('HEADER' => $head, 'CONTENT' => $body);
         $this->_buttons = $buttons;
     }
@@ -1927,7 +1931,7 @@
 
         $tokens = $this->_tokens;
         $tokens['BUTTONS'] = $this->_getButtons();
-      
+
         $request->discardOutput();
         $tmpl = new Template('dialog', $request, $tokens);
         $tmpl->printXML();
@@ -1941,7 +1945,7 @@
         $buttons = $this->_buttons;
         if (!$buttons)
             $buttons = array(_("Okay") => $request->getURLtoSelf());
-      
+
         global $WikiTheme;
         foreach ($buttons as $label => $url)
             print "$label $url\n";
@@ -2045,7 +2049,7 @@
     $locharset = strtolower($charset);
 
     if( $locharset != "utf-8" and $ishigh and $isutf )
-	$s = charset_convert('UTF-8', $locharset, $s);
+    $s = charset_convert('UTF-8', $locharset, $s);
     if ($locharset == "utf-8" and $ishigh and !$isutf )
         return utf8_encode( $s );
 
@@ -2116,9 +2120,9 @@
 // content: string or array of strings
 function firstNWordsOfContent( $n, $content ) {
     if ($content and $n > 0) {
-    	if (is_array($content)) {
-    	    // fixme: return a list of lines then?
-    	    //$content = join("\n", $content);
+        if (is_array($content)) {
+            // fixme: return a list of lines then?
+            //$content = join("\n", $content);
             //$return_array = true;
             $wordcount = 0;
             foreach ($content as $line) {
@@ -2204,8 +2208,8 @@
 // use this faster version: only load ExternalReferrer if we came from an external referrer
 function isExternalReferrer(&$request) {
     if ($referrer = $request->get('HTTP_REFERER')) {
-    	$home = SERVER_URL; // SERVER_URL or SCRIPT_NAME, if we want to check sister wiki's also
-    	if (string_starts_with(strtolower($referrer), strtolower($home))) return false;
+        $home = SERVER_URL; // SERVER_URL or SCRIPT_NAME, if we want to check sister wiki's also
+        if (string_starts_with(strtolower($referrer), strtolower($home))) return false;
         require_once("lib/ExternalReferrer.php");
         $se = new SearchEngines();
         return $se->parseSearchQuery($referrer);
@@ -2219,10 +2223,10 @@
  */
 function loadPhpExtension($extension) {
     if (!extension_loaded($extension)) {
-	$isWindows = (substr(PHP_OS,0,3) == 'WIN');
+    $isWindows = (substr(PHP_OS,0,3) == 'WIN');
         $soname = ($isWindows ? 'php_' : '')
-	        . $extension
-	        . ($isWindows ? '.dll' : '.so');
+            . $extension
+            . ($isWindows ? '.dll' : '.so');
         if (!@dl($soname))
             return false;
     }
@@ -2234,18 +2238,18 @@
     //$wikicharset = strtolower($CHARSET);
     //$systemcharset = strtolower(get_cfg_var('iconv.internal_encoding')); // 'iso-8859-1';
     if (strtolower($from) == 'utf-8' and strtolower($to) == 'iso-8859-1')
-	return utf8_decode($data);
+    return utf8_decode($data);
     if (strtolower($to) == 'utf-8' and strtolower($from) == 'iso-8859-1')
-	return utf8_encode($data);
+    return utf8_encode($data);
 
     if (loadPhpExtension("iconv")) {
-	$tmpdata = iconv($from, $to, $data);
-	if (!$tmpdata)
-	    trigger_error("charset conversion $from => $to failed. Wrong source charset?", E_USER_WARNING);
-	else
-	    $data = $tmpdata;
+    $tmpdata = iconv($from, $to, $data);
+    if (!$tmpdata)
+        trigger_error("charset conversion $from => $to failed. Wrong source charset?", E_USER_WARNING);
+    else
+        $data = $tmpdata;
     } else {
-	trigger_error("The iconv extension cannot be loaded", E_USER_WARNING);
+    trigger_error("The iconv extension cannot be loaded", E_USER_WARNING);
     }
     return $data;
 }
@@ -2277,16 +2281,16 @@
     //print_r($bt);
     echo "\nTraceback:\n";
     if (function_exists('debug_print_backtrace')) { // >= 5
-	debug_print_backtrace();
+    debug_print_backtrace();
     } else {
-	foreach ($bt as $i => $elem) {
-	    if (!array_key_exists('file', $elem)) {
-		continue;
-	    }
-	    //echo join(" ",array_values($elem)),"\n";
-	    echo "  ",$elem['file'],':',$elem['line']," ",$elem['function'],"\n";
-	}
+    foreach ($bt as $i => $elem) {
+        if (!array_key_exists('file', $elem)) {
+        continue;
+        }
+        //echo join(" ",array_values($elem)),"\n";
+        echo "  ",$elem['file'],':',$elem['line']," ",$elem['function'],"\n";
     }
+    }
 }
 
 /**
@@ -2304,18 +2308,18 @@
         // what we want is the process memory only: apache or php (if CGI)
         $pid = getmypid();
         $memstr = '';
-	// 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'];
-	} elseif(0) {
-	    // This works only if it's a cygwin process (apache or php).
-	    // Requires a newer cygwin
-	    $memstr = exec("cat /proc/$pid/statm |cut -f1");
+    // 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'];
+    } elseif(0) {
+        // 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, grep, sed and perl)
-	    //$memstr = exec("pslist $pid|grep -A1 Mem|sed 1d|perl -ane\"print \$"."F[5]\"");
+        // if it's native windows use something like this:
+        //   (requires pslist from sysinternals.com, grep, sed and perl)
+        //$memstr = exec("pslist $pid|grep -A1 Mem|sed 1d|perl -ane\"print \$"."F[5]\"");
         }
         return (integer) trim($memstr);
     } elseif (1) {
@@ -2341,7 +2345,7 @@
 function binary_search($needle, $haystack) {
     $high = count($haystack);
     $low = 0;
- 
+
     while (($high - $low) > 1) {
         $probe = floor(($high + $low) / 2);
         if ($haystack[$probe] < $needle) {
@@ -2362,8 +2366,8 @@
 
 function is_localhost($url = false) {
     if (!$url) {
-    	global $HTTP_SERVER_VARS;
-    	return $HTTP_SERVER_VARS['SERVER_ADDR'] == '127.0.0.1';
+        global $HTTP_SERVER_VARS;
+        return $HTTP_SERVER_VARS['SERVER_ADDR'] == '127.0.0.1';
     }
 }
 
@@ -2380,6 +2384,14 @@
 }
 
 /**
+ * Determine if a variable represents a whole number
+ */
+
+function is_whole_number($var) {
+  return (is_numeric($var) && (intval($var)==floatval($var)));
+}
+
+/**
  * Take a string and return an array of pairs (attribute name, attribute value)
  *
  * We allow attributes with or without double quotes (")
@@ -2444,7 +2456,7 @@
     }
 
     $options[$attribute] = $value;
-  
+
     $line = substr($line, $i+1);
     $line = trim ($line);
     $line = trim ($line, ",");
@@ -2484,154 +2496,6 @@
 }
 
 /**
- * Compute cell in spreadsheet table
- * $table: two-dimensional table
- * $i and $j: indexes of cell to compute
- * $imax and $jmax: table dimensions
- */
-function compute_tablecell ($table, $i, $j, $imax, $jmax) {
-
-    // What is implemented:
-    // @@=SUM(R)@@ : sum of cells in current row
-    // @@=SUM(C)@@ : sum of cells in current column
-    // @@=AVERAGE(R)@@ : average of cells in current row
-    // @@=AVERAGE(C)@@ : average of cells in current column
-    // @@=MAX(R)@@ : maximum value of cells in current row
-    // @@=MAX(C)@@ : maximum value of cells in current column
-    // @@=MIN(R)@@ : minimum value of cells in current row
-    // @@=MIN(C)@@ : minimum value of cells in current column
-    // @@=COUNT(R)@@ : number of cells in current row
-    //                (numeric or not, excluding headers and current cell)
-    // @@=COUNT(C)@@ : number of cells in current column
-    //                (numeric or not, excluding headers and current cell)
-
-    $result=0;
-    $counter=0;
-    $found=false;
-
-    if (strpos($table[$i][$j], "@@=SUM(C)@@") !== false) {
-        for ($index=0; $index<$imax; $index++) {
-            if (is_numeric($table[$index][$j])) {
-                $result += $table[$index][$j];
-            }
-        }
-        return str_replace("@@=SUM(C)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) {
-        for ($index=0; $index<$jmax; $index++) {
-            if (is_numeric($table[$i][$index])) {
-                $result += $table[$i][$index];
-            }
-        }
-        return str_replace("@@=SUM(R)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) {
-        for ($index=0; $index<$imax; $index++) {
-            if (is_numeric($table[$index][$j])) {
-                $result += $table[$index][$j];
-                $counter++;
-            }
-        }
-        $result=$result/$counter;
-        return str_replace("@@=AVERAGE(C)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) {
-        for ($index=0; $index<$jmax; $index++) {
-            if (is_numeric($table[$i][$index])) {
-                $result += $table[$i][$index];
-                $counter++;
-            }
-        }
-        $result=$result/$counter;
-        return str_replace("@@=AVERAGE(R)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) {
-        for ($index=0; $index<$imax; $index++) {
-            if (is_numeric($table[$index][$j])) {
-                if (!$found) {
-                    $found=true;
-                    $result=$table[$index][$j];
-                } else {
-                    $result = max($result, $table[$index][$j]);
-                }
-            }
-        }
-        if (!$found) {
-            $result="";
-        }
-        return str_replace("@@=MAX(C)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) {
-        for ($index=0; $index<$jmax; $index++) {
-            if (is_numeric($table[$i][$index])) {
-                if (!$found) {
-                    $found=true;
-                    $result=$table[$i][$index];
-                } else {
-                    $result = max($result, $table[$i][$index]);
-                }
-            }
-        }
-        if (!$found) {
-            $result="";
-        }
-        return str_replace("@@=MAX(R)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) {
-        for ($index=0; $index<$imax; $index++) {
-            if (is_numeric($table[$index][$j])) {
-                if (!$found) {
-                    $found=true;
-                    $result=$table[$index][$j];
-                } else {
-                    $result = min($result, $table[$index][$j]);
-                }
-            }
-        }
-        if (!$found) {
-            $result="";
-        }
-        return str_replace("@@=MIN(C)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) {
-        for ($index=0; $index<$jmax; $index++) {
-            if (is_numeric($table[$i][$index])) {
-                if (!$found) {
-                    $found=true;
-                    $result=$table[$i][$index];
-                } else {
-                    $result = min($result, $table[$i][$index]);
-                }
-            }
-        }
-        if (!$found) {
-            $result="";
-        }
-        return str_replace("@@=MIN(R)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) {
-        for ($index=0; $index<$imax; $index++) {
-            if (!string_starts_with(trim($table[$index][$j]), "=")) { // exclude header
-                $counter++;
-            }
-        }
-        $result = $counter-1; // exclude self
-        return str_replace("@@=COUNT(C)@@", $result, $table[$i][$j]);
-
-    } else if (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) {
-        for ($index=0; $index<$jmax; $index++) {
-            if (!string_starts_with(trim($table[$i][$index]), "=")) { // exclude header
-                $counter++;
-            }
-        }
-        $result = $counter-1; // exclude self
-        return str_replace("@@=COUNT(R)@@", $result, $table[$i][$j]);
-    }
-
-    return $table[$i][$j];
-}
-
-/**
  * Remove accents from given text.
  */
 function strip_accents($text) {
@@ -2648,5 +2512,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/upgrade.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/upgrade.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/upgrade.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: upgrade.php 7664 2010-08-31 15:42:34Z vargenau $');
+// $Id: upgrade.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -52,97 +52,97 @@
 class Upgrade {
 
     function Upgrade (&$request) {
-	$this->request =& $request;
-	$this->dbi =& $request->_dbi; // no reference for dbadmin ?
-	$this->phpwiki_version = $this->current_db_version = phpwiki_version();
-	//$this->current_db_version = 1030.13; // should be stored in the db. should be phpwiki_version
+    $this->request =& $request;
+    $this->dbi =& $request->_dbi; // no reference for dbadmin ?
+    $this->phpwiki_version = $this->current_db_version = phpwiki_version();
+    //$this->current_db_version = 1030.13; // should be stored in the db. should be phpwiki_version
 
-	$this->db_version = $this->dbi->get_db_version();
-	$this->isSQL = $this->dbi->_backend->isSQL();
+    $this->db_version = $this->dbi->get_db_version();
+    $this->isSQL = $this->dbi->_backend->isSQL();
     }
 
     /**
      * TODO: check for the pgsrc_version number, not the revision mtime only
      */
     function doPgsrcUpdate($pagename, $path, $filename) {
-	// don't ever update the HomePage
-	if ((defined(HOME_PAGE) and ($pagename == HOME_PAGE))
-	    or ($pagename == _("HomePage"))
-	    or ($pagename == "HomePage")) {
-	    echo "$path/$pagename: ",_("always skip the HomePage."),
-	    _(" Skipped"),".<br />\n";
+    // don't ever update the HomePage
+    if ((defined(HOME_PAGE) and ($pagename == HOME_PAGE))
+        or ($pagename == _("HomePage"))
+        or ($pagename == "HomePage")) {
+        echo "$path/$pagename: ",_("always skip the HomePage."),
+        _(" Skipped"),".<br />\n";
             return;
-	}
+    }
 
-	$page = $this->dbi->getPage($pagename);
-	if ($page->exists()) {
-	    // check mtime: update automatically if pgsrc is newer
-	    $rev = $page->getCurrentRevision();
-	    $page_mtime = $rev->get('mtime');
-	    $data  = implode("", file($path."/".$filename));
-	    if (($parts = ParseMimeifiedPages($data))) {
-		usort($parts, 'SortByPageVersion');
-		reset($parts);
-		$pageinfo = $parts[0];
-		$stat  = stat($path."/".$filename);
-		$new_mtime = 0;
-		if (isset($pageinfo['versiondata']['mtime']))
-		    $new_mtime = $pageinfo['versiondata']['mtime'];
-		if (!$new_mtime and isset($pageinfo['versiondata']['lastmodified']))
-		    $new_mtime = $pageinfo['versiondata']['lastmodified'];
-		if (!$new_mtime and isset($pageinfo['pagedata']['date']))
-		    $new_mtime = $pageinfo['pagedata']['date'];
-		if (!$new_mtime)
-		    $new_mtime = $stat[9];
-		if ($new_mtime > $page_mtime) {
-		    echo "$path/$pagename: ",_("newer than the existing page."),
-			_(" replace "),"($new_mtime > $page_mtime)","<br />\n";
-		    LoadAny($this->request, $path."/".$filename);
-		    echo "<br />\n";
-		} else {
-		    echo "$path/$pagename: ",_("older than the existing page."),
-			_(" Skipped"),".<br />\n";
-		}
-	    } else {
-		echo "$path/$pagename: ",("unknown format."),
+    $page = $this->dbi->getPage($pagename);
+    if ($page->exists()) {
+        // check mtime: update automatically if pgsrc is newer
+        $rev = $page->getCurrentRevision();
+        $page_mtime = $rev->get('mtime');
+        $data  = implode("", file($path."/".$filename));
+        if (($parts = ParseMimeifiedPages($data))) {
+        usort($parts, 'SortByPageVersion');
+        reset($parts);
+        $pageinfo = $parts[0];
+        $stat  = stat($path."/".$filename);
+        $new_mtime = 0;
+        if (isset($pageinfo['versiondata']['mtime']))
+            $new_mtime = $pageinfo['versiondata']['mtime'];
+        if (!$new_mtime and isset($pageinfo['versiondata']['lastmodified']))
+            $new_mtime = $pageinfo['versiondata']['lastmodified'];
+        if (!$new_mtime and isset($pageinfo['pagedata']['date']))
+            $new_mtime = $pageinfo['pagedata']['date'];
+        if (!$new_mtime)
+            $new_mtime = $stat[9];
+        if ($new_mtime > $page_mtime) {
+            echo "$path/$pagename: ",_("newer than the existing page."),
+            _(" replace "),"($new_mtime > $page_mtime)","<br />\n";
+            LoadAny($this->request, $path."/".$filename);
+            echo "<br />\n";
+        } else {
+            echo "$path/$pagename: ",_("older than the existing page."),
+            _(" Skipped"),".<br />\n";
+        }
+        } else {
+        echo "$path/$pagename: ",("unknown format."),
                     _(" Skipped"),".<br />\n";
-	    }
-	} else {
-	    echo sprintf(_("%s does not exist"),$pagename),"<br />\n";
-	    LoadAny($this->request, $path."/".$filename);
-	    echo "<br />\n";
-	}
+        }
+    } else {
+        echo sprintf(_("%s does not exist"),$pagename),"<br />\n";
+        LoadAny($this->request, $path."/".$filename);
+        echo "<br />\n";
     }
+    }
 
     function CheckActionPageUpdate() {
-	echo "<h3>",sprintf(_("Check for necessary %s updates"),
-			    _("ActionPage")),"</h3>\n";
-	// 1.3.13 before we pull in all missing pages, we rename existing ones
-	$this->_rename_page_helper(_("_AuthInfo"), _("DebugAuthInfo"));
-	// this is in some templates. so we keep the old name
-	//$this->_rename_page_helper($this->dbi, _("DebugInfo"), _("DebugBackendInfo"));
-	$this->_rename_page_helper(_("_GroupInfo"), _("GroupAuthInfo")); //never officially existed
-	$this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
+    echo "<h3>",sprintf(_("Check for necessary %s updates"),
+                _("ActionPage")),"</h3>\n";
+    // 1.3.13 before we pull in all missing pages, we rename existing ones
+    $this->_rename_page_helper(_("_AuthInfo"), _("DebugAuthInfo"));
+    // this is in some templates. so we keep the old name
+    //$this->_rename_page_helper($this->dbi, _("DebugInfo"), _("DebugBackendInfo"));
+    $this->_rename_page_helper(_("_GroupInfo"), _("GroupAuthInfo")); //never officially existed
+    $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
 
-	$path = FindFile('pgsrc');
-	$pgsrc = new fileSet($path);
-	// most actionpages have the same name as the plugin
-	$loc_path = FindLocalizedFile('pgsrc');
-	foreach ($pgsrc->getFiles() as $filename) {
-	    if (substr($filename,-1,1) == '~') continue;
-	    if (substr($filename,-5,5) == '.orig') continue;
-	    $pagename = urldecode($filename);
-	    if (isActionPage($pagename)) {
-		$translation = gettext($pagename);
-		if ($translation == $pagename)
-		    $this->doPgsrcUpdate($pagename, $path, $filename);
-		elseif (FindLocalizedFile('pgsrc/'.urlencode($translation),1))
-		    $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation));
-		else
-		    $this->doPgsrcUpdate($pagename, $path, $filename);
-	    }
-	}
+    $path = FindFile('pgsrc');
+    $pgsrc = new fileSet($path);
+    // most actionpages have the same name as the plugin
+    $loc_path = FindLocalizedFile('pgsrc');
+    foreach ($pgsrc->getFiles() as $filename) {
+        if (substr($filename,-1,1) == '~') continue;
+        if (substr($filename,-5,5) == '.orig') continue;
+        $pagename = urldecode($filename);
+        if (isActionPage($pagename)) {
+        $translation = gettext($pagename);
+        if ($translation == $pagename)
+            $this->doPgsrcUpdate($pagename, $path, $filename);
+        elseif (FindLocalizedFile('pgsrc/'.urlencode($translation),1))
+            $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation));
+        else
+            $this->doPgsrcUpdate($pagename, $path, $filename);
+        }
     }
+    }
 
     // see loadsave.php for saving new pages.
     function CheckPgsrcUpdate() {
@@ -189,23 +189,23 @@
     }
 
     function _rename_page_helper($oldname, $pagename) {
-	echo sprintf(_("rename %s to %s"), $oldname, $pagename)," ...";
-	if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
-	    if ($this->dbi->_backend->rename_page($oldname, $pagename))
-		echo _("OK")," <br />\n";
-	    else
-		echo " <b><font color=\"red\">", _("FAILED"), "</font></b>",
-		    " <br />\n";
-	} else {
-	    echo _(" Skipped")," <br />\n";
-	}
+    echo sprintf(_("rename %s to %s"), $oldname, $pagename)," ...";
+    if ($this->dbi->isWikiPage($oldname) and !$this->dbi->isWikiPage($pagename)) {
+        if ($this->dbi->_backend->rename_page($oldname, $pagename))
+        echo _("OK")," <br />\n";
+        else
+        echo " <b><font color=\"red\">", _("FAILED"), "</font></b>",
+            " <br />\n";
+    } else {
+        echo _(" Skipped")," <br />\n";
     }
+    }
 
     function _rename_to_help_page($pagename) {
-	$newprefix = _("Help") . "/";
-	if (substr($pagename,0,strlen($newprefix)) != $newprefix) return;
-	$oldname = substr($pagename,strlen($newprefix));
-	$this->_rename_page_helper($oldname, $pagename);
+    $newprefix = _("Help") . "/";
+    if (substr($pagename,0,strlen($newprefix)) != $newprefix) return;
+    $oldname = substr($pagename,strlen($newprefix));
+    $this->_rename_page_helper($oldname, $pagename);
     }
 
     /**
@@ -214,90 +214,90 @@
      * Supported: mysql and generic SQL, for ADODB and PearDB.
      */
     function installTable($table, $backend_type) {
-	global $DBParams;
-	if (!$this->isSQL) return;
-	echo _("MISSING")," ... \n";
-	$backend = &$this->dbi->_backend->_dbh;
-	/*
-	  $schema = findFile("schemas/${backend_type}.sql");
-	  if (!$schema) {
-	  echo "  ",_("FAILED"),": ",sprintf(_("no schema %s found"),
-	  "schemas/${backend_type}.sql")," ... <br />\n";
-	  return false;
-	  }
-	*/
-	extract($this->dbi->_backend->_table_names);
-	$prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
-	switch ($table) {
-	case 'session':
-	    assert($session_tbl);
-	    if ($backend_type == 'mysql') {
-		$this->dbi->genericSqlQuery("
+    global $DBParams;
+    if (!$this->isSQL) return;
+    echo _("MISSING")," ... \n";
+    $backend = &$this->dbi->_backend->_dbh;
+    /*
+      $schema = findFile("schemas/${backend_type}.sql");
+      if (!$schema) {
+      echo "  ",_("FAILED"),": ",sprintf(_("no schema %s found"),
+      "schemas/${backend_type}.sql")," ... <br />\n";
+      return false;
+      }
+    */
+    extract($this->dbi->_backend->_table_names);
+    $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
+    switch ($table) {
+    case 'session':
+        assert($session_tbl);
+        if ($backend_type == 'mysql') {
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $session_tbl (
-    	sess_id 	CHAR(32) NOT NULL DEFAULT '',
-    	sess_data 	BLOB NOT NULL,
-    	sess_date 	INT UNSIGNED NOT NULL,
-    	sess_ip 	CHAR(15) NOT NULL,
-    	PRIMARY KEY (sess_id),
-	INDEX (sess_date)
+        sess_id     CHAR(32) NOT NULL DEFAULT '',
+        sess_data     BLOB NOT NULL,
+        sess_date     INT UNSIGNED NOT NULL,
+        sess_ip     CHAR(15) NOT NULL,
+        PRIMARY KEY (sess_id),
+    INDEX (sess_date)
 )");
-	    } else {
-		$this->dbi->genericSqlQuery("
+        } else {
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $session_tbl (
-	sess_id 	CHAR(32) NOT NULL DEFAULT '',
-    	sess_data 	".($backend_type == 'pgsql'?'TEXT':'BLOB')." NOT NULL,
-    	sess_date 	INT,
-    	sess_ip 	CHAR(15) NOT NULL
+    sess_id     CHAR(32) NOT NULL DEFAULT '',
+        sess_data     ".($backend_type == 'pgsql'?'TEXT':'BLOB')." NOT NULL,
+        sess_date     INT,
+        sess_ip     CHAR(15) NOT NULL
 )");
-		$this->dbi->genericSqlQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)");
-	    }
-	    $this->dbi->genericSqlQuery("CREATE INDEX sess_date on session (sess_date)");
-	    echo "  ",_("CREATED");
-	    break;
-	case 'pref':
-	    $pref_tbl = $prefix.'pref';
-	    if ($backend_type == 'mysql') {
-		$this->dbi->genericSqlQuery("
+        $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX sess_id ON $session_tbl (sess_id)");
+        }
+        $this->dbi->genericSqlQuery("CREATE INDEX sess_date on session (sess_date)");
+        echo "  ",_("CREATED");
+        break;
+    case 'pref':
+        $pref_tbl = $prefix.'pref';
+        if ($backend_type == 'mysql') {
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $pref_tbl (
-  	userid 	CHAR(48) BINARY NOT NULL UNIQUE,
-  	prefs  	TEXT NULL DEFAULT '',
-  	PRIMARY KEY (userid)
+      userid     CHAR(48) BINARY NOT NULL UNIQUE,
+      prefs      TEXT NULL DEFAULT '',
+      PRIMARY KEY (userid)
 )");
-	    } else {
-		$this->dbi->genericSqlQuery("
+        } else {
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $pref_tbl (
-  	userid 	CHAR(48) NOT NULL,
-  	prefs  	TEXT NULL DEFAULT ''
+      userid     CHAR(48) NOT NULL,
+      prefs      TEXT NULL DEFAULT ''
 )");
-		$this->dbi->genericSqlQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)");
-	    }
-	    echo "  ",_("CREATED");
-	    break;
-	case 'member':
-	    $member_tbl = $prefix.'member';
-	    if ($backend_type == 'mysql') {
-		$this->dbi->genericSqlQuery("
+        $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX userid ON $pref_tbl (userid)");
+        }
+        echo "  ",_("CREATED");
+        break;
+    case 'member':
+        $member_tbl = $prefix.'member';
+        if ($backend_type == 'mysql') {
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $member_tbl (
-	userid    CHAR(48) BINARY NOT NULL,
-   	groupname CHAR(48) BINARY NOT NULL DEFAULT 'users',
-   	INDEX (userid),
-   	INDEX (groupname)
+    userid    CHAR(48) BINARY NOT NULL,
+       groupname CHAR(48) BINARY NOT NULL DEFAULT 'users',
+       INDEX (userid),
+       INDEX (groupname)
 )");
-	    } else {
-		$this->dbi->genericSqlQuery("
+        } else {
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $member_tbl (
-	userid    CHAR(48) NOT NULL,
-   	groupname CHAR(48) NOT NULL DEFAULT 'users'
+    userid    CHAR(48) NOT NULL,
+       groupname CHAR(48) NOT NULL DEFAULT 'users'
 )");
-		$this->dbi->genericSqlQuery("CREATE INDEX userid ON $member_tbl (userid)");
-		$this->dbi->genericSqlQuery("CREATE INDEX groupname ON $member_tbl (groupname)");
-	    }
-	    echo "  ",_("CREATED");
-	    break;
-	case 'rating':
-	    $rating_tbl = $prefix.'rating';
-	    if ($backend_type == 'mysql') {
-		$this->dbi->genericSqlQuery("
+        $this->dbi->genericSqlQuery("CREATE INDEX userid ON $member_tbl (userid)");
+        $this->dbi->genericSqlQuery("CREATE INDEX groupname ON $member_tbl (groupname)");
+        }
+        echo "  ",_("CREATED");
+        break;
+    case 'rating':
+        $rating_tbl = $prefix.'rating';
+        if ($backend_type == 'mysql') {
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $rating_tbl (
         dimension INT(4) NOT NULL,
         raterpage INT(11) NOT NULL,
@@ -307,8 +307,8 @@
         tstamp TIMESTAMP(14) NOT NULL,
         PRIMARY KEY (dimension, raterpage, rateepage)
 )");
-	    } else {
-		$this->dbi->genericSqlQuery("
+        } else {
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $rating_tbl (
         dimension INT(4) NOT NULL,
         raterpage INT(11) NOT NULL,
@@ -317,60 +317,60 @@
         rateeversion INT(11) NOT NULL,
         tstamp TIMESTAMP(14) NOT NULL
 )");
-		$this->dbi->genericSqlQuery("CREATE UNIQUE INDEX rating"
-				      ." ON $rating_tbl (dimension, raterpage, rateepage)");
-	    }
-	    echo "  ",_("CREATED");
-	    break;
-	case 'accesslog':
-	    $log_tbl = $prefix.'accesslog';
-	    // fields according to http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
-	    /*
-	      A	User Agent agent	varchar(255)	Mozilla/4.0 (compat; MSIE 6.0; Windows)
-	      a	CGi request arguments	request_args	varchar(255)	user=Smith&cart=1231&item=532
-	      b	Bytes transfered	bytes_sent	int unsigned	32561
-	      c???	Text of cookie	cookie	varchar(255)	Apache=sdyn.fooonline.net 1300102700823
-	      f	Local filename requested	request_file	varchar(255)	/var/www/html/books-cycroad.html
-	      H	HTTP request_protocol	request_protocol	varchar(10)	HTTP/1.1
-	      h	Name of remote host	remote_host	varchar(50)	blah.foobar.com
-	      I	Request ID (from modd_unique_id)	id	char(19)	POlFcUBRH30AAALdBG8
-	      l	Ident user info	remote_logname	varcgar(50)	bobby
-	      M	Machine ID???	machine_id	varchar(25)	web01
-	      m	HTTP request method	request_method	varchar(10)	GET
-	      P	httpd cchild PID	child_pid	smallint unsigned	3215
-	      p	http port	server_port	smallint unsigned	80
-	      R	Referer	referer	varchar(255)	http://www.biglinks4u.com/linkpage.html
-	      r	Request in full form	request_line	varchar(255)	GET /books-cycroad.html HTTP/1.1
-	      S	Time of request in UNIX time_t format	time_stamp	int unsigned	1005598029
-	      T	Seconds to service request	request_duration	smallint unsigned	2
-	      t	Time of request in human format	request_time	char(28)	[02/Dec/2001:15:01:26 -0800]
-	      U	Request in simple form	request_uri	varchar(255)	/books-cycroad.html
-	      u	User info from HTTP auth	remote_user	varchar(50)	bobby
-	      v	Virtual host servicing the request	virtual_host	varchar(255)
-	    */
-	    $this->dbi->genericSqlQuery("
+        $this->dbi->genericSqlQuery("CREATE UNIQUE INDEX rating"
+                      ." ON $rating_tbl (dimension, raterpage, rateepage)");
+        }
+        echo "  ",_("CREATED");
+        break;
+    case 'accesslog':
+        $log_tbl = $prefix.'accesslog';
+        // fields according to http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
+        /*
+          A    User Agent agent    varchar(255)    Mozilla/4.0 (compat; MSIE 6.0; Windows)
+          a    CGi request arguments    request_args    varchar(255)    user=Smith&cart=1231&item=532
+          b    Bytes transfered    bytes_sent    int unsigned    32561
+          c???    Text of cookie    cookie    varchar(255)    Apache=sdyn.fooonline.net 1300102700823
+          f    Local filename requested    request_file    varchar(255)    /var/www/html/books-cycroad.html
+          H    HTTP request_protocol    request_protocol    varchar(10)    HTTP/1.1
+          h    Name of remote host    remote_host    varchar(50)    blah.foobar.com
+          I    Request ID (from modd_unique_id)    id    char(19)    POlFcUBRH30AAALdBG8
+          l    Ident user info    remote_logname    varcgar(50)    bobby
+          M    Machine ID???    machine_id    varchar(25)    web01
+          m    HTTP request method    request_method    varchar(10)    GET
+          P    httpd cchild PID    child_pid    smallint unsigned    3215
+          p    http port    server_port    smallint unsigned    80
+          R    Referer    referer    varchar(255)    http://www.biglinks4u.com/linkpage.html
+          r    Request in full form    request_line    varchar(255)    GET /books-cycroad.html HTTP/1.1
+          S    Time of request in UNIX time_t format    time_stamp    int unsigned    1005598029
+          T    Seconds to service request    request_duration    smallint unsigned    2
+          t    Time of request in human format    request_time    char(28)    [02/Dec/2001:15:01:26 -0800]
+          U    Request in simple form    request_uri    varchar(255)    /books-cycroad.html
+          u    User info from HTTP auth    remote_user    varchar(50)    bobby
+          v    Virtual host servicing the request    virtual_host    varchar(255)
+        */
+        $this->dbi->genericSqlQuery("
 CREATE TABLE $log_tbl (
         time_stamp    int unsigned,
-	remote_host   varchar(100),
-	remote_user   varchar(50),
+    remote_host   varchar(100),
+    remote_user   varchar(50),
         request_method varchar(10),
-	request_line  varchar(255),
-	request_args  varchar(255),
-	request_uri   varchar(255),
-	request_time  char(28),
-	status 	      smallint unsigned,
-	bytes_sent    smallint unsigned,
+    request_line  varchar(255),
+    request_args  varchar(255),
+    request_uri   varchar(255),
+    request_time  char(28),
+    status           smallint unsigned,
+    bytes_sent    smallint unsigned,
         referer       varchar(255),
-	agent         varchar(255),
-	request_duration float
+    agent         varchar(255),
+    request_duration float
 )");
-	    $this->dbi->genericSqlQuery("CREATE INDEX log_time ON $log_tbl (time_stamp)");
-	    $this->dbi->genericSqlQuery("CREATE INDEX log_host ON $log_tbl (remote_host)");
-	    echo "  ",_("CREATED");
-	    break;
-	}
-	echo "<br />\n";
+        $this->dbi->genericSqlQuery("CREATE INDEX log_time ON $log_tbl (time_stamp)");
+        $this->dbi->genericSqlQuery("CREATE INDEX log_host ON $log_tbl (remote_host)");
+        echo "  ",_("CREATED");
+        break;
     }
+    echo "<br />\n";
+    }
 
     /**
      * Update from ~1.3.4 to current.
@@ -379,19 +379,19 @@
      *   people should export/import their pages if using that old versions.
      */
     function CheckDatabaseUpdate() {
-	global $DBAuthParams, $DBParams;
+    global $DBAuthParams, $DBParams;
 
-	echo "<h3>",sprintf(_("Check for necessary %s updates"),
-			    _("database")),
-	    " - ", DATABASE_TYPE,"</h3>\n";
-	$dbadmin = $this->request->getArg('dbadmin');
-	if ($this->isSQL) {
-	    $this->_db_init();
-	    if (isset($dbadmin['cancel'])) {
-		echo _("CANCEL")," <br />\n";
-		return;
-	    }
-	}
+    echo "<h3>",sprintf(_("Check for necessary %s updates"),
+                _("database")),
+        " - ", DATABASE_TYPE,"</h3>\n";
+    $dbadmin = $this->request->getArg('dbadmin');
+    if ($this->isSQL) {
+        $this->_db_init();
+        if (isset($dbadmin['cancel'])) {
+        echo _("CANCEL")," <br />\n";
+        return;
+        }
+    }
         echo "db version: we want ", $this->current_db_version, "\n<br />";
         echo "db version: we have ", $this->db_version, "\n<br />";
         if ($this->db_version >= $this->current_db_version) {
@@ -399,301 +399,301 @@
             return;
         }
 
-	$backend_type = $this->dbi->_backend->backendType();
-	if ($this->isSQL) {
-	    echo "<h4>",_("Backend type: "),$backend_type,"</h4>\n";
-	    $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
-	    $tables = $this->dbi->_backend->listOfTables();
-	    foreach (explode(':','session:pref:member') as $table) {
-		echo sprintf(_("Check for table %s"), $table)," ...";
-		if (!in_array($prefix.$table, $tables)) {
-		    $this->installTable($table, $backend_type);
-		} else {
-		    echo _("OK")," <br />\n";
-		}
-	    }
-	}
+    $backend_type = $this->dbi->_backend->backendType();
+    if ($this->isSQL) {
+        echo "<h4>",_("Backend type: "),$backend_type,"</h4>\n";
+        $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
+        $tables = $this->dbi->_backend->listOfTables();
+        foreach (explode(':','session:pref:member') as $table) {
+        echo sprintf(_("Check for table %s"), $table)," ...";
+        if (!in_array($prefix.$table, $tables)) {
+            $this->installTable($table, $backend_type);
+        } else {
+            echo _("OK")," <br />\n";
+        }
+        }
+    }
 
-	if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) {
-	    if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) {
-		trigger_error("You need to upgrade to schema/psql-initialize.sql manually!",
-			      E_USER_WARNING);
-	        // $this->_upgrade_psql_tsearch2();
-	    }
-	    $this->_upgrade_relation_links();
-	}
+    if ($this->phpwiki_version >= 1030.12200612 and $this->db_version < 1030.13) {
+        if ($this->isSQL and preg_match("/(pgsql|postgres)/", $backend_type)) {
+        trigger_error("You need to upgrade to schema/psql-initialize.sql manually!",
+                  E_USER_WARNING);
+            // $this->_upgrade_psql_tsearch2();
+        }
+        $this->_upgrade_relation_links();
+    }
 
-	if (ACCESS_LOG_SQL and $this->isSQL) {
-	    $table = "accesslog";
-	    echo sprintf(_("Check for table %s"), $table)," ...";
-	    if (!in_array($prefix.$table, $tables)) {
-		$this->installTable($table, $backend_type);
-	    } else {
-		echo _("OK")," <br />\n";
-	    }
-	}
-	if ($this->isSQL and (class_exists("RatingsUserFactory") or $this->dbi->isWikiPage(_("RateIt")))) {
-	    $table = "rating";
-	    echo sprintf(_("Check for table %s"), $table)," ...";
-	    if (!in_array($prefix.$table, $tables)) {
-		$this->installTable($table, $backend_type);
-	    } else {
-		echo _("OK")," <br />\n";
-	    }
-	}
-	$backend = &$this->dbi->_backend->_dbh;
-	if ($this->isSQL)
-	    extract($this->dbi->_backend->_table_names);
+    if (ACCESS_LOG_SQL and $this->isSQL) {
+        $table = "accesslog";
+        echo sprintf(_("Check for table %s"), $table)," ...";
+        if (!in_array($prefix.$table, $tables)) {
+        $this->installTable($table, $backend_type);
+        } else {
+        echo _("OK")," <br />\n";
+        }
+    }
+    if ($this->isSQL and (class_exists("RatingsUserFactory") or $this->dbi->isWikiPage(_("RateIt")))) {
+        $table = "rating";
+        echo sprintf(_("Check for table %s"), $table)," ...";
+        if (!in_array($prefix.$table, $tables)) {
+        $this->installTable($table, $backend_type);
+        } else {
+        echo _("OK")," <br />\n";
+        }
+    }
+    $backend = &$this->dbi->_backend->_dbh;
+    if ($this->isSQL)
+        extract($this->dbi->_backend->_table_names);
 
-	// 1.3.8 added session.sess_ip
-	if ($this->isSQL and $this->phpwiki_version >= 1030.08 and USE_DB_SESSION
-	    and isset($this->request->_dbsession))
-	{
-	    echo _("Check for new session.sess_ip column")," ... ";
-	    $database = $this->dbi->_backend->database();
-	    assert(!empty($DBParams['db_session_table']));
-	    $session_tbl = $prefix . $DBParams['db_session_table'];
-	    $sess_fields = $this->dbi->_backend->listOfFields($database, $session_tbl);
-	    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>"," ... ";
-		$this->dbi->genericSqlQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL");
-		$this->dbi->genericSqlQuery("CREATE INDEX sess_date ON $session_tbl (sess_date)");
-	    } else {
-		echo _("OK");
-	    }
-	    echo "<br />\n";
-	    if (substr($backend_type,0,5) == 'mysql') {
-		// upgrade to 4.1.8 destroyed my session table:
-		// sess_id => varchar(10), sess_data => varchar(5). For others obviously also.
-		echo _("Check for mysql session.sess_id sanity")," ... ";
-		$result = $this->dbi->genericSqlQuery("DESCRIBE $session_tbl");
-		if (DATABASE_TYPE == 'SQL') {
-		    $iter = new WikiDB_backend_PearDB_generic_iter($backend, $result);
-		} elseif (DATABASE_TYPE == 'ADODB') {
-		    $iter = new WikiDB_backend_ADODB_generic_iter($backend, $result,
-								  array("Field", "Type", "Null", "Key", "Default", "Extra"));
-		} elseif (DATABASE_TYPE == 'PDO') {
-		    $iter = new WikiDB_backend_PDO_generic_iter($backend, $result);
-		}
-		while ($col = $iter->next()) {
-		    if ($col["Field"] == 'sess_id' and !strstr(strtolower($col["Type"]), 'char(32)')) {
-			$this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_id"
-					      ." sess_id CHAR(32) NOT NULL");
-			echo "sess_id ", $col["Type"], " ", _("fixed"), " => CHAR(32) ";
-		    }
-		    if ($col["Field"] == 'sess_ip' and !strstr(strtolower($col["Type"]), 'char(15)')) {
-			$this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_ip"
-					      ." sess_ip CHAR(15) NOT NULL");
-			echo "sess_ip ", $col["Type"], " ", _("fixed"), " => CHAR(15) ";
-		    }
-		}
-		echo _("OK"), "<br />\n";
-	    }
-	}
+    // 1.3.8 added session.sess_ip
+    if ($this->isSQL and $this->phpwiki_version >= 1030.08 and USE_DB_SESSION
+        and isset($this->request->_dbsession))
+    {
+        echo _("Check for new session.sess_ip column")," ... ";
+        $database = $this->dbi->_backend->database();
+        assert(!empty($DBParams['db_session_table']));
+        $session_tbl = $prefix . $DBParams['db_session_table'];
+        $sess_fields = $this->dbi->_backend->listOfFields($database, $session_tbl);
+        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>"," ... ";
+        $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL");
+        $this->dbi->genericSqlQuery("CREATE INDEX sess_date ON $session_tbl (sess_date)");
+        } else {
+        echo _("OK");
+        }
+        echo "<br />\n";
+        if (substr($backend_type,0,5) == 'mysql') {
+        // upgrade to 4.1.8 destroyed my session table:
+        // sess_id => varchar(10), sess_data => varchar(5). For others obviously also.
+        echo _("Check for mysql session.sess_id sanity")," ... ";
+        $result = $this->dbi->genericSqlQuery("DESCRIBE $session_tbl");
+        if (DATABASE_TYPE == 'SQL') {
+            $iter = new WikiDB_backend_PearDB_generic_iter($backend, $result);
+        } elseif (DATABASE_TYPE == 'ADODB') {
+            $iter = new WikiDB_backend_ADODB_generic_iter($backend, $result,
+                                  array("Field", "Type", "Null", "Key", "Default", "Extra"));
+        } elseif (DATABASE_TYPE == 'PDO') {
+            $iter = new WikiDB_backend_PDO_generic_iter($backend, $result);
+        }
+        while ($col = $iter->next()) {
+            if ($col["Field"] == 'sess_id' and !strstr(strtolower($col["Type"]), 'char(32)')) {
+            $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_id"
+                          ." sess_id CHAR(32) NOT NULL");
+            echo "sess_id ", $col["Type"], " ", _("fixed"), " => CHAR(32) ";
+            }
+            if ($col["Field"] == 'sess_ip' and !strstr(strtolower($col["Type"]), 'char(15)')) {
+            $this->dbi->genericSqlQuery("ALTER TABLE $session_tbl CHANGE sess_ip"
+                          ." sess_ip CHAR(15) NOT NULL");
+            echo "sess_ip ", $col["Type"], " ", _("fixed"), " => CHAR(15) ";
+            }
+        }
+        echo _("OK"), "<br />\n";
+        }
+    }
 
-	/* TODO:
-	   ALTER TABLE link ADD relation INT DEFAULT 0;
-	   CREATE INDEX linkrelation ON link (relation);
-	*/
+    /* 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') {
-	    echo _("Check for mysql LOCK TABLE privilege")," ...";
-	    $mysql_version = $this->dbi->_backend->_serverinfo['version'];
-	    if ($mysql_version > 400.40) {
-		if (!empty($this->dbi->_backend->_parsedDSN))
-		    $parseDSN = $this->dbi->_backend->_parsedDSN;
-		elseif (function_exists('parseDSN')) // ADODB or PDO
-		    $parseDSN = parseDSN($DBParams['dsn']);
-		else 			     // pear
-		    $parseDSN = DB::parseDSN($DBParams['dsn']);
-		$username = $this->dbi->_backend->qstr($parseDSN['username']);
-		// on db level
-		$query = "SELECT lock_tables_priv FROM mysql.db WHERE user='$username'";
-		//mysql_select_db("mysql", $this->dbi->_backend->connection());
-		$db_fields = $this->dbi->_backend->listOfFields("mysql", "db");
-		if (!strstr(strtolower(join(':', $db_fields)), "lock_tables_priv")) {
-		    echo join(':', $db_fields);
-		    die("lock_tables_priv missing. The DB Admin must run mysql_fix_privilege_tables");
-		}
-		$row = $this->dbi->_backend->getRow($query);
-		if (isset($row[0]) and $row[0] == 'N') {
-		    $this->dbi->genericSqlQuery("UPDATE mysql.db SET lock_tables_priv='Y'"
-					  ." WHERE mysql.user='$username'");
-		    $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
-		    echo "mysql.db user='$username'", _("fixed"), "<br />\n";
-		} elseif (!$row) {
-		    // or on user level
-		    $query = "SELECT lock_tables_priv FROM mysql.user WHERE user='$username'";
-		    $row = $this->dbi->_backend->getRow($query);
-		    if ($row and $row[0] == 'N') {
-			$this->dbi->genericSqlQuery("UPDATE mysql.user SET lock_tables_priv='Y'"
-					      ." WHERE mysql.user='$username'");
-			$this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
-			echo "mysql.user user='$username'", _("fixed"), "<br />\n";
-		    } elseif (!$row) {
-			echo " <b><font color=\"red\">", _("FAILED"), "</font></b>: ",
-			    "Neither mysql.db nor mysql.user has a user='$username'"
-			    ." or the lock_tables_priv field",
-			    "<br />\n";
-		    } else {
-			echo _("OK"), "<br />\n";
-		    }
-		} else {
-		    echo _("OK"), "<br />\n";
-		}
-		//mysql_select_db($this->dbi->_backend->database(), $this->dbi->_backend->connection());
-	    } else {
-		echo sprintf(_("version <em>%s</em> not affected"), $mysql_version),"<br />\n";
-	    }
-	}
+    // mysql >= 4.0.4 requires LOCK TABLE privileges
+    if (substr($backend_type,0,5) == 'mysql') {
+        echo _("Check for mysql LOCK TABLE privilege")," ...";
+        $mysql_version = $this->dbi->_backend->_serverinfo['version'];
+        if ($mysql_version > 400.40) {
+        if (!empty($this->dbi->_backend->_parsedDSN))
+            $parseDSN = $this->dbi->_backend->_parsedDSN;
+        elseif (function_exists('parseDSN')) // ADODB or PDO
+            $parseDSN = parseDSN($DBParams['dsn']);
+        else                  // pear
+            $parseDSN = DB::parseDSN($DBParams['dsn']);
+        $username = $this->dbi->_backend->qstr($parseDSN['username']);
+        // on db level
+        $query = "SELECT lock_tables_priv FROM mysql.db WHERE user='$username'";
+        //mysql_select_db("mysql", $this->dbi->_backend->connection());
+        $db_fields = $this->dbi->_backend->listOfFields("mysql", "db");
+        if (!strstr(strtolower(join(':', $db_fields)), "lock_tables_priv")) {
+            echo join(':', $db_fields);
+            die("lock_tables_priv missing. The DB Admin must run mysql_fix_privilege_tables");
+        }
+        $row = $this->dbi->_backend->getRow($query);
+        if (isset($row[0]) and $row[0] == 'N') {
+            $this->dbi->genericSqlQuery("UPDATE mysql.db SET lock_tables_priv='Y'"
+                      ." WHERE mysql.user='$username'");
+            $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
+            echo "mysql.db user='$username'", _("fixed"), "<br />\n";
+        } elseif (!$row) {
+            // or on user level
+            $query = "SELECT lock_tables_priv FROM mysql.user WHERE user='$username'";
+            $row = $this->dbi->_backend->getRow($query);
+            if ($row and $row[0] == 'N') {
+            $this->dbi->genericSqlQuery("UPDATE mysql.user SET lock_tables_priv='Y'"
+                          ." WHERE mysql.user='$username'");
+            $this->dbi->genericSqlQuery("FLUSH PRIVILEGES");
+            echo "mysql.user user='$username'", _("fixed"), "<br />\n";
+            } elseif (!$row) {
+            echo " <b><font color=\"red\">", _("FAILED"), "</font></b>: ",
+                "Neither mysql.db nor mysql.user has a user='$username'"
+                ." or the lock_tables_priv field",
+                "<br />\n";
+            } else {
+            echo _("OK"), "<br />\n";
+            }
+        } else {
+            echo _("OK"), "<br />\n";
+        }
+        //mysql_select_db($this->dbi->_backend->database(), $this->dbi->_backend->connection());
+        } else {
+        echo sprintf(_("version <em>%s</em> not affected"), $mysql_version),"<br />\n";
+        }
+    }
 
-	// 1.3.10 mysql requires page.id auto_increment
-	// mysql, mysqli or mysqlt
-	if ($this->phpwiki_version >= 1030.099 and substr($backend_type,0,5) == 'mysql'
-	    and DATABASE_TYPE != 'PDO')
+    // 1.3.10 mysql requires page.id auto_increment
+    // mysql, mysqli or mysqlt
+    if ($this->phpwiki_version >= 1030.099 and substr($backend_type,0,5) == 'mysql'
+        and DATABASE_TYPE != 'PDO')
         {
-	    echo _("Check for mysql page.id auto_increment flag")," ...";
-	    assert(!empty($page_tbl));
-	    $database = $this->dbi->_backend->database();
-	    $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
-	    $columns = mysql_num_fields($fields);
-	    for ($i = 0; $i < $columns; $i++) {
-		if (mysql_field_name($fields, $i) == 'id') {
-		    $flags = mysql_field_flags($fields, $i);
-		    //DONE: something was wrong with ADODB here.
-		    if (!strstr(strtolower($flags), "auto_increment")) {
-			echo "<b>",_("ADDING"),"</b>"," ... ";
-			// MODIFY col_def valid since mysql 3.22.16,
-			// older mysql's need CHANGE old_col col_def
-			$this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE id"
-						    ." id INT NOT NULL AUTO_INCREMENT");
-			$fields = mysql_list_fields($database, $page_tbl);
-			if (!strstr(strtolower(mysql_field_flags($fields, $i)), "auto_increment"))
-			    echo " <b><font color=\"red\">", _("FAILED"), "</font></b><br />\n";
-			else
-			    echo _("OK"), "<br />\n";
-		    } else {
-			echo _("OK"), "<br />\n";
-		    }
-		    break;
-		}
-	    }
-	    mysql_free_result($fields);
-	}
+        echo _("Check for mysql page.id auto_increment flag")," ...";
+        assert(!empty($page_tbl));
+        $database = $this->dbi->_backend->database();
+        $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
+        $columns = mysql_num_fields($fields);
+        for ($i = 0; $i < $columns; $i++) {
+        if (mysql_field_name($fields, $i) == 'id') {
+            $flags = mysql_field_flags($fields, $i);
+            //DONE: something was wrong with ADODB here.
+            if (!strstr(strtolower($flags), "auto_increment")) {
+            echo "<b>",_("ADDING"),"</b>"," ... ";
+            // MODIFY col_def valid since mysql 3.22.16,
+            // older mysql's need CHANGE old_col col_def
+            $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE id"
+                            ." id INT NOT NULL AUTO_INCREMENT");
+            $fields = mysql_list_fields($database, $page_tbl);
+            if (!strstr(strtolower(mysql_field_flags($fields, $i)), "auto_increment"))
+                echo " <b><font color=\"red\">", _("FAILED"), "</font></b><br />\n";
+            else
+                echo _("OK"), "<br />\n";
+            } else {
+            echo _("OK"), "<br />\n";
+            }
+            break;
+        }
+        }
+        mysql_free_result($fields);
+    }
 
-	// Check for mysql 4.1.x/5.0.0a binary search problem.
-	//   http://bugs.mysql.com/bug.php?id=4398
-	// "select * from page where LOWER(pagename) like '%search%'" does not apply LOWER!
-	// Confirmed for 4.1.0alpha,4.1.3-beta,5.0.0a; not yet tested for 4.1.2alpha,
-	// On windows only, though utf8 would be useful elsewhere also.
-	// Illegal mix of collations (latin1_bin,IMPLICIT) and
-	// (utf8_general_ci, COERCIBLE) for operation '='])
-	if (isWindows() and substr($backend_type,0,5) == 'mysql') {
-	    echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem")," ...";
-	    $mysql_version = $this->dbi->_backend->_serverinfo['version'];
-	    if ($mysql_version < 401.0) {
-		echo sprintf(_("version <em>%s</em>"), $mysql_version)," ",
-		    _("not affected"),"<br />\n";
-	    } elseif ($mysql_version >= 401.6) { // FIXME: since which version?
-		$row = $this->dbi->_backend->getRow("SHOW CREATE TABLE $page_tbl");
-		$result = join(" ", $row);
-		if (strstr(strtolower($result), "character set")
-		    and strstr(strtolower($result), "collate"))
-		    {
-			echo _("OK"), "<br />\n";
-		    } else {
-		    //SET CHARACTER SET latin1
-		    $charset = CHARSET;
-		    if ($charset == 'iso-8859-1') $charset = 'latin1';
-		    $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename "
-					  ."pagename VARCHAR(100) "
-					  ."CHARACTER SET '$charset' COLLATE '$charset"."_bin' NOT NULL");
-		    echo sprintf(_("version <em>%s</em>"), $mysql_version),
-			" <b>",_("FIXED"),"</b>",
-			"<br />\n";
-		}
-	    } elseif (DATABASE_TYPE != 'PDO') {
-		// check if already fixed
-		extract($this->dbi->_backend->_table_names);
-		assert(!empty($page_tbl));
-		$database = $this->dbi->_backend->database();
-		$fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
-		$columns = mysql_num_fields($fields);
-		for ($i = 0; $i < $columns; $i++) {
-		    if (mysql_field_name($fields, $i) == 'pagename') {
-			$flags = mysql_field_flags($fields, $i);
-			// I think it was fixed with 4.1.6, but I tested it only with 4.1.8
-			if ($mysql_version > 401.0 and $mysql_version < 401.6) {
-			    // remove the binary flag
-			    if (strstr(strtolower($flags), "binary")) {
-				// FIXME: on duplicate pagenames this will fail!
-				$this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename"
-						      ." pagename VARCHAR(100) NOT NULL");
-				echo sprintf(_("version <em>%s</em>"), $mysql_version),
-				    "<b>",_("FIXED"),"</b>"
-				    ,"<br />\n";
-			    }
-			}
-			break;
-		    }
-		}
-	    }
-	}
-	if ($this->isSQL and ACCESS_LOG_SQL & 2) {
-	    echo _("Check for ACCESS_LOG_SQL passwords in POST requests")," ...";
-	    // Don't display passwords in POST requests (up to 2005-02-04 12:03:20)
-	    $res = $this->dbi->genericSqlIter("SELECT time_stamp, remote_host, " .
-					"request_args FROM ${prefix}accesslog WHERE request_args LIKE " .
-					"'%s:6:\"passwd\"%' AND request_args NOT LIKE '%s:6:\"passwd\";" .
-					"s:15:\"<not displayed>\"%'");
-	    $count = 0;
-	    while ($row = $res->next()) {
-		$args = preg_replace("/(s:6:\"passwd\";s:15:\").*(\")/",
-				     "$1<not displayed>$2", $row["request_args"]);
-		$ts = $row["time_stamp"];
-		$rh = $row["remote_host"];
-		$this->dbi->genericSqlQuery("UPDATE ${prefix}accesslog SET " .
-				      "request_args='$args' WHERE time_stamp=$ts AND " .
-				      "remote_host='$rh'");
-		$count++;
-	    }
-	    if ($count > 0)
-		echo "<b>",_("FIXED"),"</b>", "<br />\n";
-	    else
-		echo _("OK"),"<br />\n";
+    // Check for mysql 4.1.x/5.0.0a binary search problem.
+    //   http://bugs.mysql.com/bug.php?id=4398
+    // "select * from page where LOWER(pagename) like '%search%'" does not apply LOWER!
+    // Confirmed for 4.1.0alpha,4.1.3-beta,5.0.0a; not yet tested for 4.1.2alpha,
+    // On windows only, though utf8 would be useful elsewhere also.
+    // Illegal mix of collations (latin1_bin,IMPLICIT) and
+    // (utf8_general_ci, COERCIBLE) for operation '='])
+    if (isWindows() and substr($backend_type,0,5) == 'mysql') {
+        echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem")," ...";
+        $mysql_version = $this->dbi->_backend->_serverinfo['version'];
+        if ($mysql_version < 401.0) {
+        echo sprintf(_("version <em>%s</em>"), $mysql_version)," ",
+            _("not affected"),"<br />\n";
+        } elseif ($mysql_version >= 401.6) { // FIXME: since which version?
+        $row = $this->dbi->_backend->getRow("SHOW CREATE TABLE $page_tbl");
+        $result = join(" ", $row);
+        if (strstr(strtolower($result), "character set")
+            and strstr(strtolower($result), "collate"))
+            {
+            echo _("OK"), "<br />\n";
+            } else {
+            //SET CHARACTER SET latin1
+            $charset = CHARSET;
+            if ($charset == 'iso-8859-1') $charset = 'latin1';
+            $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename "
+                      ."pagename VARCHAR(100) "
+                      ."CHARACTER SET '$charset' COLLATE '$charset"."_bin' NOT NULL");
+            echo sprintf(_("version <em>%s</em>"), $mysql_version),
+            " <b>",_("FIXED"),"</b>",
+            "<br />\n";
+        }
+        } elseif (DATABASE_TYPE != 'PDO') {
+        // check if already fixed
+        extract($this->dbi->_backend->_table_names);
+        assert(!empty($page_tbl));
+        $database = $this->dbi->_backend->database();
+        $fields = mysql_list_fields($database, $page_tbl, $this->dbi->_backend->connection());
+        $columns = mysql_num_fields($fields);
+        for ($i = 0; $i < $columns; $i++) {
+            if (mysql_field_name($fields, $i) == 'pagename') {
+            $flags = mysql_field_flags($fields, $i);
+            // I think it was fixed with 4.1.6, but I tested it only with 4.1.8
+            if ($mysql_version > 401.0 and $mysql_version < 401.6) {
+                // remove the binary flag
+                if (strstr(strtolower($flags), "binary")) {
+                // FIXME: on duplicate pagenames this will fail!
+                $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename"
+                              ." pagename VARCHAR(100) NOT NULL");
+                echo sprintf(_("version <em>%s</em>"), $mysql_version),
+                    "<b>",_("FIXED"),"</b>"
+                    ,"<br />\n";
+                }
+            }
+            break;
+            }
+        }
+        }
+    }
+    if ($this->isSQL and ACCESS_LOG_SQL & 2) {
+        echo _("Check for ACCESS_LOG_SQL passwords in POST requests")," ...";
+        // Don't display passwords in POST requests (up to 2005-02-04 12:03:20)
+        $res = $this->dbi->genericSqlIter("SELECT time_stamp, remote_host, " .
+                    "request_args FROM ${prefix}accesslog WHERE request_args LIKE " .
+                    "'%s:6:\"passwd\"%' AND request_args NOT LIKE '%s:6:\"passwd\";" .
+                    "s:15:\"<not displayed>\"%'");
+        $count = 0;
+        while ($row = $res->next()) {
+        $args = preg_replace("/(s:6:\"passwd\";s:15:\").*(\")/",
+                     "$1<not displayed>$2", $row["request_args"]);
+        $ts = $row["time_stamp"];
+        $rh = $row["remote_host"];
+        $this->dbi->genericSqlQuery("UPDATE ${prefix}accesslog SET " .
+                      "request_args='$args' WHERE time_stamp=$ts AND " .
+                      "remote_host='$rh'");
+        $count++;
+        }
+        if ($count > 0)
+        echo "<b>",_("FIXED"),"</b>", "<br />\n";
+        else
+        echo _("OK"),"<br />\n";
 
-	    if ($this->phpwiki_version >= 1030.13) {
-		echo _("Check for ACCESS_LOG_SQL remote_host varchar(50)")," ...";
-		$database = $this->dbi->_backend->database();
-		$accesslog_tbl = $prefix . 'accesslog';
-		$fields = $this->dbi->_backend->listOfFields($database, $accesslog_tbl);
-		if (!$fields) {
-		    echo _("SKIP");
-		} elseif (strstr(strtolower(join(':', $sess_fields)), "remote_host")) {
-		    // TODO: how to check size, already done?
-		    echo "<b>",_("FIXING"),"remote_host</b>"," ... ";
-		    $this->dbi->genericSqlQuery("ALTER TABLE $accesslog_tbl CHANGE remote_host VARCHAR(100)");
-		} else {
-		    echo _("FAIL");
-		}
-		echo "<br />\n";
-	    }
-	}
-	$this->_upgrade_cached_html();
+        if ($this->phpwiki_version >= 1030.13) {
+        echo _("Check for ACCESS_LOG_SQL remote_host varchar(50)")," ...";
+        $database = $this->dbi->_backend->database();
+        $accesslog_tbl = $prefix . 'accesslog';
+        $fields = $this->dbi->_backend->listOfFields($database, $accesslog_tbl);
+        if (!$fields) {
+            echo _("SKIP");
+        } elseif (strstr(strtolower(join(':', $sess_fields)), "remote_host")) {
+            // TODO: how to check size, already done?
+            echo "<b>",_("FIXING"),"remote_host</b>"," ... ";
+            $this->dbi->genericSqlQuery("ALTER TABLE $accesslog_tbl CHANGE remote_host VARCHAR(100)");
+        } else {
+            echo _("FAIL");
+        }
+        echo "<br />\n";
+        }
+    }
+    $this->_upgrade_cached_html();
 
-	if ($this->db_version < $this->current_db_version) {
-	    $this->dbi->set_db_version($this->current_db_version);
-	    $this->db_version = $this->dbi->get_db_version();
+    if ($this->db_version < $this->current_db_version) {
+        $this->dbi->set_db_version($this->current_db_version);
+        $this->db_version = $this->dbi->get_db_version();
             echo "db version: upgrade to ", $this->db_version,"  ";
             echo _("OK"), "<br />\n";
             flush();
-	}
+    }
 
-	return;
+    return;
     }
 
     /**
@@ -704,99 +704,99 @@
      * @access private
      */
     function _dbpermission_filter($err) {
-	if  ( $err->isWarning() ) {
-	    global $ErrorManager;
-	    $this->error_caught = 1;
-	    $ErrorManager->_postponed_errors[] = $err;
-	    return true;
-	}
-	return false;
+    if  ( $err->isWarning() ) {
+        global $ErrorManager;
+        $this->error_caught = 1;
+        $ErrorManager->_postponed_errors[] = $err;
+        return true;
     }
+    return false;
+    }
 
     function _try_dbadmin_user ($user, $passwd) {
-	global $DBParams, $DBAuthParams;
-	$AdminParams = $DBParams;
-	if (DATABASE_TYPE == 'SQL')
-	    $dsn = DB::parseDSN($AdminParams['dsn']);
-	else {
-	    $dsn = parseDSN($AdminParams['dsn']);
-	}
-	$AdminParams['dsn'] = sprintf("%s://%s:%s@%s/%s",
-				      $dsn['phptype'],
-				      $user,
-				      $passwd,
-				      $dsn['hostspec'],
-				      $dsn['database']);
-	$AdminParams['_tryroot_from_upgrade'] = 1;
-	// add error handler to warn about missing permissions for DBADMIN_USER
-	global $ErrorManager;
-	$ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
-	$this->error_caught = 0;
-	$this->dbi = WikiDB::open($AdminParams);
-	if (!$this->error_caught) return true;
-	// FAILED: redo our connection with the wikiuser
-	$this->dbi = WikiDB::open($DBParams);
-	$ErrorManager->flushPostponedErrors();
-	$ErrorManager->popErrorHandler();
-	return false;
+    global $DBParams, $DBAuthParams;
+    $AdminParams = $DBParams;
+    if (DATABASE_TYPE == 'SQL')
+        $dsn = DB::parseDSN($AdminParams['dsn']);
+    else {
+        $dsn = parseDSN($AdminParams['dsn']);
     }
+    $AdminParams['dsn'] = sprintf("%s://%s:%s@%s/%s",
+                      $dsn['phptype'],
+                      $user,
+                      $passwd,
+                      $dsn['hostspec'],
+                      $dsn['database']);
+    $AdminParams['_tryroot_from_upgrade'] = 1;
+    // add error handler to warn about missing permissions for DBADMIN_USER
+    global $ErrorManager;
+    $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
+    $this->error_caught = 0;
+    $this->dbi = WikiDB::open($AdminParams);
+    if (!$this->error_caught) return true;
+    // FAILED: redo our connection with the wikiuser
+    $this->dbi = WikiDB::open($DBParams);
+    $ErrorManager->flushPostponedErrors();
+    $ErrorManager->popErrorHandler();
+    return false;
+    }
 
     function _db_init () {
-	if (!$this->isSQL) return;
+    if (!$this->isSQL) return;
 
-	/* SQLite never needs admin params */
-	$backend_type = $this->dbi->_backend->backendType();
-	if (substr($backend_type,0,6)=="sqlite") {
-	    return;
-	}
-	$dbadmin_user = 'root';
-	if ($dbadmin = $this->request->getArg('dbadmin')) {
-	    $dbadmin_user = $dbadmin['user'];
-	    if (isset($dbadmin['cancel'])) {
-		return;
-	    } elseif (!empty($dbadmin_user)) {
-		if ($this->_try_dbadmin_user($dbadmin['user'], $dbadmin['passwd']))
-		    return;
-	    }
-	} elseif (DBADMIN_USER) {
-	    if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD))
-		return true;
-	}
-	// Check if the privileges are enough. Need CREATE and ALTER perms.
-	// And on windows: SELECT FROM mysql, possibly: UPDATE mysql.
-	$form = HTML::form(array("method" => "post",
-				 "action" => $this->request->getPostURL(),
-				 "accept-charset"=>$GLOBALS['charset']),
-			   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',
-					      'overwrite' => $this->request->getArg('overwrite'))),
-			   HTML::table(array("cellspacing"=>4),
-				       HTML::tr(HTML::td(array('align'=>'right'),
-							 _("DB admin user:")),
-						HTML::td(HTML::input(array('name'=>"dbadmin[user]",
-									   'size'=>12,
-									   'maxlength'=>256,
-									   'value'=>$dbadmin_user)))),
-				       HTML::tr(HTML::td(array('align'=>'right'),
-							 _("DB admin password:")),
-						HTML::td(HTML::input(array('name'=>"dbadmin[passwd]",
-									   'type'=>'password',
-									   'size'=>12,
-									   'maxlength'=>256)))),
-				       HTML::tr(HTML::td(array('align'=>'center', 'colspan' => 2),
-							 Button("submit:", _("Submit"), 'wikiaction'),
-							 HTML::raw(' '),
-							 Button("submit:dbadmin[cancel]", _("Cancel"),
-								'button')))));
-	$form->printXml();
-	echo "</div><!-- content -->\n";
-	echo asXML(Template("bottom"));
-	echo "</body></html>\n";
-	$this->request->finish();
-	exit();
+    /* SQLite never needs admin params */
+    $backend_type = $this->dbi->_backend->backendType();
+    if (substr($backend_type,0,6)=="sqlite") {
+        return;
     }
+    $dbadmin_user = 'root';
+    if ($dbadmin = $this->request->getArg('dbadmin')) {
+        $dbadmin_user = $dbadmin['user'];
+        if (isset($dbadmin['cancel'])) {
+        return;
+        } elseif (!empty($dbadmin_user)) {
+        if ($this->_try_dbadmin_user($dbadmin['user'], $dbadmin['passwd']))
+            return;
+        }
+    } elseif (DBADMIN_USER) {
+        if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD))
+        return true;
+    }
+    // Check if the privileges are enough. Need CREATE and ALTER perms.
+    // And on windows: SELECT FROM mysql, possibly: UPDATE mysql.
+    $form = HTML::form(array("method" => "post",
+                 "action" => $this->request->getPostURL(),
+                 "accept-charset"=>$GLOBALS['charset']),
+               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',
+                          'overwrite' => $this->request->getArg('overwrite'))),
+               HTML::table(array("cellspacing"=>4),
+                       HTML::tr(HTML::td(array('align'=>'right'),
+                             _("DB admin user:")),
+                        HTML::td(HTML::input(array('name'=>"dbadmin[user]",
+                                       'size'=>12,
+                                       'maxlength'=>256,
+                                       'value'=>$dbadmin_user)))),
+                       HTML::tr(HTML::td(array('align'=>'right'),
+                             _("DB admin password:")),
+                        HTML::td(HTML::input(array('name'=>"dbadmin[passwd]",
+                                       'type'=>'password',
+                                       'size'=>12,
+                                       'maxlength'=>256)))),
+                       HTML::tr(HTML::td(array('align'=>'center', 'colspan' => 2),
+                             Button("submit:", _("Submit"), 'wikiaction'),
+                             HTML::raw(' '),
+                             Button("submit:dbadmin[cancel]", _("Cancel"),
+                                'button')))));
+    $form->printXml();
+    echo "</div><!-- content -->\n";
+    echo asXML(Template("bottom"));
+    echo "</body></html>\n";
+    $this->request->finish();
+    exit();
+    }
 
     /**
      * if page.cached_html does not exists:
@@ -807,68 +807,68 @@
      * but was extracetd for every simple page iteration.
      */
     function _upgrade_cached_html ( $verbose=true ) {
-	global $DBParams;
-	if (!$this->isSQL) return;
-	$count = 0;
-	if ($this->phpwiki_version >= 1030.10) {
-	    if ($verbose)
-		echo _("Check for extra page.cached_html column")," ... ";
-	    $database = $this->dbi->_backend->database();
-	    extract($this->dbi->_backend->_table_names);
-	    $fields = $this->dbi->_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>"," ... ";
-		$backend_type = $this->dbi->_backend->backendType();
-		if (substr($backend_type,0,5) == 'mysql')
-		    $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html MEDIUMBLOB");
-		else
-		    $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB");
-		if ($verbose)
-		    echo "<b>",_("CONVERTING"),"</b>"," ... ";
-		$count = _convert_cached_html();
-		if ($verbose)
-		    echo $count, " ", _("OK"), "<br />\n";
-	    } else {
-		if ($verbose)
-		    echo _("OK"), "<br />\n";
-	    }
-	}
-	return $count;
+    global $DBParams;
+    if (!$this->isSQL) return;
+    $count = 0;
+    if ($this->phpwiki_version >= 1030.10) {
+        if ($verbose)
+        echo _("Check for extra page.cached_html column")," ... ";
+        $database = $this->dbi->_backend->database();
+        extract($this->dbi->_backend->_table_names);
+        $fields = $this->dbi->_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>"," ... ";
+        $backend_type = $this->dbi->_backend->backendType();
+        if (substr($backend_type,0,5) == 'mysql')
+            $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html MEDIUMBLOB");
+        else
+            $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB");
+        if ($verbose)
+            echo "<b>",_("CONVERTING"),"</b>"," ... ";
+        $count = _convert_cached_html();
+        if ($verbose)
+            echo $count, " ", _("OK"), "<br />\n";
+        } else {
+        if ($verbose)
+            echo _("OK"), "<br />\n";
+        }
     }
+    return $count;
+    }
 
     /**
      * move _cached_html for all pages from pagedata into a new seperate blob.
      * decoupled from action=upgrade, so that it can be used by a WikiAdminUtils button also.
      */
     function _convert_cached_html () {
-	global $DBParams;
-	if (!$this->isSQL) return;
-	//if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
+    global $DBParams;
+    if (!$this->isSQL) return;
+    //if (!in_array(DATABASE_TYPE, array('SQL','ADODB'))) return;
 
-	$pages = $this->dbi->getAllPages();
-	$cache =& $this->dbi->_cache;
-	$count = 0;
-	extract($this->dbi->_backend->_table_names);
-	while ($page = $pages->next()) {
-	    $pagename = $page->getName();
-	    $data = $this->dbi->_backend->get_pagedata($pagename);
-	    if (!empty($data['_cached_html'])) {
-		$cached_html = $data['_cached_html'];
-		$data['_cached_html'] = '';
-		$cache->update_pagedata($pagename, $data);
-		// store as blob, not serialized
-		$this->dbi->genericSqlQuery("UPDATE $page_tbl SET cached_html=? WHERE pagename=?",
-				      array($cached_html, $pagename));
-		$count++;
-	    }
-	}
-	return $count;
+    $pages = $this->dbi->getAllPages();
+    $cache =& $this->dbi->_cache;
+    $count = 0;
+    extract($this->dbi->_backend->_table_names);
+    while ($page = $pages->next()) {
+        $pagename = $page->getName();
+        $data = $this->dbi->_backend->get_pagedata($pagename);
+        if (!empty($data['_cached_html'])) {
+        $cached_html = $data['_cached_html'];
+        $data['_cached_html'] = '';
+        $cache->update_pagedata($pagename, $data);
+        // store as blob, not serialized
+        $this->dbi->genericSqlQuery("UPDATE $page_tbl SET cached_html=? WHERE pagename=?",
+                      array($cached_html, $pagename));
+        $count++;
+        }
     }
+    return $count;
+    }
 
     /**
      * upgrade to 1.3.13 link structure.
@@ -890,151 +890,151 @@
             }
             echo "<br />\n";
         }
-	if ($this->phpwiki_version >= 1030.12200610) {
-	    echo _("Rebuild entire database to upgrade relation links")," ... ";
-	    if (DATABASE_TYPE == 'dba') {
-		echo "<b>",_("CONVERTING")," dba linktable</b>","(~2 min, max 4 min) ... ";
-	        flush();
-	        longer_timeout(240);
-	        $this->dbi->_backend->_linkdb->rebuild();
-	    } else {
-	        flush();
-	        longer_timeout(180);
-	        $this->dbi->_backend->rebuild();
-	    }
-	    echo _("OK"), "<br />\n";
-	}
+    if ($this->phpwiki_version >= 1030.12200610) {
+        echo _("Rebuild entire database to upgrade relation links")," ... ";
+        if (DATABASE_TYPE == 'dba') {
+        echo "<b>",_("CONVERTING")," dba linktable</b>","(~2 min, max 4 min) ... ";
+            flush();
+            longer_timeout(240);
+            $this->dbi->_backend->_linkdb->rebuild();
+        } else {
+            flush();
+            longer_timeout(180);
+            $this->dbi->_backend->rebuild();
+        }
+        echo _("OK"), "<br />\n";
     }
+    }
 
     function CheckPluginUpdate() {
-    	return;
-    
-	echo "<h3>",sprintf(_("Check for necessary %s updates"),
-			    _("plugin argument")),"</h3>\n";
+        return;
 
-	$this->_configUpdates = array();
-	$this->_configUpdates[] = new UpgradePluginEntry
-	    ($this, array('key' => 'plugin_randompage_numpages',
-			  'fixed_with' => 1012.0,
-			  //'header' => _("change RandomPage pages => numpages"),
-			  //'notice'  =>_("found RandomPage plugin"),
-	                  'check_args' => array("plugin RandomPage pages",
+    echo "<h3>",sprintf(_("Check for necessary %s updates"),
+                _("plugin argument")),"</h3>\n";
+
+    $this->_configUpdates = array();
+    $this->_configUpdates[] = new UpgradePluginEntry
+        ($this, array('key' => 'plugin_randompage_numpages',
+              'fixed_with' => 1012.0,
+              //'header' => _("change RandomPage pages => numpages"),
+              //'notice'  =>_("found RandomPage plugin"),
+                      'check_args' => array("plugin RandomPage pages",
                                                 "/(<\?\s*plugin\s+ RandomPage\s+)pages/",
                                                 "\\1numpages")));
-	$this->_configUpdates[] = new UpgradePluginEntry
-	    ($this, array('key' => 'plugin_createtoc_position',
-			  'fixed_with' => 1013.0,
-			  //'header' => _("change CreateToc align => position"),
-			  //'notice'  =>_("found CreateToc plugin"),
-	                  'check_args' => array("plugin CreateToc align",
+    $this->_configUpdates[] = new UpgradePluginEntry
+        ($this, array('key' => 'plugin_createtoc_position',
+              'fixed_with' => 1013.0,
+              //'header' => _("change CreateToc align => position"),
+              //'notice'  =>_("found CreateToc plugin"),
+                      'check_args' => array("plugin CreateToc align",
                                                 "/(<\?\s*plugin\s+ CreateToc[^\?]+)align/",
                                                 "\\1position")));
 
-	if (empty($this->_configUpdates)) return;
+    if (empty($this->_configUpdates)) return;
         foreach ($this->_configUpdates as $update) {
             $pages = $this->dbi->fullSearch($this->check_args[0]);
             while ($page = $allpages->next()) {
                 $current = $page->getCurrentRevision();
                 $pagetext = $current->getPackedContent();
-	        $update->check($this->check_args[1], $this->check_args[2], $pagetext, $page, $current);
-	    }
-	}
-	free($allpages);
-	unset($pagetext);
-	unset($current);
-	unset($page);
+            $update->check($this->check_args[1], $this->check_args[2], $pagetext, $page, $current);
+        }
     }
+    free($allpages);
+    unset($pagetext);
+    unset($current);
+    unset($page);
+    }
 
     /**
      * preg_replace over local file.
      * Only line-orientated matches possible.
      */
     function fixLocalFile($match, $replace, $filename) {
-    	$o_filename = $filename;
-    	if (!file_exists($filename))
-	    $filename = FindFile($filename);
-    	if (!file_exists($filename))
-	    return array(false, sprintf(_("file %s not found"), $o_filename));
-	$found = false;
-	if (is_writable($filename)) {
-	    $in = fopen($filename, "rb");
-	    $out = fopen($tmp = tempnam(getUploadFilePath(),"cfg"), "wb");
-	    if (isWindows())
-		$tmp = str_replace("/","\\",$tmp);
-	    // Detect the existing linesep at first line. fgets strips it even if 'rb'.
-	    // Before we simply assumed \r\n on windows local files.
-	    $s = fread($in, 1024);
-	    rewind($in);
-	    $linesep = (substr_count($s, "\r\n") > substr_count($s, "\n")) ? "\r\n" : "\n";
-	    //$linesep = isWindows() ? "\r\n" : "\n";
-	    while ($s = fgets($in)) {
-		// =>php-5.0.1 can fill count
-		//$new = preg_replace($match, $replace, $s, -1, $count);
-		$new = preg_replace($match, $replace, $s);
-		if ($new != $s) {
-		    $s = $new . $linesep;
-		    $found = true;
-		}
-		fputs($out, $s);
-	    }
-	    fclose($in);
-	    fclose($out);
-	    if (!$found) {
-		// todo: skip
-	    	$reason = sprintf(_("%s not found in %s"), $match, $filename);
-		unlink($out);
-		return array($found, $reason);
-	    } else {
-		@unlink("$file.bak");
-		@rename($file,"$file.bak");
-		if (!rename($tmp, $file))
-	            return array(false, sprintf(_("couldn't move %s to %s"), $tmp, $filename));
-	        return true;
-	    }
-	} else {
-	    return array(false, sprintf(_("file %s is not writable"), $filename));
-	}
+        $o_filename = $filename;
+        if (!file_exists($filename))
+        $filename = FindFile($filename);
+        if (!file_exists($filename))
+        return array(false, sprintf(_("file %s not found"), $o_filename));
+    $found = false;
+    if (is_writable($filename)) {
+        $in = fopen($filename, "rb");
+        $out = fopen($tmp = tempnam(getUploadFilePath(),"cfg"), "wb");
+        if (isWindows())
+        $tmp = str_replace("/","\\",$tmp);
+        // Detect the existing linesep at first line. fgets strips it even if 'rb'.
+        // Before we simply assumed \r\n on windows local files.
+        $s = fread($in, 1024);
+        rewind($in);
+        $linesep = (substr_count($s, "\r\n") > substr_count($s, "\n")) ? "\r\n" : "\n";
+        //$linesep = isWindows() ? "\r\n" : "\n";
+        while ($s = fgets($in)) {
+        // =>php-5.0.1 can fill count
+        //$new = preg_replace($match, $replace, $s, -1, $count);
+        $new = preg_replace($match, $replace, $s);
+        if ($new != $s) {
+            $s = $new . $linesep;
+            $found = true;
+        }
+        fputs($out, $s);
+        }
+        fclose($in);
+        fclose($out);
+        if (!$found) {
+        // todo: skip
+            $reason = sprintf(_("%s not found in %s"), $match, $filename);
+        unlink($out);
+        return array($found, $reason);
+        } else {
+        @unlink("$file.bak");
+        @rename($file,"$file.bak");
+        if (!rename($tmp, $file))
+                return array(false, sprintf(_("couldn't move %s to %s"), $tmp, $filename));
+            return true;
+        }
+    } else {
+        return array(false, sprintf(_("file %s is not writable"), $filename));
     }
+    }
 
     function CheckConfigUpdate () {
-	echo "<h3>",sprintf(_("Check for necessary %s updates"),
-			    "config.ini"),"</h3>\n";
-	$entry = new UpgradeConfigEntry
-	    ($this, array('key' => 'cache_control_none',
-	                  'fixed_with' => 1012.0,
-	                  'header' => sprintf(_("Check for %s"),"CACHE_CONTROL = NONE"),
-	                  'applicable_args' => 'CACHE_CONTROL',
-	                  'notice'  => _("CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"),
-	                  'check_args' => array("/^\s*CACHE_CONTROL\s*=\s*NONE/", "CACHE_CONTROL = NO_CACHE")));
-	$entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty'));
-	$this->_configUpdates[] = $entry;
+    echo "<h3>",sprintf(_("Check for necessary %s updates"),
+                "config.ini"),"</h3>\n";
+    $entry = new UpgradeConfigEntry
+        ($this, array('key' => 'cache_control_none',
+                      'fixed_with' => 1012.0,
+                      'header' => sprintf(_("Check for %s"),"CACHE_CONTROL = NONE"),
+                      'applicable_args' => 'CACHE_CONTROL',
+                      'notice'  => _("CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"),
+                      'check_args' => array("/^\s*CACHE_CONTROL\s*=\s*NONE/", "CACHE_CONTROL = NO_CACHE")));
+    $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty'));
+    $this->_configUpdates[] = $entry;
 
-	$entry = new UpgradeConfigEntry
-	    ($this, array('key' => 'group_method_none',
-			  'fixed_with' => 1012.0,
-			  'header' => sprintf(_("Check for %s"), "GROUP_METHOD = NONE"),
-			  'applicable_args' => 'GROUP_METHOD',
-			  'notice'  =>_("GROUP_METHOD is set to NONE, and must be changed to \"NONE\""),
-	                  'check_args' => array("/^\s*GROUP_METHOD\s*=\s*NONE/", "GROUP_METHOD = \"NONE\"")));
-	$entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty'));
-	$this->_configUpdates[] = $entry;
+    $entry = new UpgradeConfigEntry
+        ($this, array('key' => 'group_method_none',
+              'fixed_with' => 1012.0,
+              'header' => sprintf(_("Check for %s"), "GROUP_METHOD = NONE"),
+              'applicable_args' => 'GROUP_METHOD',
+              'notice'  =>_("GROUP_METHOD is set to NONE, and must be changed to \"NONE\""),
+                      'check_args' => array("/^\s*GROUP_METHOD\s*=\s*NONE/", "GROUP_METHOD = \"NONE\"")));
+    $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined_and_empty'));
+    $this->_configUpdates[] = $entry;
 
-	$entry = new UpgradeConfigEntry
-	    ($this, array('key' => 'blog_empty_default_prefix',
-			  'fixed_with' => 1013.0,
-			  'header' => sprintf(_("Check for %s"), "BLOG_EMPTY_DEFAULT_PREFIX"),
-			  'applicable_args' => 'BLOG_EMPTY_DEFAULT_PREFIX',
-			  'notice'  =>_("fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX"),
-	                  'check_args' => array("/BLOG_EMPTY_DEFAULT_PREFIX\s*=/","BLOG_DEFAULT_EMPTY_PREFIX =")));
-	$entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined'));
-	$this->_configUpdates[] = $entry;
+    $entry = new UpgradeConfigEntry
+        ($this, array('key' => 'blog_empty_default_prefix',
+              'fixed_with' => 1013.0,
+              'header' => sprintf(_("Check for %s"), "BLOG_EMPTY_DEFAULT_PREFIX"),
+              'applicable_args' => 'BLOG_EMPTY_DEFAULT_PREFIX',
+              'notice'  =>_("fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX"),
+                      'check_args' => array("/BLOG_EMPTY_DEFAULT_PREFIX\s*=/","BLOG_DEFAULT_EMPTY_PREFIX =")));
+    $entry->setApplicableCb(new WikiMethodCb($entry, '_applicable_defined'));
+    $this->_configUpdates[] = $entry;
 
-	// TODO: find extra file updates
-	if (empty($this->_configUpdates)) return;
-	foreach ($this->_configUpdates as $update) {
-	    $update->check();
-	}
+    // TODO: find extra file updates
+    if (empty($this->_configUpdates)) return;
+    foreach ($this->_configUpdates as $update) {
+        $update->check();
     }
+    }
 
 } // class Upgrade
 
@@ -1053,17 +1053,17 @@
      * //param All other args are passed to $method
      */
     function UpgradeEntry(&$parent, $params) {
-	$this->parent =& $parent;           // get the properties db_version
-    	foreach (array('key' => 'required',
-		       	// the wikidb stores the version when we actually fixed that.
-    	               'fixed_with' => 'required',
-    	               'header' => '',          // always printed
-    	               'applicable_cb' => null, // method to check if applicable
-    	               'applicable_args' => array(), // might be the config name
-    	               'notice' => '',
-    	               'check_cb' => null,      // method to apply
-    	               'check_args' => array())
-    	         as $k => $v)
+    $this->parent =& $parent;           // get the properties db_version
+        foreach (array('key' => 'required',
+                   // the wikidb stores the version when we actually fixed that.
+                       'fixed_with' => 'required',
+                       'header' => '',          // always printed
+                       'applicable_cb' => null, // method to check if applicable
+                       'applicable_args' => array(), // might be the config name
+                       'notice' => '',
+                       'check_cb' => null,      // method to apply
+                       'check_args' => array())
+                 as $k => $v)
         {
             if (!isset($params[$k])) { // default
                 if ($v == 'required') trigger_error("Required arg $k missing", E_USER_ERROR);
@@ -1072,97 +1072,97 @@
                 $this->{$k} = $params[$k];
             }
         }
-	if (!is_array($this->applicable_args)) // single arg convenience shortcut
-	    $this->applicable_args = array($this->applicable_args);
-	if (!is_array($this->check_args))   // single arg convenience shortcut
-	    $this->check_args = array($this->check_args);
-	if ($this->notice === '' and count($this->applicable_args) > 0)
-	    $this->notice = 'Check for '.join(', ', $this->applicable_args);
-	$this->_db_key = "_upgrade";
-	$this->upgrade = $this->parent->dbi->get($this->_db_key);
+    if (!is_array($this->applicable_args)) // single arg convenience shortcut
+        $this->applicable_args = array($this->applicable_args);
+    if (!is_array($this->check_args))   // single arg convenience shortcut
+        $this->check_args = array($this->check_args);
+    if ($this->notice === '' and count($this->applicable_args) > 0)
+        $this->notice = 'Check for '.join(', ', $this->applicable_args);
+    $this->_db_key = "_upgrade";
+    $this->upgrade = $this->parent->dbi->get($this->_db_key);
     }
     /* needed ? */
     function setApplicableCb($object) {
-	$this->applicable_cb =& $object;
+    $this->applicable_cb =& $object;
     }
     function _check_if_already_fixed() {
-	// not yet fixed?
-	if (!isset($this->upgrade['name'])) return false;
-	// override with force?
-	if ($this->parent->request->getArg('force')) return false;
-	// already fixed and with an ok version
-	if ($this->upgrade['name'] >= $this->fixed_with) return $this->upgrade['name'];
-	// already fixed but with an older version. do it again.
-	return false;
+    // not yet fixed?
+    if (!isset($this->upgrade['name'])) return false;
+    // override with force?
+    if ($this->parent->request->getArg('force')) return false;
+    // already fixed and with an ok version
+    if ($this->upgrade['name'] >= $this->fixed_with) return $this->upgrade['name'];
+    // already fixed but with an older version. do it again.
+    return false;
     }
     function pass() {
-	// store in db no to fix again
-	$this->upgrade['name'] = $this->parent->phpwiki_version;
-	$this->parent->dbi->set($this->_db_key, $this->upgrade);
-	echo "<b>",_("FIXED"),"</b>";
-	if (isset($this->reason))
-	    echo ": ", $this->reason;
-	echo "<br />\n";
-	flush();
-	return true;
+    // store in db no to fix again
+    $this->upgrade['name'] = $this->parent->phpwiki_version;
+    $this->parent->dbi->set($this->_db_key, $this->upgrade);
+    echo "<b>",_("FIXED"),"</b>";
+    if (isset($this->reason))
+        echo _(": "), $this->reason;
+    echo "<br />\n";
+    flush();
+    return true;
     }
     function fail() {
-	echo " <b><font color=\"red\">", _("FAILED"), "</font></b>";
-	if (isset($this->reason))
-	    echo ": ", $this->reason;
-	echo "<br />\n";
-	flush();
-	return false;
+    echo " <b><font color=\"red\">", _("FAILED"), "</font></b>";
+    if (isset($this->reason))
+        echo _(": "), $this->reason;
+    echo "<br />\n";
+    flush();
+    return false;
     }
     function skip() { // not applicable
         if (isset($this->silent_skip)) return true;
-	echo _(" Skipped"),".<br />\n";
-	flush();
-	return true;
+    echo _(" Skipped"),".<br />\n";
+    flush();
+    return true;
     }
     function check($args = null) {
-	if ($this->header) echo $this->header, ' ... ';
-	if ($when = $this->_check_if_already_fixed()) {
-	    // be totally silent if no header is defined.
-	    if ($this->header) echo _("fixed with")," ",$when,"<br />\n";
-	    flush();
-	    return true;
-	}
-	if (is_object($this->applicable_cb)) {
-	    if (!$this->applicable_cb->call_array($this->applicable_args))
-	        return $this->skip();
-	}
-	if ($this->notice) {
-	    if ($this->header)
-	        echo "<br />\n";
-	    echo $this->notice," ";
-	    flush();
-	}
-	if (!is_null($args)) $this->check_args =& $args;
-	if (is_object($this->check_cb))
-	    $do = $this->method_cb->call_array($this->check_args);
-	else
-	    $do = $this->default_method($this->check_args);
-	if (is_array($do)) {
-	    $this->reason = $do[1];
-	    $do = $do[0];
-	}
-	return $do ? $this->pass() : $this->fail();
+    if ($this->header) echo $this->header, ' ... ';
+    if ($when = $this->_check_if_already_fixed()) {
+        // be totally silent if no header is defined.
+        if ($this->header) echo _("fixed with")," ",$when,"<br />\n";
+        flush();
+        return true;
     }
+    if (is_object($this->applicable_cb)) {
+        if (!$this->applicable_cb->call_array($this->applicable_args))
+            return $this->skip();
+    }
+    if ($this->notice) {
+        if ($this->header)
+            echo "<br />\n";
+        echo $this->notice," ";
+        flush();
+    }
+    if (!is_null($args)) $this->check_args =& $args;
+    if (is_object($this->check_cb))
+        $do = $this->method_cb->call_array($this->check_args);
+    else
+        $do = $this->default_method($this->check_args);
+    if (is_array($do)) {
+        $this->reason = $do[1];
+        $do = $do[0];
+    }
+    return $do ? $this->pass() : $this->fail();
+    }
 } // class UpgradeEntry
 
 class UpgradeConfigEntry extends UpgradeEntry {
     function _applicable_defined() {
-    	return (boolean)defined($this->applicable_args[0]);
+        return (boolean)defined($this->applicable_args[0]);
     }
     function _applicable_defined_and_empty() {
-    	$const = $this->applicable_args[0];
-    	return (boolean)(defined($const) and !constant($const));
+        $const = $this->applicable_args[0];
+        return (boolean)(defined($const) and !constant($const));
     }
     function default_method ($args) {
-	$match = $args[0];
-	$replace = $args[1];
-	return $this->parent->fixLocalFile($match, $replace, "config/config.ini");
+    $match = $args[0];
+    $replace = $args[1];
+    return $this->parent->fixLocalFile($match, $replace, "config/config.ini");
     }
 } // class UpdateConfigEntry
 
@@ -1175,23 +1175,23 @@
     var $silent_skip = 1;
 
     function default_method (&$args) {
-    	$match    =  $args[0];
-    	$replace  =  $args[1];
-    	$pagetext =& $args[2];
-    	$page     =& $args[3];
-    	$current  =& $args[4];
-	if (preg_match($match, $pagetext)) {
-	    echo $page->getName()," ",$this->notice," ... ";
-	    if ($newtext = preg_replace($match, $replace, $pagetext)) {
-		$meta = $current->_data;
-		$meta['summary'] = "upgrade: ".$this->header;
-		$page->save($newtext, $current->getVersion() + 1, $meta);
-		$this->pass();
-	    } else {
-		$this->fail();
-	    }
-	}
+        $match    =  $args[0];
+        $replace  =  $args[1];
+        $pagetext =& $args[2];
+        $page     =& $args[3];
+        $current  =& $args[4];
+    if (preg_match($match, $pagetext)) {
+        echo $page->getName()," ",$this->notice," ... ";
+        if ($newtext = preg_replace($match, $replace, $pagetext)) {
+        $meta = $current->_data;
+        $meta['summary'] = "upgrade: ".$this->header;
+        $page->save($newtext, $current->getVersion() + 1, $meta);
+        $this->pass();
+        } else {
+        $this->fail();
+        }
     }
+    }
 } // class UpdatePluginEntry
 
 /**
@@ -1201,33 +1201,33 @@
 class UpgradeThemeEntry extends UpgradeEntry {
 
     function default_method (&$args) {
-    	$match    =  $args[0];
-    	$replace  =  $args[1];
-    	$template = $args[2];
+        $match    =  $args[0];
+        $replace  =  $args[1];
+        $template = $args[2];
     }
 
     function fixThemeTemplate($match, $new, $template) {
-    	// for all custom themes
-    	$ourthemes = explode(":","blog:Crao:default:Hawaiian:MacOSX:MonoBook:Portland:shamino_com:SpaceWiki:wikilens:Wordpress");
-	$themedir = NormalizeLocalFileName("themes");
-	$dh = opendir($themedir);
-	while ($r = readdir($dh)) {
-	    if (filetype($r) == 'dir' and $r[0] != '.' and !is_array($r, $ourthemes))
-		$customthemes[] = $r;
-	}
-	$success = true;
-	$errors = '';
-	foreach ($customthemes as $customtheme) {
-	    $template = FindFile("themes/$customtheme/templates/$template");
-	    $do = $this->parent->fixLocalFile($match, $new, template);
-	    if (!$do[0]) {
-		$success = false;
-		$errors .= $do[1]." ";
-		echo $do[1];
-	    }
-	}
-	return array($success, $errors);
+        // for all custom themes
+        $ourthemes = explode(":","blog:Crao:default:Hawaiian:MacOSX:MonoBook:Portland:shamino_com:SpaceWiki:wikilens:Wordpress");
+    $themedir = NormalizeLocalFileName("themes");
+    $dh = opendir($themedir);
+    while ($r = readdir($dh)) {
+        if (filetype($r) == 'dir' and $r[0] != '.' and !is_array($r, $ourthemes))
+        $customthemes[] = $r;
     }
+    $success = true;
+    $errors = '';
+    foreach ($customthemes as $customtheme) {
+        $template = FindFile("themes/$customtheme/templates/$template");
+        $do = $this->parent->fixLocalFile($match, $new, template);
+        if (!$do[0]) {
+        $success = false;
+        $errors .= $do[1]." ";
+        echo $do[1];
+        }
+    }
+    return array($success, $errors);
+    }
 }
 
 /**
@@ -1260,18 +1260,18 @@
     //if (!$request->getArg('noindex'))
     //    CheckOldIndexUpdate($request); // index.php => config.ini to upgrade from < 1.3.10
     if (!$request->getArg('nodb'))
-	$upgrade->CheckDatabaseUpdate($request);   // first check cached_html and friends
+    $upgrade->CheckDatabaseUpdate($request);   // first check cached_html and friends
     if (!$request->getArg('nopgsrc')) {
-	$upgrade->CheckPgsrcUpdate($request);
-	$upgrade->CheckActionPageUpdate($request);
+    $upgrade->CheckPgsrcUpdate($request);
+    $upgrade->CheckActionPageUpdate($request);
     }
     if (!$request->getArg('noplugin'))
-	$upgrade->CheckPluginUpdate($request);
+    $upgrade->CheckPluginUpdate($request);
     if (!$request->getArg('noconfig'))
-	$upgrade->CheckConfigUpdate($request);
+    $upgrade->CheckConfigUpdate($request);
     // This is optional and should be linked. In EndLoadDump or PhpWikiAdministration?
     //if ($request->getArg('theme'))
-    //	  $upgrade->CheckThemeUpdate($request);
+    //      $upgrade->CheckThemeUpdate($request);
     EndLoadDump($request);
 }
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/Buddy.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/Buddy.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/Buddy.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: Buddy.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: Buddy.php 7967 2011-03-07 13:08:01Z vargenau $
 
 // It is anticipated that when userid support is added to phpwiki,
 // this object will hold much more information (e-mail,
@@ -15,16 +15,8 @@
 //       serialized string.
 //       If no homepage, fallback to prefs in cookie as in 1.3.3.
 
-
-/**
-* 
-*/
 require_once (dirname(__FILE__)."/Utils.php");
 
-/*
-class Buddy extends WikiUserNew {}
-*/
-
 function addBuddy($user, $buddy, $dbi)
 {
     $START_DELIM = _("Buddies:");
@@ -43,95 +35,95 @@
         $buddies_array = getPageTextData($fromUser, $dbi, _("Buddies:"), $DELIM);
     }
     if (empty($buddies_array)) {
-	// 1. calculate buddies automatically from the 10 top raters with the most numratings (min. 5 ratings).
-	//    of all pages (only SQL)
-	// or 2. from 10 random raters of this page (non-SQL)
-        // or 3. from all members of your group (department) if <= 20
-	$rdbi = RatingsDb::getTheRatingsDb();
-	$dimension = '';
+    // 1. calculate buddies automatically from the 10 top raters with the most numratings (min. 5 ratings).
+    //    of all pages (only SQL)
+    // or 2. from 10 random raters of this page (non-SQL)
+    // or 3. from all members of your group (department) if <= 20
+    $rdbi = RatingsDb::getTheRatingsDb();
+    $dimension = '';
         if (RATING_STORAGE == 'SQL') {
-	    //$result = $this->_sql_get_rating_result($dimension, null, null, 'numrating', "rater");
-	    $dbh = &$rdbi->_sqlbackend;
-	    extract($dbh->_table_names);
-	    $query = "SELECT raterpage, COUNT(rateepage) as numrating"
-		. " FROM $rating_tbl r, $page_tbl p "
-//		. " WHERE ratingvalue > 0 AND numrating > 5"
-		. " WHERE ratingvalue > 0"
-		. " GROUP BY raterpage"
-		. " ORDER BY numrating"
-		. " LIMIT 10";
-	    $result = $dbh->_dbh->query($query);
-	} else {
-	    // from 10 random raters of this page (non-SQL)
-	    ;
-	}
+        //$result = $this->_sql_get_rating_result($dimension, null, null, 'numrating', "rater");
+        $dbh = &$rdbi->_sqlbackend;
+        extract($dbh->_table_names);
+        $query = "SELECT raterpage, COUNT(rateepage) as numrating"
+        . " FROM $rating_tbl r, $page_tbl p "
+//        . " WHERE ratingvalue > 0 AND numrating > 5"
+        . " WHERE ratingvalue > 0"
+        . " GROUP BY raterpage"
+        . " ORDER BY numrating"
+        . " LIMIT 10";
+        $result = $dbh->_dbh->query($query);
+    } else {
+        // from 10 random raters of this page (non-SQL)
+        ;
+    }
 
     }
     $result = array();
     if (is_array($buddies_array))
-      foreach ($buddies_array as $userid) { 
-    	$result[] = new RatingsUser($userid);
+      foreach ($buddies_array as $userid) {
+        $result[] = new RatingsUser($userid);
       }
     return $result;
 }
 
 function CoAgreement($dbi, $page, $users, $active_userid){
-	//Returns a "yes" 1, "no" -1, or "unsure" 0 for whether 
-	//the group agrees on the page based on their ratings
-	$cur_page = $page;
-	
-	$my_ratings_iter = $dbi->get_rating(0, $active_userid, $page);
-	$my_ratings_single = $my_ratings_iter->next();
-	$cur_rating = $my_ratings_single['ratingvalue'];
-	
-	$MIDDLE_RATING = 3;
-	
-	if($cur_rating >= $MIDDLE_RATING){
-		$agreePos = 1;
-	} else {
-		$agreePos = 0;
-	}
-	foreach($users as $buddy){
-		$buddy_rating_iter = $dbi->get_rating(0, $buddy, $cur_page);
-		$buddy_rating_array = $buddy_rating_iter->next();
-		$buddy_rating = $buddy_rating_array['ratingvalue'];
-		if($buddy_rating == ""){
-			$agree = 1;
-		}else if($agreePos && $buddy_rating >= $MIDDLE_RATING){
-			$agree = 1;
-		} else if(!$agreePos && $buddy_rating < $MIDDLE_RATING){
-			$agree = 1;
-		} else {
-			$agree = 0;
-			break;
-		}	
-	}
-	if($agree && $agreePos){
-		return 1;
-	} else if($agree && !$agreePos){
-		return -1;
-	} else {
-		return 0;
-	}
+    //Returns a "yes" 1, "no" -1, or "unsure" 0 for whether
+    //the group agrees on the page based on their ratings
+    $cur_page = $page;
+
+    $my_ratings_iter = $dbi->get_rating(0, $active_userid, $page);
+    $my_ratings_single = $my_ratings_iter->next();
+    $cur_rating = $my_ratings_single['ratingvalue'];
+
+    $MIDDLE_RATING = 3;
+
+    if($cur_rating >= $MIDDLE_RATING){
+        $agreePos = 1;
+    } else {
+        $agreePos = 0;
+    }
+    foreach($users as $buddy){
+        $buddy_rating_iter = $dbi->get_rating(0, $buddy, $cur_page);
+        $buddy_rating_array = $buddy_rating_iter->next();
+        $buddy_rating = $buddy_rating_array['ratingvalue'];
+        if($buddy_rating == ""){
+            $agree = 1;
+        }else if($agreePos && $buddy_rating >= $MIDDLE_RATING){
+            $agree = 1;
+        } else if(!$agreePos && $buddy_rating < $MIDDLE_RATING){
+            $agree = 1;
+        } else {
+            $agree = 0;
+            break;
+        }
+    }
+    if($agree && $agreePos){
+        return 1;
+    } else if($agree && !$agreePos){
+        return -1;
+    } else {
+        return 0;
+    }
 }
 
 function MinMisery($dbi, $page, $users, $active_userid){
     //Returns the minimum rating for the page
     //from all the users.
-	
+
     $cur_page = $page;
-	
+
     $my_ratings_iter = $dbi->get_rating(0, $active_userid, $page);
     $my_ratings_single = $my_ratings_iter->next();
     $cur_rating = $my_ratings_single['ratingvalue'];
-	
+
     $min = $cur_rating;
     foreach($users as $buddy){
         $buddy_rating_iter = $dbi->get_rating(0, $buddy, $cur_page);
         $buddy_rating_array = $buddy_rating_iter->next();
         $buddy_rating = $buddy_rating_array['ratingvalue'];
         if($buddy_rating != "" && $buddy_rating < $min){
-            $min = $buddy_rating;	
+            $min = $buddy_rating;
         }
     }
     return $min;
@@ -140,9 +132,9 @@
 function AverageRating($dbi, $page, $users, $active_userid){
     //Returns the average rating for the page
     //from all the users.
-	
+
     $cur_page = $page;
-	
+
     $my_ratings_iter = $dbi->get_rating(0, $active_userid, $page);
     $my_ratings_single = $my_ratings_iter->next();
     $cur_rating = $my_ratings_single['ratingvalue'];
@@ -157,9 +149,9 @@
         $buddy_rating_iter = $dbi->get_rating(0, $buddy, $cur_page);
         $buddy_rating_array = $buddy_rating_iter->next();
         $buddy_rating = $buddy_rating_array['ratingvalue'];
-        if($buddy_rating != ""){		
+        if($buddy_rating != ""){
             $total = $total + $buddy_rating;
-            $count++;	
+            $count++;
         }
     }
     if($count == 0){

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/CustomPrefs.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/CustomPrefs.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/CustomPrefs.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,10 +1,10 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CustomPrefs.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: CustomPrefs.php 7967 2011-03-07 13:08:01Z vargenau $
 
 /**
  * Custom UserPreferences:
  * A list of name => _UserPreference class pairs.
- * Rationale: Certain themes should be able to extend the predefined list 
+ * Rationale: Certain themes should be able to extend the predefined list
  * of preferences. Display/editing is done in the theme specific userprefs.tmpl
  * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
  *
@@ -29,7 +29,7 @@
     var $valid_values = array
         (
          'itemCos',  // Item-based Top-N recommendation algorithm with cosine-based similarity function
-         'itemProb', // Item-based Top-N recommendation algorithm with probability-based similarity function. 
+         'itemProb', // Item-based Top-N recommendation algorithm with probability-based similarity function.
                      // This algorithms tends to outperform the rest.
          'userCos',  // User-based Top-N recommendation algorithm with cosine-based similarity function.
          'bayes');   // Naïve Bayesian Classifier
@@ -45,7 +45,7 @@
 extends _UserPreference_numeric{};
 
 $WikiTheme->customUserPreferences
-	(array
+    (array
          (
           'recengine' => new _UserPreference_recengine('php'),
           'recalgo'   => new _UserPreference_recalgo('itemProb'),

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/PageListColumns.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/PageListColumns.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/PageListColumns.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: PageListColumns.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: PageListColumns.php 8071 2011-05-18 14:56:14Z vargenau $
 
 /*
  * Copyright 2004 Mike Cassano
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -57,7 +57,7 @@
 class _PageList_Column_coagreement extends _PageList_Column_custom
 {
     function _PageList_Column_coagreement ($params) {
-    	$this->_pagelist =& $params[3];
+        $this->_pagelist =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
@@ -89,7 +89,7 @@
 class _PageList_Column_minmisery extends _PageList_Column_custom
 {
     function _PageList_Column_minmisery ($params) {
-    	$this->_pagelist =& $params[3];
+        $this->_pagelist =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
@@ -104,7 +104,7 @@
         $active_userId = $active_user->getId();
         $dbi = $request->getDbh();
         $p = MinMisery($dbi, $pagename, $this->_selectedBuddies, $active_userId);
-       	$imgFix = floor($p * 2) / 2;
+           $imgFix = floor($p * 2) / 2;
         return HTML::img(array('src' => $WikiTheme->getImageURL("Rateit" . $imgFix)));
     }
 }
@@ -113,7 +113,7 @@
 {
     function _PageList_Column_averagerating ($params)
     {
-    	$this->_pagelist =& $params[3];
+        $this->_pagelist =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
@@ -147,7 +147,7 @@
     var $_dimension;
 
     function _PageList_Column_ratingvalue ($params) {
-    	$this->_pagelist =& $params[3];
+        $this->_pagelist =& $params[3];
         $this->_user =& $params[4];//$this->_pagelist->getOption('user');
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_dimension   = $this->_pagelist->getOption('dimension');
@@ -212,7 +212,7 @@
 class _PageList_Column_ratingwidget extends _PageList_Column_custom
 {
     function _PageList_Column_ratingwidget ($params) {
-    	$this->_pagelist =& $params[3];
+        $this->_pagelist =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
         if (!$this->_dimension) $this->_dimension = 0;
@@ -255,7 +255,7 @@
         $active_user = $request->getUser();
         // This needs to be a reference so things aren't recomputed for this user
         $this->_active_ratings_user =& RatingsUserFactory::getUser($active_user->getId());
-    
+
         $this->_pagelist =& $params[3];
         $this->_PageList_Column($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');;
@@ -302,9 +302,9 @@
         global $request;
         $active_user = $request->getUser();
         if (is_string($active_user)) {
-	    //FIXME: try to find the bug at test.php which sets request->_user and ->_group
-	    trigger_error("request->getUser => string: $active_user", E_USER_WARNING);
-	    $active_user = new MockUser($active_user,true);
+        //FIXME: try to find the bug at test.php which sets request->_user and ->_group
+        trigger_error("request->getUser => string: $active_user", E_USER_WARNING);
+        $active_user = new MockUser($active_user,true);
         }
         // No, I don't know exactly why, but this needs to be a reference for
         // the memoization in pearson_similarity and mean_rating to work
@@ -369,25 +369,25 @@
    (
     'numbacklinks'
       => array('_PageList_Column_numbacklinks','custom:numbacklinks',
-	       _("# things"), 'center'),
-    'rating' 
+           _("# things"), 'center'),
+    'rating'
       => array('_PageList_Column_ratingwidget','custom:rating',
-	       _("Rate"), false),
+           _("Rate"), false),
     'ratingvalue'
       => array('_PageList_Column_ratingvalue','custom:ratingvalue',
-	       _("Rating"), 'center'),
+           _("Rating"), 'center'),
     'coagreement'
       => array('_PageList_Column_coagreement','custom:coagreement',
-	       _("Go?"), 'center'),
+           _("Go?"), 'center'),
     'minmisery'
       => array('_PageList_Column_minmisery','custom:minmisery',
-	       _("MinMisery"), 'center'),
+           _("MinMisery"), 'center'),
     'averagerating'
       => array('_PageList_Column_averagerating','custom:averagerating',
-	       _("Avg. Rating"), 'left'),
+           _("Avg. Rating"), 'left'),
     'top3recs'
       => array('_PageList_Column_top3recs','custom:top3recs',
-	       _("Top Recommendations"), 'left'),
+           _("Top Recommendations"), 'left'),
     /*'prediction'
       => array('_PageList_Column_prediction','custom:prediction',
                 _("Prediction"), false),*/

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/RatingsDb.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/RatingsDb.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/RatingsDb.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,10 +1,10 @@
 <?php // -*-php-*-
-// rcs_id('$Id: RatingsDb.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: RatingsDb.php 7967 2011-03-07 13:08:01Z vargenau $
 
 /*
  * @author:  Dan Frankowski (wikilens group manager), Reini Urban (as plugin)
  *
- * TODO: 
+ * TODO:
  * - fix RATING_STORAGE = WIKIPAGE (dba, file)
  * - fix smart caching
  * - finish mysuggest.c (external engine with data from mysql)
@@ -30,7 +30,7 @@
     // but this is problematic.
     define('RATING_STORAGE', $GLOBALS['request']->_dbi->_backend->isSQL() ? 'SQL' : 'WIKIPAGE');
     //define('RATING_STORAGE','WIKIPAGE');   // not fully supported yet
-   
+
 // leave undefined for internal, slow php engine.
 //if (!defined('RATING_EXTERNAL'))
 //    define('RATING_EXTERNAL',PHPWIKI_DIR . 'suggest.exe');
@@ -61,39 +61,39 @@
             } elseif (isa($this->_backend, 'WikiDB_backend_ADODOB')) {
                 $this->_sqlbackend = &$this->_backend;
                 $this->dbtype = "ADODB";
-            } else { 
-            	include_once("lib/WikiDB/backend/ADODB.php");
-            	// It is not possible to decouple a ref from the source again. (4.3.11)
-            	// It replaced the main request backend. So we don't initialize _sqlbackend before.
-            	//$this->_sqlbackend = clone($this->_backend);
+            } else {
+                include_once("lib/WikiDB/backend/ADODB.php");
+                // It is not possible to decouple a ref from the source again. (4.3.11)
+                // It replaced the main request backend. So we don't initialize _sqlbackend before.
+                //$this->_sqlbackend = clone($this->_backend);
                 $this->_sqlbackend = new WikiDB_backend_ADODB($GLOBALS['DBParams']);
-            	$this->dbtype = "ADODB";
+                $this->dbtype = "ADODB";
             }
             $this->iter_class = "WikiDB_backend_".$this->dbtype."_generic_iter";
 
             extract($this->_sqlbackend->_table_names);
             if (empty($rating_tbl)) {
-                $rating_tbl = (!empty($GLOBALS['DBParams']['prefix']) 
+                $rating_tbl = (!empty($GLOBALS['DBParams']['prefix'])
                                ? $GLOBALS['DBParams']['prefix'] : '') . 'rating';
                 $this->_sqlbackend->_table_names['rating_tbl'] = $rating_tbl;
             }
         } else {
-        	$this->iter_class = "WikiDB_Array_PageIterator";
+            $this->iter_class = "WikiDB_Array_PageIterator";
         }
     }
-    
+
     // this is a singleton.  It ensures there is only 1 ratingsDB.
     function & getTheRatingsDb(){
         static $_theRatingsDb;
-        
+
         if (!isset($_theRatingsDb)){
             $_theRatingsDb = new RatingsDb();
-        } 
+        }
         //echo "rating db is $_theRatingsDb";
         return $_theRatingsDb;
     }
-   
 
+
 /// *************************************************************************************
 // FIXME
 // from Reini Urban's RateIt plugin
@@ -110,7 +110,7 @@
 
     function deleteRating($userid=null, $pagename=null, $dimension=null) {
         if (is_null($dimension)) $dimension = $this->dimension;
-        if (is_null($userid))    $userid = $this->userid; 
+        if (is_null($userid))    $userid = $this->userid;
         if (is_null($pagename))  $pagename = $this->pagename;
         if (RATING_STORAGE == 'SQL') {
             $this->sql_delete_rating($userid, $pagename, $dimension);
@@ -118,13 +118,13 @@
             $this->metadata_set_rating($userid, $pagename, $dimension, -1);
         }
     }
-    
+
     function getRating($userid=null, $pagename=null, $dimension=null) {
         if (RATING_STORAGE == 'SQL') {
             $ratings_iter = $this->sql_get_rating($dimension, $userid, $pagename);
             if ($rating = $ratings_iter->next() and isset($rating['ratingvalue'])) {
                 return $rating['ratingvalue'];
-            } else 
+            } else
                 return false;
         } else {
             return $this->metadata_get_rating($userid, $pagename, $dimension);
@@ -133,20 +133,19 @@
 
     function getUsersRated($dimension=null, $orderby = null) {
         if (is_null($dimension)) $dimension = $this->dimension;
-        //if (is_null($userid))    $userid = $this->userid; 
+        //if (is_null($userid))    $userid = $this->userid;
         //if (is_null($pagename))  $pagename = $this->pagename;
         if (RATING_STORAGE == 'SQL') {
             $ratings_iter = $this->sql_get_users_rated($dimension, $orderby);
             if ($rating = $ratings_iter->next() and isset($rating['ratingvalue'])) {
                 return $rating['ratingvalue'];
-            } else 
+            } else
                 return false;
         } else {
             return $this->metadata_get_users_rated($dimension, $orderby);
         }
     }
-   
-    
+
     /**
      * Get ratings.
      *
@@ -184,7 +183,7 @@
      *               If this is null (or left off), the info returned
      *               is for the 'ratee' page (i.e., thing being rated).
      *
-     * @return DB iterator with results 
+     * @return DB iterator with results
      */
     function get_rating($dimension=null, $rater=null, $ratee=null,
                         $orderby = null, $pageinfo = "ratee") {
@@ -192,7 +191,7 @@
             $ratings_iter = $this->sql_get_rating($dimension, $rater, $pagename);
             if ($rating = $ratings_iter->next() and isset($rating['ratingvalue'])) {
                 return $rating['ratingvalue'];
-            } else 
+            } else
                 return false;
         } else {
             return $this->metadata_get_rating($rater, $pagename, $dimension);
@@ -205,12 +204,12 @@
     function get_users_rated($dimension=null, $pagename = null, $orderby = null) {
         if (RATING_STORAGE == 'SQL') {
             $ratings_iter = $this->sql_get_users_rated($dimension, $pagename, $orderby);
-	    // iter as userid
-	    $users = array();
-	    while ($rating = $ratings_iter->next()) {
-		$users[] = $rating['userid'];
-	    }
-	    return $users;
+        // iter as userid
+        $users = array();
+        while ($rating = $ratings_iter->next()) {
+        $users[] = $rating['userid'];
+        }
+        return $users;
         } else {
             return $this->metadata_get_users_rated($dimension, $pagename, $orderby);
         }
@@ -225,9 +224,9 @@
         if (RATING_STORAGE == 'SQL') {
             return $this->sql_get_rating($dimension, $rater, $ratee, $orderby, $pageinfo);
         } else {
-	    // empty dummy iterator
-	    $pages = array();
-	    return new WikiDB_Array_PageIterator($pages);
+        // empty dummy iterator
+        $pages = array();
+        return new WikiDB_Array_PageIterator($pages);
         }
     }
 
@@ -275,9 +274,9 @@
             $this->metadata_set_rating($userid, $pagename, $dimension, $rating);
         }
     }
-    
+
     //function getUsersRated(){}
-    
+
 //*******************************************************************************
     // TODO:
     // Use wikilens/RatingsUser.php for the php methods.
@@ -287,22 +286,22 @@
     //   http://www-users.cs.umn.edu/~karypis/suggest/
     // until we implement a simple recommendation engine.
     // Note that "suggest" is only free for non-profit organizations.
-    // I am currently writing a binary CGI mysuggest using suggest, which loads 
+    // I am currently writing a binary CGI mysuggest using suggest, which loads
     // data from mysql.
     function getPrediction($userid=null, $pagename=null, $dimension=null) {
         if (is_null($dimension)) $dimension = $this->dimension;
-        if (is_null($userid))    $userid   = $this->userid; 
+        if (is_null($userid))    $userid   = $this->userid;
         if (is_null($pagename))  $pagename = $this->pagename;
 
         if (RATING_STORAGE == 'SQL') {
             $dbh = &$this->_sqlbackend;
             if (isset($pagename))
                 $page = $dbh->_get_pageid($pagename);
-            else 
+            else
                 return 0;
             if (isset($userid))
                 $user = $dbh->_get_pageid($userid);
-            else 
+            else
                 return 0;
         }
         if (defined('RATING_EXTERNAL') and RATING_EXTERNAL) {
@@ -325,7 +324,7 @@
      */
     function php_prediction($userid=null, $pagename=null, $dimension=null) {
         if (is_null($dimension)) $dimension = $this->dimension;
-        if (is_null($userid))    $userid   = $this->userid; 
+        if (is_null($userid))    $userid   = $this->userid;
         if (is_null($pagename))  $pagename = $this->pagename;
         if (empty($this->buddies)) {
             require_once("lib/wikilens/RatingsUser.php");
@@ -335,7 +334,7 @@
         }
         return $user->knn_uu_predict($pagename, $this->buddies, $dimension);
     }
-    
+
     function getNumUsers($pagename=null, $dimension=null) {
         if (is_null($dimension)) $dimension = $this->dimension;
         if (is_null($pagename))  $pagename = $this->pagename;
@@ -349,7 +348,7 @@
             $data = $page->get('rating');
             if (!empty($data[$dimension]))
                 return count($data[$dimension]);
-            else 
+            else
                 return 0;
         }
     }
@@ -359,23 +358,23 @@
         if (is_null($pagename))  $pagename = $this->pagename;
         if (RATING_STORAGE == 'SQL') {
             $dbi = &$this->_sqlbackend;
-	    if (isset($pagename) || isset($dimension)) {
-		$where = "WHERE";
-	    }
+        if (isset($pagename) || isset($dimension)) {
+        $where = "WHERE";
+        }
             if (isset($pagename)) {
                 $raterid = $this->_sqlbackend->_get_pageid($pagename, true);
                 $where .= " raterpage=$raterid";
             }
             if (isset($dimension)) {
-		if (isset($pagename)) $where .= " AND";
+        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();
@@ -387,8 +386,8 @@
             if (!empty($data[$dimension]))
                 // hash of userid => rating
                 return array_sum(array_values($data[$dimension])) / count($data[$dimension]);
-	    else
-		return 0;
+        else
+        return 0;
         }
     }
 //*******************************************************************************
@@ -431,7 +430,7 @@
      *               If this is null (or left off), the info returned
      *               is for the 'ratee' page (i.e., thing being rated).
      *
-     * @return DB iterator with results 
+     * @return DB iterator with results
      */
     function sql_get_rating($dimension=null, $rater=null, $ratee=null,
                             $orderby=null, $pageinfo = "ratee") {
@@ -449,16 +448,16 @@
     // all users who rated this page resp if null all pages.. needed?
     function metadata_get_users_rated($dimension=null, $pagename=null, $orderby=null) {
         if (is_null($dimension)) $dimension = $this->dimension;
-	$users = array();
-	if (!$pagename) {
-	    // TODO: all pages?
-	    return new WikiDB_Array_PageIterator($users);
-	}
-	$page = $this->_dbi->getPage($pagename);
-	$data = $page->get('rating');
-	if (!empty($data[$dimension])) {
-	    //array($userid => (float)$rating);
-	    return new WikiDB_Array_PageIterator(array_keys($data[$dimension]));
+    $users = array();
+    if (!$pagename) {
+        // TODO: all pages?
+        return new WikiDB_Array_PageIterator($users);
+    }
+    $page = $this->_dbi->getPage($pagename);
+    $data = $page->get('rating');
+    if (!empty($data[$dimension])) {
+        //array($userid => (float)$rating);
+        return new WikiDB_Array_PageIterator(array_keys($data[$dimension]));
         }
         return new WikiDB_Array_PageIterator($users);
     }
@@ -487,19 +486,19 @@
         }
         if (isset($ratee)) {
             if(is_array($ratee)){
-        		$where .= " AND (";
-        		for($i = 0; $i < count($ratee); $i++){
-        			$rateeid = $dbi->_get_pageid($ratee[$i], true);
-            		$where .= "rateepage=$rateeid";
-        			if($i != (count($ratee) - 1)){
-        				$where .= " OR ";
-        			}
-        		}
-        		$where .= ")";
-        	} else {
-        		$rateeid = $dbi->_get_pageid($ratee, true);
-            	$where .= " AND rateepage=$rateeid";
-        	}
+                $where .= " AND (";
+                for($i = 0; $i < count($ratee); $i++){
+                    $rateeid = $dbi->_get_pageid($ratee[$i], true);
+                    $where .= "rateepage=$rateeid";
+                    if($i != (count($ratee) - 1)){
+                        $where .= " OR ";
+                    }
+                }
+                $where .= ")";
+            } else {
+                $rateeid = $dbi->_get_pageid($ratee, true);
+                $where .= " AND rateepage=$rateeid";
+            }
         }
         $orderbyStr = "";
         if (isset($orderby)) {
@@ -508,10 +507,10 @@
         if (isset($rater) or isset($ratee)) $what = '*';
         // same as _get_users_rated_result()
         else {
-	    $what = 'DISTINCT p.pagename';
-	    if ($pageinfo == 'rater')
-		$what = 'DISTINCT p.pagename as userid';
-	}
+        $what = 'DISTINCT p.pagename';
+        if ($pageinfo == 'rater')
+        $what = 'DISTINCT p.pagename as userid';
+    }
 
         $query = "SELECT $what"
                . " FROM $rating_tbl r, $page_tbl p "
@@ -582,24 +581,24 @@
         $insert = "INSERT INTO $rating_tbl (dimension, raterpage, rateepage, ratingvalue, rateeversion)"
             ." VALUES ('$dimension', $raterid, $rateeid, '$rating', '$rateeversion')";
         $dbi->_dbh->query($insert);
-        
+
         $dbi->unlock();
         return true;
     }
 
     function metadata_get_rating($userid, $pagename, $dimension) {
-    	if (!$pagename) return false;
+        if (!$pagename) return false;
         $page = $this->_dbi->getPage($pagename);
         $data = $page->get('rating');
         if (!empty($data[$dimension][$userid]))
             return (float)$data[$dimension][$userid];
-        else 
+        else
             return false;
     }
 
     function metadata_set_rating($userid, $pagename, $dimension, $rating = -1) {
-    	if (!$pagename) return false;
-    	$page = $this->_dbi->getPage($pagename);
+        if (!$pagename) return false;
+        $page = $this->_dbi->getPage($pagename);
         $data = $page->get('rating');
         if ($rating == -1)
             unset($data[$dimension][$userid]);
@@ -615,7 +614,7 @@
 }
 
 /*
-class RatingsDB_backend_PearDB 
+class RatingsDB_backend_PearDB
 extends WikiDB_backend_PearDB {
     function get_rating($dimension=null, $rater=null, $ratee=null,
                         $orderby=null, $pageinfo = "ratee") {
@@ -623,7 +622,7 @@
                          $dimension, $rater, $ratee, $orderby, $pageinfo);
         return new WikiDB_backend_PearDB_generic_iter($this, $result);
     }
-    
+
     function get_users_rated($dimension=null, $orderby=null) {
         $result = $this->_get_users_rated_result(
                          $dimension, $orderby);
@@ -655,20 +654,20 @@
             $where .= " AND raterpage=$raterid";
         }
         if (isset($ratee)) {
-        	if(is_array($ratee)){
-        		$where .= " AND (";
-        		for($i = 0; $i < count($ratee); $i++){
-        			$rateeid = $this->_get_pageid($ratee[$i], true);
-            		$where .= "rateepage=$rateeid";
-        			if($i != (count($ratee) - 1)){
-        				$where .= " OR ";
-        			}
-        		}
-        		$where .= ")";
-        	} else {
-        		$rateeid = $this->_get_pageid($ratee, true);
-            	$where .= " AND rateepage=$rateeid";
-        	}
+            if(is_array($ratee)){
+                $where .= " AND (";
+                for($i = 0; $i < count($ratee); $i++){
+                    $rateeid = $this->_get_pageid($ratee[$i], true);
+                    $where .= "rateepage=$rateeid";
+                    if($i != (count($ratee) - 1)){
+                        $where .= " OR ";
+                    }
+                }
+                $where .= ")";
+            } else {
+                $rateeid = $this->_get_pageid($ratee, true);
+                $where .= " AND rateepage=$rateeid";
+            }
         }
 
         $orderbyStr = "";
@@ -685,7 +684,7 @@
 
         return $result;
     }
-    
+
     function _get_users_rated_result($dimension=null, $orderby=null) {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
@@ -735,7 +734,7 @@
         $this->unlock();
         return true;
     }
-} 
+}
 */
 
 // Local Variables:

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/RatingsUser.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/RatingsUser.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/RatingsUser.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: RatingsUser.php 7659 2010-08-31 14:55:29Z vargenau $');
+// $Id: RatingsUser.php 8071 2011-05-18 14:56:14Z vargenau $
 /* Copyright (C) 2004 Dan Frankowski
  * Copyright (C) 2010 Roger Guignard, Alcatel-Lucent
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -77,13 +77,13 @@
         return $this->_rdbi;
     }
 
-    // XXX: may want to think about caching ratings in the PHP session 
+    // XXX: may want to think about caching ratings in the PHP session
     // since a WikiUser is created for *every* access, in which case rate.php
     // will want to change to use this object instead of direct db access
 
     /**
      * Check whether $user is allowed to view this user's ratings
-     * 
+     *
      * @return bool True if $user can view this user's ratings, false otherwise
      */
     function allow_view_ratings($user)
@@ -93,7 +93,7 @@
 
     /**
      * Gets this user's ratings
-     * 
+     *
      * @return array Assoc. array [page_name][dimension] = _UserRating object
      */
     function get_ratings()
@@ -104,13 +104,13 @@
 
     /**
     * Gets this user's mean rating across a dimension
-    * 
+    *
     * @return float Mean rating
     */
     function mean_rating($dimension = 0)
     {
         // use memoized result if available
-        if (isset($this->_mean_ratings[$dimension])) 
+        if (isset($this->_mean_ratings[$dimension]))
         {
             return $this->_mean_ratings[$dimension];
         }
@@ -147,8 +147,6 @@
         $this->_load_ratings();
         if (isset($dimension))
         {
-            
-
             if (isset($this->_ratings[$pagename][$dimension]))
             {
                 return true;
@@ -231,7 +229,7 @@
         {
             return $this->_pearson_sims[$user->getId()][$dimension];
         }
-    
+
         $ratings1 = $this->get_ratings();
         $mean1    = $this->mean_rating($dimension);
         // XXX: sanify user input?
@@ -278,7 +276,7 @@
         // items that the similarity was based on
 
         // prevent division-by-zero
-        if (sqrt($sum11) == 0 || sqrt($sum12) == 0) 
+        if (sqrt($sum11) == 0 || sqrt($sum12) == 0)
             $sim = array(0, $n);
         else
         // Pearson similarity
@@ -368,9 +366,9 @@
                 }
                 $this->_num_ratings++;
                 $this->_ratings[$rating['pagename']][$rating['dimension']]
-                  = new _UserRating($this->_userid, 
+                  = new _UserRating($this->_userid,
                                     $rating['pagename'],
-                                    $rating['dimension'], 
+                                    $rating['dimension'],
                                     $rating['ratingvalue']);
             }
 
@@ -382,7 +380,7 @@
 /** Represent a rating. */
 class _UserRating
 {
-    function _UserRating ($rater, $ratee, $dimension, $rating) 
+    function _UserRating ($rater, $ratee, $dimension, $rating)
     {
         $this->rater     = (string)$rater;
         $this->ratee     = (string)$ratee;
@@ -390,42 +388,42 @@
         $this->rating    = (float)$rating;
     }
 
-    function get_rater() 
+    function get_rater()
     {
         return $this->rater;
     }
 
-    function get_ratee() 
+    function get_ratee()
     {
         return $this->ratee;
     }
 
-    function get_rating() 
+    function get_rating()
     {
         return $this->rating;
     }
 
-    function get_dimension() 
+    function get_dimension()
     {
         return $this->dimension;
     }
 
-    function set_rater() 
+    function set_rater()
     {
         $this->rater = (string)$rater;
     }
 
-    function set_ratee() 
+    function set_ratee()
     {
         $this->ratee = (string)$ratee;
     }
 
-    function set_rating() 
+    function set_rating()
     {
         $this->rating = (float)$rating;
     }
 
-    function set_dimension() 
+    function set_dimension()
     {
         $this->dimension = (int)$dimension;
     }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/Utils.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/Utils.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/wikilens/Utils.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: Utils.php 7641 2010-08-11 13:00:46Z vargenau $');
+// $Id: Utils.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2004 Mike Cassano
  *
@@ -16,13 +16,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/**
- */
-
 function addPageTextData($user, $dbi, $new_data, $START_DELIM, $DELIM) {
     // This is largely lifted from the TranslateText plugin, which performs a
     // similar set of functions (retrieves a user's homepage, modifies it
@@ -64,15 +61,15 @@
     if (is_object($fromUser))
         $fromUser = $fromUser->getId();
     if ($fromUser == "")
-    	return "";
+        return "";
     $userPage = $dbi->getPage($fromUser);
     $transformed = $userPage->getCurrentRevision();
     $pageArray = $transformed->getContent();
     $p = -1;
     for ($i = 0; $i < count($pageArray); $i++){
-    	if($pageArray[$i] != ""){
+        if($pageArray[$i] != ""){
             if(!((strpos($pageArray[$i], $START_DELIM)) === FALSE)){
-            	$p = $i;
+                $p = $i;
                 break;
             }
         }

Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/ziplib.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/ziplib.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/ziplib.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: ziplib.php 7541 2010-06-17 11:34:55Z vargenau $');
+<?php // $Id: ziplib.php 7964 2011-03-05 17:05:30Z vargenau $
 
 /**
  * GZIP stuff.
@@ -12,14 +12,14 @@
  */
 function gzip_cleanup () {
     global $gzip_tmpfile;
-    
+
     if ($gzip_tmpfile)
         @unlink($gzip_tmpfile);
 }
 
 function gzip_tempnam () {
     global $gzip_tmpfile;
-    
+
     if (!$gzip_tmpfile) {
         //FIXME: does this work on non-unix machines?
         if (is_writable("/tmp"))
@@ -59,7 +59,7 @@
     fwrite($fp, $data, strlen($data));
     if (!fclose($fp))
         trigger_error(sprintf("%s failed", 'fclose'), E_USER_ERROR);
-    
+
     if (!($fp = gzopen($filename, "rb")))
         trigger_error(sprintf("%s failed", 'gzopen'), E_USER_ERROR);
     $unz = '';
@@ -67,7 +67,7 @@
         $unz .= $buf;
     if (!gzclose($fp))
         trigger_error(sprintf("%s failed", 'gzclose'), E_USER_ERROR);
-    
+
     unlink($filename);
     return $unz;
 }
@@ -79,7 +79,7 @@
 function zip_crc32 ($str, $crc = 0)
 {
     static $zip_crc_table;
-    
+
     if (empty($zip_crc_table)) {
         /* NOTE: The range of PHP ints seems to be -0x80000000 to 0x7fffffff.
          * So, had to munge these constants.
@@ -138,7 +138,7 @@
                      0x5d681b02,  0x2a6f2b94, -0x4bf441c9, -0x3cf3715f,  0x5a05df1b,
                      0x2d02ef8d);
     }
-    
+
     $crc = ~$crc;
     for ($i = 0; $i < strlen($str); $i++) {
         $crc = ( $zip_crc_table[($crc ^ ord($str[$i])) & 0xff]
@@ -157,11 +157,11 @@
         $z = gzencode($content);
     else
         $z = gzip_compress($content);
-    
+
     // Suck OS type byte from gzip header. FIXME: this smells bad.
-    
+
     extract(unpack("a2magic/Ccomp_type/Cflags/@9/Cos_type", $z));
-    
+
     if ($magic != GZIP_MAGIC)
         trigger_error(sprintf("Bad %s", "gzip magic"), E_USER_ERROR);
     if ($comp_type != GZIP_DEFLATE)
@@ -169,17 +169,17 @@
     if (($flags & 0x3e) != 0)
         trigger_error(sprintf("Bad %s", sprintf("flags (0x%02x)", $flags)),
                       E_USER_ERROR);
-    
+
     $gz_header_len = 10;
     $gz_data_len = strlen($z) - $gz_header_len - 8;
     if ($gz_data_len < 0)
         trigger_error("not enough gzip output?", E_USER_ERROR);
-    
+
     extract(unpack("Vcrc32", substr($z, $gz_header_len + $gz_data_len)));
-    
+
     return array(substr($z, $gz_header_len, $gz_data_len), // gzipped data
-                 $crc32,		// crc
-                 $os_type		// OS type
+                 $crc32,        // crc
+                 $os_type        // OS type
                  );
 }
 
@@ -200,15 +200,15 @@
             trigger_error("CRC32 mismatch: calculated=$zcrc32, expected=$crc32", E_USER_ERROR);
         return $data;
     }
-    
+
     if (!function_exists('gzopen')) {
         global $request;
         $request->finish(_("Can't inflate data: zlib support not enabled in this PHP"));
     }
-    
+
     // Reconstruct gzip header and ungzip the data.
-    $mtime = time();		//(Bogus mtime)
-    
+    $mtime = time();        //(Bogus mtime)
+
     return gzip_uncompress( pack("a2CxV at 10", GZIP_MAGIC, GZIP_DEFLATE, $mtime)
                             . $data
                             . pack("VV", $crc32, $uncomp_size) );
@@ -216,17 +216,17 @@
 
 function unixtime2dostime ($unix_time) {
     if ($unix_time % 1)
-        $unix_time++;		// Round up to even seconds.
+        $unix_time++;        // Round up to even seconds.
 
     list ($year,$month,$mday,$hour,$min,$sec)
         = explode(" ", date("Y n j G i s", $unix_time));
-    
+
     if ($year < 1980)
         list ($year,$month,$mday,$hour,$min,$sec) = array(1980, 1, 1, 0, 0, 0);
-    
+
     $dosdate = (($year - 1980) << 9) | ($month << 5) | $mday;
     $dostime = ($hour << 11) | ($min << 5) | ($sec >> 1);
-    
+
     return array($dosdate, $dostime);
 }
 
@@ -234,11 +234,11 @@
     $mday  = $dosdate & 0x1f;
     $month = ($dosdate >> 5) & 0x0f;
     $year  = 1980 + (($dosdate >> 9) & 0x7f);
-    
+
     $sec  = ($dostime & 0x1f) * 2;
     $min  = ($dostime >> 5) & 0x3f;
     $hour = ($dostime >> 11) & 0x1f;
-    
+
     return mktime($hour, $min, $sec, $month, $mday, $year);
 }
 
@@ -257,33 +257,33 @@
     function ZipWriter ($comment = "", $zipname = "archive.zip") {
         $this->comment = $comment;
         $this->nfiles = 0;
-        $this->dir = "";		// "Central directory block"
-        $this->offset = 0;		// Current file position.
-        
+        $this->dir = "";        // "Central directory block"
+        $this->offset = 0;        // Current file position.
+
         $zipname = addslashes($zipname);
         header("Content-Type: application/zip; name=\"$zipname\"");
         header("Content-Disposition: attachment; filename=\"$zipname\"");
     }
-    
+
     function addSrcFile ($target, $src, $attrib = false) {
-	if (empty($attrib['mtime']))
-	    $attrib = array('mtime' => filemtime($src), 'is_ascii' => 0);
-	$this->addRegularFile($target, file_get_contents($src), $attrib);
+    if (empty($attrib['mtime']))
+        $attrib = array('mtime' => filemtime($src), 'is_ascii' => 0);
+    $this->addRegularFile($target, file_get_contents($src), $attrib);
     }
-    
+
   function addRegularFile ($filename, $content, $attrib = false) {
       if (!$attrib)
           $attrib = array();
-      
+
       $size = strlen($content);
       if (function_exists('gzopen')) {
           list ($data, $crc32, $os_type) = zip_deflate($content);
           if (strlen($data) < $size) {
-              $content = $data;	// Use compressed data.
+              $content = $data;    // Use compressed data.
               $comp_type = ZIP_DEFLATE;
           }
           else
-              unset($crc32);	// force plain store.
+              unset($crc32);    // force plain store.
       }
       else  {
           // Punt:
@@ -295,29 +295,29 @@
           $comp_type = ZIP_STORE;
           $crc32 = zip_crc32($content);
       }
-      
+
       if (!empty($attrib['write_protected']))
           $atx = (0100444 << 16) | 1; // S_IFREG + read permissions to
                                       // everybody.
       else
           $atx = (0100644 << 16); // Add owner write perms.
-      
+
       $ati = $attrib['is_ascii'] ? 1 : 0;
-      
+
       if (empty($attrib['mtime']))
           $attrib['mtime'] = time();
       list ($mod_date, $mod_time) = unixtime2dostime($attrib['mtime']);
-      
+
       // Construct parts common to "Local file header" and "Central
       // directory file header."
       if (!isset($attrib['extra_field']))
           $attrib['extra_field'] = '';
       if (!isset($attrib['file_comment']))
           $attrib['file_comment'] = '';
-      
+
       $head = pack("vvvvvVVVvv",
-                   20,	// Version needed to extract (FIXME: is this right?)
-                   0,	// Gen purp bit flag
+                   20,    // Version needed to extract (FIXME: is this right?)
+                   0,    // Gen purp bit flag
                    $comp_type,
                    $mod_time,
                    $mod_date,
@@ -326,47 +326,47 @@
                    $size,
                    strlen($filename),
                    strlen($attrib['extra_field']));
-      
+
       // Construct the "Local file header"
       $lheader = ZIP_LOCHEAD_MAGIC . $head . $filename
           . $attrib['extra_field'];
-      
+
       // Construct the "central directory file header"
       $this->dir .= pack("a4CC",
                          ZIP_CENTHEAD_MAGIC,
-                         23,	// Version made by (FIXME: is this right?)
+                         23,    // Version made by (FIXME: is this right?)
                          $os_type);
       $this->dir .= $head;
       $this->dir .= pack("vvvVV",
                          strlen($attrib['file_comment']),
                          0,              // Disk number start
-                         $ati,	         // Internal file attributes
-                         $atx,	         // External file attributes
+                         $ati,             // Internal file attributes
+                         $atx,             // External file attributes
                          $this->offset); // Relative offset of local header
       $this->dir .= $filename . $attrib['extra_field']
           . $attrib['file_comment'];
-      
+
       // Output the "Local file header" and file contents.
       echo $lheader;
       echo $content;
-      
+
       $this->offset += strlen($lheader) + strlen($content);
       $this->nfiles++;
   }
-  
+
   function finish () {
       // Output the central directory
       echo $this->dir;
-      
+
       // Construct the "End of central directory record"
       echo ZIP_ENDDIR_MAGIC;
       echo pack("vvvvVVv",
                 0,                  // Number of this disk.
                 0,                  // Number of disk with start of c dir
                 $this->nfiles,      // Number entries on this disk
-                $this->nfiles,	    // Number entries
+                $this->nfiles,        // Number entries
                 strlen($this->dir), // Size of central directory
-                $this->offset,	    // Offset of central directory
+                $this->offset,        // Offset of central directory
                 strlen($this->comment));
       echo $this->comment;
   }
@@ -396,12 +396,12 @@
             $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;
+        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"))) {
@@ -410,44 +410,44 @@
             }
         }
     }
-    
+
     function _read ($nbytes) {
-	if ($this->fp) {
+    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;
-	}
+    } 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 () {
-	if ($this->fp)
+    if ($this->fp)
             fclose($this->fp);
-	else
-	    $this->buf = '';
+    else
+        $this->buf = '';
         return false;
     }
-    
+
   function readFile () {
       $head = $this->_read(30); // FIXME: This is bad for gzip compressed buffers
-      
+
       extract(unpack("a4magic/vreq_version/vflags/vcomp_type"
                      . "/vmod_time/vmod_date"
                      . "/Vcrc32/Vcomp_size/Vuncomp_size"
                      . "/vfilename_len/vextrafld_len",
                      $head));
-      
+
       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) 
+              //and (substr($magic,3,1) & 0x3e) == 0)
           {
               if ($this->fp) {
                   fclose($this->fp);
@@ -470,15 +470,15 @@
       if (($flags & 0x08) != 0)
           // FIXME: better message?
           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);
-      
+
       $data = $this->_read($comp_size);
-      
+
       if ($comp_type == ZIP_DEFLATE) {
           $data = zip_inflate($data, $crc32, $uncomp_size);
       }
@@ -490,11 +490,11 @@
       else
           ExitWiki(sprintf("Compression method %s unsupported",
                            $comp_method));
-      
+
       if (strlen($data) != $uncomp_size)
           ExitWiki(sprintf("Uncompressed size mismatch %d != %d",
                            strlen($data), $uncomp_size));
-      
+
       return array($filename, $data, $attrib);
   }
 }
@@ -549,18 +549,18 @@
     return "$header\r\n";
 }
 
-function MimeMultipart ($parts) 
+function MimeMultipart ($parts)
 {
     global $mime_multipart_count;
-    
+
     // The string "=_" can not occur in quoted-printable encoded data.
     $boundary = "=_multipart_boundary_" . ++$mime_multipart_count;
-    
+
     $head = MimeContentTypeHeader('multipart', 'mixed',
                                   array('boundary' => $boundary));
-    
+
     $sep = "\r\n--$boundary\r\n";
-    
+
     return $head . $sep . implode($sep, $parts) . "\r\n--${boundary}--\r\n";
 }
 
@@ -588,14 +588,14 @@
 function MimeifyPageRevision (&$page, &$revision) {
     // $wikidb =& $revision->_wikidb;
     // $page = $wikidb->getPage($revision->getName());
-    // FIXME: add 'hits' to $params 
+    // FIXME: add 'hits' to $params
     $params = array('pagename'     => $page->getName(),
                     'flags'        => "",
                     'author'       => $revision->get('author'),
                     'owner'        => $page->getOwner(),
                     'version'      => $revision->getVersion(),
                     'lastmodified' => $revision->get('mtime'));
-    
+
     if ($page->get('mtime'))
         $params['created'] = $page->get('mtime');
     if ($page->get('locked'))
@@ -615,7 +615,7 @@
     if ($page->get('perm') and class_exists('PagePermission')) {
         $acl = getPagePermissions($page);
         $params['acl'] = $acl->asAclLines();
-        //TODO: convert to multiple lines? acl-view => groups,...; acl-edit => groups,... 
+        //TODO: convert to multiple lines? acl-view => groups,...; acl-edit => groups,...
     }
 
     $params['charset'] = $GLOBALS['charset'];
@@ -624,17 +624,17 @@
     // special handling) --- so we urlencode all parameter values.
     foreach ($params as $key => $val)
         $params[$key] = rawurlencode($val);
-    if (isset($params['acl'])) 
+    if (isset($params['acl']))
         // default: "view:_EVERY; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; ".
         //          "list:_EVERY; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY; "
         $params['acl'] = str_replace(array("%3A","%3B%20","%2C"),array(":","; ",","),$params['acl']);
-    
+
     $out = MimeContentTypeHeader('application', 'x-phpwiki', $params);
     $out .= sprintf("Content-Transfer-Encoding: %s\r\n",
                     STRICT_MAILABLE_PAGEDUMPS ? 'quoted-printable' : 'binary');
 
     $out .= "\r\n";
-    
+
     foreach ($revision->getContent() as $line) {
         // This is a dirty hack to allow saving binary text files. See above.
         $line = rtrim($line);
@@ -654,7 +654,7 @@
         $headers['from '] = preg_replace('/^\s+|\s+$/', '', $match[1]);
         $string = substr($string, strlen($match[0]));
     }
-    
+
     while (preg_match('/^([!-9;-~]+) [ \t]* : [ \t]* '
                       . '( .* \r?\n (?: [ \t] .* \r?\n)* )/x',
                       $string, $match))
@@ -663,7 +663,7 @@
             = preg_replace('/^\s+|\s+$/', '', $match[2]);
         $string = substr($string, strlen($match[0]));
     }
-    
+
     if (empty($headers))
         return false;
 
@@ -674,7 +674,7 @@
         }
         $string = substr($string, strlen($match[0]));
     }
-    
+
     return $headers;
 }
 
@@ -682,18 +682,18 @@
 function ParseMimeContentType ($string)
 {
     // FIXME: Remove (RFC822 style comments).
-    
+
     // Get type/subtype
     if (!preg_match(':^\s*(' . MIME_TOKEN_REGEXP . ')\s*'
                     . '/'
                     . '\s*(' . MIME_TOKEN_REGEXP . ')\s*:x',
                     $string, $match))
         ExitWiki(sprintf("Bad %s",'MIME content-type'));
-    
+
     $type    = strtolower($match[1]);
     $subtype = strtolower($match[2]);
     $string  = substr($string, strlen($match[0]));
-    
+
     $param = array();
     while (preg_match('/^;\s*(' . MIME_TOKEN_REGEXP . ')\s*=\s*'
                       . '(?:(' . MIME_TOKEN_REGEXP . ')|"((?:[^"\\\\]|\\.)*)") \s*/sx',
@@ -703,12 +703,12 @@
             $val = $match[2];
         else
             $val = preg_replace('/[\\\\](.)/s', '\\1', $match[3]);
-        
+
         $param[strtolower($match[1])] = $val;
-        
+
         $string = substr($string, strlen($match[0]));
     }
-    
+
     return array($type, $subtype, $param);
 }
 
@@ -716,9 +716,9 @@
 {
     if (!$boundary)
         ExitWiki("No boundary?");
-    
+
     $boundary = preg_quote($boundary);
-    
+
     while (preg_match("/^(|.*?\n)--$boundary((?:--)?)[^\n]*\n/s",
                       $data, $match))
     {
@@ -730,9 +730,9 @@
                 for (reset($content); $p = current($content); next($content))
                     $parts[] = $p;
         }
-            
+
         if ($match[2])
-            return $parts;	// End boundary found.
+            return $parts;    // End boundary found.
     }
     ExitWiki("No end boundary?");
 }
@@ -746,7 +746,7 @@
                 $footnotes[$m[1]] = sprintf(_("[%d] See [%s]"),
                                             $m[1], rawurldecode($reference));
     }
-    
+
     if (sizeof($footnotes) > 0) {
         ksort($footnotes);
         return "-----\n"
@@ -793,7 +793,7 @@
         return false;
     }
     $typeheader = $headers['content-type'];
-    
+
     if (!(list ($type, $subtype, $params) = ParseMimeContentType($typeheader))) {
         trigger_error( sprintf("Can't parse %s: (%s)",
                                'content-type', $typeheader),
@@ -808,13 +808,13 @@
                        E_USER_WARNING );
         return false;
     }
-    
+
     // FIXME: more sanity checking?
     $page        = array();
     $pagedata    = array();
     $versiondata = array();
     if (isset($headers['date']))
-	$pagedata['date'] = strtotime($headers['date']);
+    $pagedata['date'] = strtotime($headers['date']);
 
     //DONE: support owner and acl
     foreach ($params as $key => $value) {
@@ -855,7 +855,7 @@
             break;
         }
     }
-    
+
     // FIXME: do we need to try harder to find a pagename if we
     //        haven't got one yet?
     if (!isset($versiondata['author'])) {
@@ -865,7 +865,7 @@
             $versiondata['author'] = $user->getId(); //FIXME:?
         }
     }
-    
+
     $encoding = strtolower($headers['content-transfer-encoding']);
     if ($encoding == 'quoted-printable')
         $data = QuotedPrintableDecode($data);
@@ -877,19 +877,19 @@
 
     // compare to target charset
     if (strtolower($params['charset']) != strtolower($GLOBALS['charset'])) {
-    	$data = charset_convert($params['charset'], $GLOBALS['charset'], $data);
-    	//$page['pagename'] = charset_convert($params['charset'], $GLOBALS['charset'], $page['pagename']);
-	if (isset($versiondata['summary']))
-	    $versiondata['summary'] = charset_convert($params['charset'], $GLOBALS['charset'], $versiondata['summary']);
+        $data = charset_convert($params['charset'], $GLOBALS['charset'], $data);
+        //$page['pagename'] = charset_convert($params['charset'], $GLOBALS['charset'], $page['pagename']);
+    if (isset($versiondata['summary']))
+        $versiondata['summary'] = charset_convert($params['charset'], $GLOBALS['charset'], $versiondata['summary']);
 
     }
-    
+
     $data .= GenerateFootnotesFromRefs($params);
-    
+
     $page['content'] = preg_replace('/[ \t\r]*\n/', "\n", chop($data));
     $page['pagedata'] = $pagedata;
     $page['versiondata'] = $versiondata;
-    
+
     return array($page);
 }
 
@@ -899,5 +899,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/Makefile
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/Makefile	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/Makefile	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-# $Id: Makefile 7683 2010-09-10 12:07:14Z vargenau $
+# $Id: Makefile 8027 2011-04-08 13:03:38Z vargenau $
 #
 # locale/Makefile
 #
@@ -17,8 +17,8 @@
 
 ${POT_FILE} : # dependencies are auto-generated by 'make depend' , see below
 	cp -f $@ $@~
-	xgettext -L PHP --from-code=iso-8859-1 -k_ -k__printf -k__sprintf -k__vsprintf -kfmt -o $@.extracted $^
-	sed -e's,; charset=CHARSET,; charset=iso-8859-1,' $@.extracted
+	xgettext -L PHP --from-code=utf-8 -k_ -k__printf -k__sprintf -k__vsprintf -kfmt -o $@.extracted $^
+	sed -e's,; charset=CHARSET,; charset=utf-8,' $@.extracted
 	msgmerge -o $@ $@~ $@.extracted && rm -f $@.extracted 
 
 # merge in place to keep unchanged timestamps
@@ -37,7 +37,7 @@
 	msgunfmt $< | awk -f make-php-trans.awk > $@
 
 clean :
-	rm -f ${MO_FILES} ${PHP_FILES}
+	rm -f ./*/LC_MESSAGES/phpwiki.mo ./*/LC_MESSAGES/phpwiki.php
 
 depend :
 	$(SHELL) update-makefile.sh
@@ -431,8 +431,8 @@
 ${POT_FILE}: ../themes/fusionforge/templates/html.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/login.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/navbar.tmpl
-${POT_FILE}: ../themes/fusionforge/templates/pagelink.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/ratings.tmpl
+${POT_FILE}: ../themes/fusionforge/templates/savepage.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/userprefs.tmpl
 ${POT_FILE}: ../themes/fusionforge/themeinfo.php
 ${POT_FILE}: ../themes/Hawaiian/lib/random.php
@@ -477,7 +477,6 @@
 ${POT_FILE}: ../themes/Sidebar/hyperwiki.php
 ${POT_FILE}: ../themes/Sidebar/templates/actionbar.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/body.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/browse.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/calendar.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/content.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/debug.tmpl

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/LC_MESSAGES/phpwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,2405 +1,1323 @@
 <?php
 
-$locale["  %d%% (%d/%d)"] =
-   "  %d%% (%d/%d)";
-$locale[" (to pages linked from \"%s\")"] =
-   "(auf Seiten verlinkt von \"%s\")";
-$locale[" ... around %s"] =
-   "... cirka %s";
-$locale[" ... first %d bytes"] =
-   " ... erste %d Bytes";
-$locale[" ... first %d lines"] =
-   " ... erste %d Zeilen";
-$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] =
-   "Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d Tage aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als %d einzelne Autoren Revisionen.";
-$locale[" Keep the latest contributions of the last %d authors up to %d days."] =
-   "Aufbewahrung der neueren Beiträge der letzten %d Autoren für %d Tage.";
-$locale[" Keep up to %d minor edits, but keep them no longer than %d days."] =
-   "Aufbewahrung kleinerer Änderungen für %d, aber nicht länger als %d Tage.";
-$locale[" Sorry, cannot merge."] =
-   " Konnte leider nicht automatisch einpflegen.";
-$locale[" replace "] =
-   " ersetze mit ";
-$locale[" skipped"] =
-   " ausgelassen";
-$locale["%4d  %s\n"] =
-   "%4d  %s\n";
-$locale["%d UserPreferences fields successfully updated."] =
-   "%d BenutzerEinstellungen erfolgreich auf neuesten Stand gebracht.";
-$locale["%d best incoming links: "] =
-   "Die %d besten hereinkommenden Links: ";
-$locale["%d best outgoing links: "] =
-   "Die %d besten hinausgehenden Links: ";
-$locale["%d homepages"] =
-   "%d Homepages";
-$locale["%d minutes"] =
-   "%d Minuten";
-$locale["%d most popular nearby: "] =
-   "Die %d meistbesuchten Seiten in der Nähe: ";
-$locale["%d not-empty pages"] =
-   "%d nicht leere Seiten";
-$locale["%d online users"] =
-   "%d Benutzer Online";
-$locale["%d page(s) with more than %d hits (>%d%%)."] =
-   "%d Seite(n) die mehr als %d aufgerufen haben (>%d%%).";
-$locale["%d pages"] =
-   "%d Seiten";
-$locale["%d pages with less than %d hits (<%d%%)."] =
-   "%d Seiten die weniger als %d aufgerufen haben (<%d%%).";
-$locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] =
-   "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht zugelassen.";
-$locale["%s Kb (%s bytes)"] =
-   "%s KB (%s Bytes)";
-$locale["%s already exists"] =
-   "%s existiert bereits";
-$locale["%s at %s"] =
-   "%s um %s";
-$locale["%s b"] =
-   "%s B";
-$locale["%s by %s"] =
-   "%s von %s";
-$locale["%s bytes"] =
-   "%s Bytes";
-$locale["%s bytes written"] =
-   "%s Bytes geschrieben";
-$locale["%s days"] =
-   "%s Tagen";
-$locale["%s does not appear to be a WikiPlugin."] =
-   "%s scheint kein Zusatzprogramm zu sein.";
-$locale["%s does not exist"] =
-   "%s existiert nicht";
-$locale["%s does not know about the language '%s', using 'en' instead."] =
-   "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet.";
-$locale["%s has no subpages defined."] =
-   "%s hat keine zugewiesenen Unterseiten.";
-$locale["%s is disallowed on this wiki."] =
-   "»%s« ist auf diesem Wiki nicht zugelassen.";
-$locale["%s is empty"] =
-   "%s ist leer";
-$locale["%s is empty."] =
-   "%s ist leer.";
-$locale["%s is listed at %s with %s"] =
-   "%s ist gelistet auf %s mit %s";
-$locale["%s is missing"] =
-   "%s Argument fehlt";
-$locale["%s is not locked!"] =
-   "%s ist nicht gesperrt!";
-$locale["%s is not writable."] =
-   "%s is nicht änderbar.";
-$locale["%s is only allowed in locked pages."] =
-   "%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"] =
-   "%s von dieser Seite";
-$locale["%s on %s:"] =
-   "%s um %s:";
-$locale["%s or %s parameter missing"] =
-   "%s oder %s Argument fehlt";
-$locale["%s pages have been changed."] =
-   "%s Seiten wurden geändert.";
-$locale["%s pages link to %s:"] =
-   "%s Seiten sind mit %s verlinkt:";
-$locale["%s pages would link to %s:"] =
-   "%s Seiten würden mit %s verlinkt sein:";
-$locale["%s parameter missing"] =
-   "%s Argument fehlt";
-$locale["%s words"] =
-   "%s Wörter";
-$locale["%s(%d): no such revision"] =
-   "%s(%d): keine solche Version";
-$locale["%s: %s"] =
-   "%s: %s";
-$locale["%s: Bad action"] =
-   "%s: Ungültige Aktion";
-$locale["%s: Can't open dba database"] =
-   "%s: Konnte DBA Datenbank nicht öffnen";
-$locale["%s: Date of new revision is %s"] =
-   "%s: Datum dieser aktuellen Neubearbeitung ist %s";
-$locale["%s: argument index out of range"] =
-   "%s: Ungültiger Index in Array";
-$locale["%s: error while handling error:"] =
-   "%s: Fehler während der Fehlerbehandlung von:";
-$locale["%s: file not found"] =
-   "»%s«: Datei nicht gefunden";
-$locale["%s: no such class"] =
-   "Unbekannte Klasse: »%s«";
-$locale["%s: not a subclass of WikiPlugin."] =
-   "%s scheint kein WikiPlugin zu sein.";
-$locale["%s: not defined"] =
-   "%s: nicht definiert";
-$locale["&version=-1 might help."] =
-   "&version=-1 wird empfohlen.";
-$locale["'%s' is no ModeratedPage anymore."] =
-   "'%s' ist keine ModeratierteSeite mehr.";
-$locale["'%s': Bad page name"] =
-   "»%s«: Ungültiger Seitenname";
-$locale["'%s': Bad page name: %s"] =
-   "»%s«: Ungültiger Seitenname: %s";
-$locale["'%s': corrupt file"] =
-   "»%s«: Datei korrumpiert";
-$locale["'s %d page ratings:"] =
-   "s %d Seiten Bewertungen:";
-$locale["(%d Links)"] =
-   "(%d Verweise)";
-$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] =
-   "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)";
-$locale["(Currently not working)"] =
-   "(Funktioniert momentan nicht)";
-$locale["(Redirected from %s)"] =
-   "(Weitergeleitet von %s)";
-$locale["(Your preferences are stored as hidden data within this page)."] =
-   "(Ihre Einstellungen sind als versteckte Daten in dieser Seite hintergelegt).";
-$locale["(diff)"] =
-   "(diff)";
-$locale["(disable individual page permissions, enable inheritance)?"] =
-   "(deaktiviere individuelle Zugriffsrechte, aktiviere Vererbung)";
-$locale["(formatted for PhpWiki developers as pgsrc template, not for backing up)"] =
-   "(formatiert für die PhpWiki Entwickler als pgsrc Vorlage, nicht zum Backup)";
-$locale["(formatted for backing up: all revisions)"] =
-   "(formatiert zum Backup: Alle Versionen)";
-$locale["(max. recursion level: %d)"] =
-   "(max. Rekursionstiefe: %d)";
-$locale["(normal formatting: latest revision only)"] =
-   "(Normales Format: Nur aktuelle Version)";
-$locale[", Memory: %s"] =
-   ", RAM: %s";
-$locale["- saved to database as version %d"] =
-   "- in der Datenbank gespeichert als Version %d.";
-$locale["- version %d saved to database as version %d"] =
-   "- version %d in der Datenbank gespeichert als Version %d.";
-$locale["... (first %s words)"] =
-   "... (erste %s Wörter)";
-$locale["... copied to %s"] =
-   "... kopiert nach %s";
-$locale["... not copied to %s"] =
-   "... nicht kopiert nach %s";
-$locale["... not found"] =
-   "... nicht gefunden";
-$locale["1 day"] =
-   "1 Tag";
-$locale["1 word"] =
-   "1 Wort";
-$locale["<%s: no such section>"] =
-   "<%s: unbekannte Sektion>";
-$locale["<empty>"] =
-   "<leer>";
-$locale["<no matches>"] =
-   "<nichts gefunden>";
-$locale["<none>"] =
-   "<Keine>";
-$locale["<not displayed>"] =
-   "<nicht angezeigt>";
-$locale["<system language>"] =
-   "<Sprache des Servers>";
-$locale["<system theme>"] =
-   "<Darstellung des Systems>";
-$locale["<unknown>"] =
-   "<unbekannt>";
-$locale["A plugin to provide for raw HTML within wiki pages."] =
-   "Einer Zusatzprogramm der reine HTML-Befehle im Wiki-Seiten abrufbar stellt.";
-$locale["A required argument '%s' is missing."] =
-   "Erforderliches Argument »%s« fehlt.";
-$locale["ACCESS DENIED: You must log in to upload files."] =
-   "ZUGRIFF VERWEIGERT: Bitte melden Sie sich erst an, um Dateien hochzuladen.";
-$locale["ACL"] =
-   "ACL";
-$locale["ACL not changed for page '%s'."] =
-   "ACL für Seite '%s' nicht geändert.";
-$locale["ADDING"] =
-   "HINZU";
-$locale["ADMIN"] =
-   "ADMIN";
-$locale["ANON"] =
-   "ANON";
-$locale["About"] =
-   "Über";
-$locale["Access"] =
-   "Zugriff";
-$locale["Access denied to change page '%s'."] =
-   "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."] =
-   "Addieren Sie %s Stunden zur lokalen Serverzeit, bei jeder Zeitanzeige (z.B. NeuesteÄnderungen).";
-$locale["Add %s:"] =
-   "%s Hinzufügen:";
-$locale["Add Comment"] =
-   "Neuer Kommentar";
-$locale["Add Message"] =
-   "Neue Nachricht";
-$locale["Add this ACL"] =
-   "Füge diese ACL hinzu";
-$locale["AddCategory"] =
-   "NeueKategorie";
-$locale["AddComment"] =
-   "NeuerKommentar";
-$locale["AddCommentPlugin"] =
-   "NeuerKommentarPlugin";
-$locale["AddPageLink"] =
-   "SeitenLink einfügen";
-$locale["AddPlugin"] =
-   "Plugin einfügen";
-$locale["AddTemplate"] =
-   "NeueVorlage";
-$locale["AddingPages"] =
-   "SeitenErzeugen";
-$locale["Adjust"] =
-   "Justieren";
-$locale["Admin"] =
-   "Admin";
-$locale["Admin is also online."] =
-   "Administrator ist auch online.";
-$locale["Administrators"] =
-   "Administratoren";
-$locale["All %s are listed below."] =
-   "Alle %s sind unten aufgelistet.";
-$locale["All pages with all links in this wiki (%d total):"] =
-   "Alle Seiten mit allen Links in diesem Wiki (%d insgesamt):";
-$locale["AllPages"] =
-   "AlleSeiten";
-$locale["AllPagesCreatedByMe"] =
-   "AlleSeitenErzeugtVonMir";
-$locale["AllPagesLastEditedByMe"] =
-   "AlleSeitenEditiertVonMir";
-$locale["AllPagesOwnedByMe"] =
-   "AlleSeitenImBesitzVonMir";
-$locale["AllUsers"] =
-   "AlleBenutzer";
-$locale["Allow / Deny"] =
-   "Erlaube / Sperre";
-$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] =
-   "Erlaubt die Auswahl mehrerer Seiten, die dann mit weiteren WikiAdmin Zusatzprogrammen bearbeitet werden.";
-$locale["Already logged in"] =
-   "Bereits eingeloggt";
-$locale["Also pages which have been deleted at least %s days."] =
-   "Auch Seiten, die in den letzten %s Tagen gelöscht wurden.";
-$locale["An unnamed PhpWiki"] =
-   "Unbenanntes PhpWiki";
-$locale["Analyzes preferences based on voting budget and ratings."] =
-   "Analysiere Empfehlungen auf Grund von Bewertungen.";
-$locale["Anonymous Users"] =
-   "Anonyme Benutzer";
-$locale["Appearance"] =
-   "Darstellung";
-$locale["Append text to any page in this wiki."] =
-   "Füge Text zu einer Seite in diesem Wiki hinzu.";
-$locale["AppendText"] =
-   "TextHinzufügen";
-$locale["AppendText to %s"] =
-   "TextHinzufügen zu %s";
-$locale["Appending at the end."] =
-   "Füge am Ende hinzu.";
-$locale["Application name"] =
-   "Anwendungsname";
-$locale["Application size: %d Kb"] =
-   "Anwendungsplatzbedarf: %d KB";
-$locale["Apply changes"] =
-   "Änderungen anwenden";
-$locale["Approve"] =
-   "Akzeptieren";
-$locale["Are you sure you want to permanently change the markup type of the selected files?"] =
-   "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
-$locale["Are you sure you want to permanently change the selected files?"] =
-   "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
-$locale["Are you sure you want to permanently remove the selected files?"] =
-   "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?";
-$locale["Argument '%s' not declared by plugin."] =
-   "Argument »%s« nicht im Zusatzprogramm deklariert.";
-$locale["Arguments"] =
-   "Parameter";
-$locale["Attempting to use the directory '%s' instead."] =
-   "Versuche stattdessen das Verzeichnis »%s« zu verwenden.";
-$locale["Attribute"] =
-   "Attribut";
-$locale["Attribute %s, base value: %s"] =
-   "Attribut %s, Basis: %s";
-$locale["Attribute %s, value: %s"] =
-   "Attribut %s, Wert: %s";
-$locale["Attributes of %s"] =
-   "Attribute für %s";
-$locale["Auth Level"] =
-   "Auth. Ebene";
-$locale["Auth Method"] =
-   "Auth. Methode";
-$locale["AuthInfo"] =
-   "AuthentifizierungsInfo";
-$locale["Authenticated Users"] =
-   "Authentifizierte Benutzer";
-$locale["Authenticated as %s"] =
-   "Authentifiziert als %s";
-$locale["Authenticated users on this wiki (%d total):"] =
-   "Eingetragene Benutzer in diesem Wiki (Gesamt: %d):";
-$locale["Author"] =
-   "Autor";
-$locale["Author will be logged as %s."] =
-   "%s wird als Autor aufgenommen.";
-$locale["AuthorHistory"] =
-   "AutorenProtokoll";
-$locale["AuthorHistoryPlugin"] =
-   "AutorenProtokollPlugin";
-$locale["Available plugins"] =
-   "Verfügbare Einschubprogramme";
-$locale["Avg. Rating"] =
-   "Durchschnittsbewertung";
-$locale["BAD URL -- remove all of <, >, \""] =
-   "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \"";
-$locale["BAD phpwiki: URL"] =
-   "phpwiki: URL Formfehler";
-$locale["BOGO"] =
-   "BOGO";
-$locale["Back Links"] =
-   "Back Links";
-$locale["BackLinks"] =
-   "BackLinks";
-$locale["BackLinks for %s"] =
-   "BackLinks für %s";
-$locale["Backend type: "] =
-   "Backend Typ: ";
-$locale["Bad Version"] =
-   "Ungültige Version";
-$locale["Bad file type: %s"] =
-   "Ungültiger Dateityp: %s";
-$locale["Bad url in src: remove all of <, >, \""] =
-   "URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \"";
-$locale["Blog Archives:"] =
-   "Blog-Archive:";
-$locale["Blog Entries for %s:"] =
-   "Blog-Einträge für %s:";
-$locale["Blog page"] =
-   "Blog Seite";
-$locale["BlogArchives"] =
-   "BlogArchiv";
-$locale["Bogo Users"] =
-   "Bogo Benutzer";
-$locale["Bold text"] =
-   "Fetter Text";
-$locale["Bold text [alt-b]"] =
-   "Fetter Text [alt-f]";
-$locale["Browsing pages"] =
-   "Das Durchblättern der Seiten dieses Wikis";
-$locale["CANCEL"] =
-   "ABBRUCH";
-$locale["CONVERTING"] =
-   "KONVERTIERE";
-$locale["CREATED"] =
-   "ERZEUGT";
-$locale["Cache statistics"] =
-   "Cache Statistiken";
-$locale["Calendar"] =
-   "Kalender";
-$locale["CalendarList"] =
-   "KalenderListe";
-$locale["CalendarListPlugin"] =
-   "KalenderListePlugin";
-$locale["CalendarPlugin"] =
-   "KalenderPlugin";
-$locale["Can't inflate data: zlib support not enabled in this PHP"] =
-   "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 geöffnet worden.";
-$locale["Can't open zip file '%s' for reading"] =
-   "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen";
-$locale["Cancel"] =
-   "Abbrechen";
-$locale["Cancelled"] =
-   "Abgebrochen";
-$locale["Cannot create directory '%s'"] =
-   "Das Verzeichnis »%s« kann nicht erzeugt werden";
-$locale["Cannot create page with empty name!"] =
-   "Kann Seite mit leerem Namen nicht erzeugen";
-$locale["Cannot open AUTH_GROUP_FILE %s"] =
-   "Kann AUTH_GROUP_FILE %s nicht öffnen";
-$locale["Case insensitive?"] =
-   "Groß-/Kleinschreibung beachten?";
-$locale["Category"] =
-   "Kategorie";
-$locale["CategoryCategory"] =
-   "KategorieKategorie";
-$locale["CategoryGroup"] =
-   "KategorieGruppen";
-$locale["CategoryHomePages"] =
-   "KategorieHomepage";
-$locale["CategoryHomepage"] =
-   "KategorieHomepage";
-$locale["CategoryPage"] =
-   "KategorieSeite";
-$locale["Change Password"] =
-   "Ändere Passwort";
-$locale["Change Verification Status"] =
-   "Ändere Bestätigungs-Status";
-$locale["Change country"] =
-   "Land ändern";
-$locale["Change markup"] =
-   "Ändere Formatierung";
-$locale["Change markup type"] =
-   "Ändere Formatierungs-Typ";
-$locale["Change page attributes"] =
-   "Ändern von Eigenschaften";
-$locale["Change the markup type of selected pages."] =
-   "Ändere den Formatierungstyp aller ausgewählte Seiten.";
-$locale["Changes"] =
-   "Änderungen";
-$locale["Check any two boxes then %s."] =
-   "Wählen Sie zwei Versionen aus, dann %s.";
-$locale["Check any two boxes to compare revisions."] =
-   "Wählen Sie zwei Versionen zum Vergleich aus.";
-$locale["Check to add this ACL"] =
-   "Anklicken um diese ACL hinzuzufügen";
-$locale["Chmod"] =
-   "Chmod";
-$locale["Chmod to permission:"] =
-   "Ändere auf Berechtigung:";
-$locale["Chown"] =
-   "Chown";
-$locale["Click to authenticate as %s"] =
-   "Hier klicken um sich anzumelden als %s";
-$locale["Click to de-/select all pages"] =
-   "Klicken Sie um alle/keine Seiten auszuwählen";
-$locale["Click to display"] =
-   "Klicken um anzuzeigen";
-$locale["Click to display all comments"] =
-   "Klicken um Kommentare anzuzeigen";
-$locale["Click to display to TOC"] =
-   "Klicken um TOC anzuzeigen";
-$locale["Click to hide the comments"] =
-   "Klicken um Kommentare zu verstecken";
-$locale["Click to reverse sort order"] =
-   "Klicken Sie um die Reihenfolge umzudrehen";
-$locale["Click to sort by %s"] =
-   "Sortiere nach %s";
-$locale["Close"] =
-   "Schließen";
-$locale["Color"] =
-   "Farbe";
-$locale["Color text"] =
-   "Farbiger Text";
-$locale["Columns: %s."] =
-   "Spalten: %s.";
-$locale["Comment"] =
-   "Kommentar";
-$locale["Comment modified on %s by %s"] =
-   "Kommentare am %s geändert von %s";
-$locale["CommentPlugin"] =
-   "KommentarPlugin";
-$locale["Comments"] =
-   "Kommentare";
-$locale["Comments on %s by %s."] =
-   "Kommentar zu %s von %s.";
-$locale["Complete."] =
-   "Fertig.";
-$locale["Conflicting Edits!"] =
-   "Widersprechende Änderungen!";
-$locale["Content"] =
-   "Inhalt";
-$locale["Contents"] =
-   "Inhalt";
-$locale["ContributedTranslations"] =
-   "MeineÜbersetzungen";
-$locale["Control characters not allowed"] =
-   "Steuerzeichen nicht erlaubt";
-$locale["Convert"] =
-   "Konvertieren";
-$locale["Convert text into a png image using GD."] =
-   "Text mit der GD Bibliothek in ein PNG Bild konvertieren.";
-$locale["Converted successfully %d pages"] =
-   "%d Seiten erfolgreich konvertiert";
-$locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] =
-   "(La)TeX-Dokument nach ein Bild erstellen. Dadurch konnte eine Formel in PhpWiki eingebettet worden.";
-$locale["Copyrights"] =
-   "Urheberrechte";
-$locale["Could not connect to LDAP host %s"] =
-   "Kann nicht zu LDAP host »%s« verbinden";
-$locale["Couldn't change page '%s' to markup type '%s'."] =
-   "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 connect to %s"] =
-   "Kann nicht zu »%s« verbinden";
-$locale["Couldn't rename page '%s' to '%s'."] =
-   "Konnte Seite '%s' nicht in '%s' umbenennen.";
-$locale["Couldn't start commandline '%s'"] =
-   "Konnte Programm »%s« nicht starten";
-$locale["Count"] =
-   "Anzahl";
-$locale["Create a Wiki page by the provided name."] =
-   "Erzeuge neue Wiki-Seite mit dem angegebenem Namen.";
-$locale["Create a Wiki page."] =
-   "Erzeuge eine neue Wiki-Seite.";
-$locale["Create a new (sub)page"] =
-   "Erzeuge eine neue (Unter)Seite";
-$locale["Create: %s"] =
-   "Erzeugen: %s";
-$locale["CreatePage"] =
-   "NeueSeite";
-$locale["CreateToc"] =
-   "InhaltsVerzeichnis";
-$locale["CreateToc disabled for old markup"] =
-   "InhaltsVerzeichnis deaktiviert für altes Markup";
-$locale["CreateTocPlugin"] =
-   "InhaltsVerzeichnisPlugin";
-$locale["Created by CreatePage"] =
-   "Erzeugt von NeueSeite";
-$locale["Created directory '%s' for the page dump..."] =
-   "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen...";
-$locale["Creating pages"] =
-   "Neue Seiten erzeugen";
-$locale["Creator"] =
-   "Erzeuger";
-$locale["Current Language"] =
-   "Ausgewählte Sprache";
-$locale["Current Theme"] =
-   "Ausgewählte Darstellung";
-$locale["Current language: '%s'"] =
-   "Ihre Sprache: »%s«";
-$locale["Current theme: '%s'"] =
-   "Ihre Benutzeroberfläche: »%s«";
-$locale["CurrentTime"] =
-   "AktuelleZeit";
-$locale["DB admin password:"] =
-   "DB Admin passwort:";
-$locale["DB admin user:"] =
-   "DB Admin Benutzername:";
-$locale["Database"] =
-   "Datenbank";
-$locale["Date Format"] =
-   "Datumsformat";
-$locale["DeadEndPages"] =
-   "VerwaisteSeiten";
-$locale["DebugGroupInfo"] =
-   "DebugGruppenInfo";
-$locale["DebugInfo"] =
-   "DebugInfo";
-$locale["Default InterWiki map file not loaded."] =
-   "Standard-Datei der InterWikiListe nicht geladen.";
-$locale["Default language: '%s'"] =
-   "Standardsprache für dieses Wiki: »%s«";
-$locale["Default preferences will be used."] =
-   "Die Vorgabe Benutzereinstellungen werden verwendent.";
-$locale["Default theme: '%s'"] =
-   "Darstellung des Systems: »%s«";
-$locale["Define a translation for a specified text"] =
-   "Definiere die Übersetzung für einen gegebenen Text";
-$locale["Define the translation for %s in %s"] =
-   "Definiere die Übersetzung für %s nach %s";
-$locale["Del/+"] =
-   "Lö/+";
-$locale["Delete this ACL"] =
-   "Lösche diese ACL";
-$locale["Deleted"] =
-   "Gelöscht";
-$locale["Deleted %s pages with invalid names:"] =
-   "%s Seiten mit ungültigen Namen gelöscht:";
-$locale["Deleted %s unreferenced pages:"] =
-   "%s unverlinkte Seiten entfernt:";
-$locale["Describe %s here."] =
-   "Beschreiben Sie %s hier.";
-$locale["Description"] =
-   "Beschreibung";
-$locale["Dialog"] =
-   "Dialog";
-$locale["Diff"] =
-   "Diff";
-$locale["Diff previous Author"] =
-   "Diff zu vorigem Autor";
-$locale["Diff previous Revision"] =
-   "Diff zu voriger Version";
-$locale["Diff: %s"] =
-   "Vergleich von: %s";
-$locale["Differences between %s and %s of %s."] =
-   "Zeilenweiser Vergleich von %3\$s, von %1\$s mit %2\$s.";
-$locale["Diffing pages"] =
-   "Die Inhalts-Differenz-Seiten dieses Wikis";
-$locale["Discussion"] =
-   "Diskussion";
-$locale["Display arbitrary SQL result tables"] =
-   "Zeige Tabelle von SQL Abfragen an";
-$locale["Display differences between revisions"] =
-   "Zeilenweiser Vergleich der Versionen";
-$locale["Displays a list of randomly chosen pages or redirects to a random page."] =
-   "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten.";
-$locale["Displays a set of photos listed in a text file with optional descriptions"] =
-   "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["Don't cache this page."] =
-   "Cache diese Seite nicht.";
-$locale["Double redirect not allowed."] =
-   "Rekursive Redirektion verboten.";
-$locale["Download all revisions for backup"] =
-   "Alle Versionen für Backup herunterladen";
-$locale["Download for CVS"] =
-   "Für CVS herunterladen.";
-$locale["Download for backup"] =
-   "Für Backup herunterladen";
-$locale["Download page contents"] =
-   "Runterladen der Seite";
-$locale["Downloading html zip dumps"] =
-   "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei";
-$locale["Downloading zip dumps"] =
-   "Das Herunterladen aller Wiki-Seiten als gezippte Datei";
-$locale["Dump Pages"] =
-   "Seiten Schreiben";
-$locale["Dump Pages as XHTML"] =
-   "Seiten als XHTML schreiben";
-$locale["Dump pages as XHTML"] =
-   "Seiten als XHTML Dateien speichern";
-$locale["Dump to directory"] =
-   "Wiki Seiten als Dateien in lokales Verzeichnis speichern";
-$locale["Dumping Pages"] =
-   "Die Seiten werden geschrieben";
-$locale["Dumping html pages"] =
-   "Die Speicherung von Wiki Seiten als HTML-Dateien";
-$locale["Dumping serial pages"] =
-   "Die Speicherung von Wiki Seiten als Dateien";
-$locale["E-Mail"] =
-   "E-Mail";
-$locale["E-mail"] =
-   "E-Mail";
-$locale["Easy navigation buttons for %s"] =
-   "Einfache Navgiationsknöpfe für %s";
-$locale["Edit"] =
-   "Bearbeiten";
-$locale["Edit %s"] =
-   "Bearbeite %s";
-$locale["Edit Area Size"] =
-   "Texteingabe Fenstergröße";
-$locale["Edit Old Revision"] =
-   "Alte Version Bearbeiten";
-$locale["Edit aborted."] =
-   "Bearbeiten abgebrochen.";
-$locale["Edit metadata for %s"] =
-   "Meta-Daten für %s bearbeiten";
-$locale["Edit old revision"] =
-   "Alte Version Bearbeiten";
-$locale["Edit this page"] =
-   "Diese Seite bearbeiten";
-$locale["Edit this page and all subpages"] =
-   "Bearbeiten aller Seiten und Unterseiten";
-$locale["Edit: %s"] =
-   "Bearbeite: %s";
-$locale["EditMetaData"] =
-   "MetaDatenBearbeiten";
-$locale["EditMetaDataPlugin"] =
-   "MetaDatenBearbeitenPlugin";
-$locale["EditText"] =
-   "TextBearbeiten";
-$locale["Edited by: %s"] =
-   "Bearbeitet von: %s";
-$locale["Editing pages"] =
-   "Ändern in diesem Wiki";
-$locale["Elapsed time: %s s"] =
-   "Dauer: %s s";
-$locale["Email Verification"] =
-   "E-Mail Bestätigung";
-$locale["Email not yet verified."] =
-   "E-Mail noch nicht bestätigt.";
-$locale["Email verified."] =
-   "E-Mail bestätigt.";
-$locale["Embed hidden comments in WikiPages."] =
-   "Kommentar in WikiText verstecken.";
-$locale["Empty Preferences or format of UserPreferences cookie not recognised."] =
-   "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt.";
-$locale["Empty link to: %s"] =
-   "Leerer Link zu: %s";
-$locale["Empty pagename!"] =
-   "Leerer Seitenname!";
-$locale["Enable configurable polls"] =
-   "Erlaubt konfigurierbare Umfragen";
-$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] =
-   "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt.";
-$locale["Enter your UserId to sign in"] =
-   "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein";
-$locale["Enumeration"] =
-   "Num. Liste";
-$locale["Error sending email with password for user %s."] =
-   "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
-$locale["Error: Couldn't send %s to %s"] =
-   "Fehler: Konnte nicht %s an %s senden";
-$locale["Error: Empty search string."] =
-   "Fehler: Leeres Suchwort.";
-$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] =
-   "Fehler: Ihre Homepage Seite muß ein gültiges WikiWord sein. Die BenutzerEinstellungen können deshalb leider nicht gespeichert werden.";
-$locale["Every"] =
-   "Jeder";
-$locale["Exit toolbar"] =
-   "Beende Werkzeugleiste";
-$locale["External Links"] =
-   "Externe Links";
-$locale["External link (remember http:// prefix)"] =
-   "Externer Link (http:// prefix)";
-$locale["ExternalSearch"] =
-   "FremdSuche";
-$locale["ExternalSearchPlugin"] =
-   "FremdSuchePlugin";
-$locale["FAILED"] =
-   "FEHLER";
-$locale["FIXED"] =
-   "AUSGEBESSERT";
-$locale["FORBIDDEN"] =
-   "VERBOTEN";
-$locale["Failed to bind LDAP host"] =
-   "Konnte nicht mit LDAP Host verbinden";
-$locale["Failed to connect to LDAP host"] =
-   "LDAP Server nicht gefunden";
-$locale["Fatal PhpWiki Error"] =
-   "Fataler PhpWiki-Fehler";
-$locale["File '%s' not found."] =
-   "Datei '%s' nicht gefunden";
-$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"] =
-   "SeiteFinden";
-$locale["First"] =
-   "Erste";
-$locale["FoafViewer"] =
-   "FoafBetrachter";
-$locale["FoafViewerPlugin"] =
-   "FoafViewerPlugin";
-$locale["Found by "] =
-   "Gefunden von ";
-$locale["FrameInclude"] =
-   "FrameEinbetten";
-$locale["FrameIncludePlugin"] =
-   "FrameEinbettenPlugin";
-$locale["From english to %s: "] =
-   "Von Englisch nach %s: ";
-$locale["Full text search results for '%s'"] =
-   "Volltext-Suchresultate nach »%s«";
-$locale["FullDump"] =
-   "VollSicherung";
-$locale["FullRecentChanges"] =
-   "AlleNeuesteÄnderungen";
-$locale["FullTextSearch"] =
-   "VolltextSuche";
-$locale["FuzzyPages"] =
-   "FuzzySuche";
-$locale["General Auth Settings"] =
-   "Allgemeine Authentifizierungs-Einstellungen";
-$locale["Get an email notification at changes of the following pages:"] =
-   "E-Mail Nachricht bei Änderung folgender Seiten:";
-$locale["Get debugging information for %s."] =
-   "Debug-Informationen von %s.";
-$locale["Get preferences information for current user %s."] =
-   "Zeige Benutzereinstellungen für den aktuellen Benutzer %s.";
-$locale["Given password ignored."] =
-   "Passwort ignoriert.";
-$locale["Go"] =
-   "Los";
-$locale["Go to %s."] =
-   "Gehe zu %s.";
-$locale["Go to or create page."] =
-   "Gehe zu oder erzeuge diese Seite.";
-$locale["Go?"] =
-   "Los?";
-$locale["GoTo"] =
-   "GeheZu";
-$locale["GooglePlugin"] =
-   "GoogleZusatzprogramm";
-$locale["Grant"] =
-   "Erlaube";
-$locale["Group %s does not exist"] =
-   "Gruppe %s existiert nicht";
-$locale["Group page '%s' does not exist"] =
-   "Gruppenseite »%s« existiert nicht";
-$locale["Group/User"] =
-   "Gruppe/Benutzer";
-$locale["Guest"] =
-   "Gast";
-$locale["Guests"] =
-   "Gäste";
-$locale["H"] =
-   "H.";
-$locale["Headline text"] =
-   "Überschrift";
-$locale["Height"] =
-   "Höhe";
-$locale["HelloWorld"] =
-   "HalloWelt";
-$locale["HelloWorldPlugin"] =
-   "HalloWeltPlugin";
-$locale["Help"] =
-   "Hilfe";
-$locale["Here you can override site-specific default values."] =
-   "Hier können Sie einige Voreinstellungen ändern.";
-$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 der Voraussetzung, dass es durch die ausgewählte Darstellung unterstützt wird). Dies ist sinnvoll für Text-Browser und langsame Verbindungen.";
-$locale["Hilight referred search terms."] =
-   "Hebe externe Suchwörter hervor.";
-$locale["History of all major and minor edits by %s to page %s."] =
-   "Verlaufsprotokoll aller großen und kleinen Änderungen von %s der Seite %s.";
-$locale["History of all major and minor modifications for any page edited by %s."] =
-   "Verlaufsprotokoll aller großen und kleinen Änderungen aller Seiten, die von %s bearbeitet wurden.";
-$locale["History of changes."] =
-   "Änderungsprotokoll.";
-$locale["Hit statistics"] =
-   "Treffer Statistiken";
-$locale["Hits"] =
-   "Treffer";
-$locale["Hits:"] =
-   "Treffer:";
-$locale["Home"] =
-   "Start";
-$locale["HomePage"] =
-   "StartSeite";
-$locale["HomePageAlias"] =
-   "HomePageAlias";
-$locale["Horizontal line"] =
-   "Horizontale Trennlinie";
-$locale["HowToUseWiki"] =
-   "WieManWikiBenutzt";
-$locale["I'm just doing minor edits. Please divert the usual logging to %s instead."] =
-   "Ich mache nur kleinere Änderungen. Protokolliere stattdessen in %s.";
-$locale["I'm sorry, there is no such page as %s."] =
-   "Leider gibt es keine solche Seite %s.";
-$locale["I'm sorry.  Version %d of %s is not in the database."] =
-   "Leider ist keine Version %d von %s in der Datenbank.";
-$locale["Ignore wiki formatting"] =
-   "Keine Wiki Formatierung";
-$locale["Illegal chars %s removed"] =
-   "Ungültiges Zeichen %s entfernt";
-$locale["Image loaded from cache file: %s"] =
-   "Bild geladen von Cachedatei: %s";
-$locale["Image saved to cache file: %s"] =
-   "Bild gespeichert als Cachedatei: %s";
-$locale["In the time since you started editing this page, another user has saved a new version of it."] =
-   "Während der Zeit, seit Sie mit der Bearbeitung dieser Seite begonnen haben, hat ein anderer Benutzer bereits eine neuere Version gespeichert.";
-$locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] =
-   "Insgesamt sind %d Benutzersessions online. :: %d verschiedene Registrierte und %d Gäste";
-$locale["Include an external web page within the body of a wiki page."] =
-   "Einbetten einer externen Webseite im Body dieser Wiki Seite.";
-$locale["Include multiple pages."] =
-   "Füge mehrere Seiten ein.";
-$locale["Include recursively all linked pages starting at %s"] =
-   "Bette rekursiv alle verlinkten Seiten ein, angefangen mit %s";
-$locale["Include text from another wiki page."] =
-   "Text von einer andere Seite einfügen.";
-$locale["IncludePage"] =
-   "SeiteEinfügen";
-$locale["IncludePagePlugin"] =
-   "SeiteEinfügenPlugin";
-$locale["IncludePages"] =
-   "SeitenEinfügen";
-$locale["IncludeSiteMap"] =
-   "SeitenBaumEingefügt";
-$locale["Included from %s"] =
-   "Eingefügter Text von %s";
-$locale["Included from %s:"] =
-   "Eingefügter Text von %s:";
-$locale["Includes the content of all SubPages of the current page."] =
-   "Enthält den Inhalt alle UnterSeiten der aktuellen Seite.";
-$locale["Info"] =
-   "Info";
-$locale["Inline images"] =
-   "Eingebundene Bilder";
-$locale["Insert"] =
-   "Einfügen";
-$locale["Insert non-formatted text here"] =
-   "Füge unformatierten Text hier ein";
-$locale["Insufficient permissions."] =
-   "Keine ausreichenden Zugangsrechte.";
-$locale["InterWiki"] =
-   "InterWiki";
-$locale["InterWiki Address"] =
-   "InterWiki-Adresse";
-$locale["InterWikiMap"] =
-   "InterWikiListe";
-$locale["InterWikiSearch"] =
-   "InterWikiSuche";
-$locale["Invalid ACL"] =
-   "Ungültige ACL";
-$locale["Invalid [] syntax ignored"] =
-   "Ungültige [] syntax ignoriert";
-$locale["Invalid argument: %s=%s"] =
-   "Ungültiger Parameter: %s=%s";
-$locale["Invalid chmod string"] =
-   "Ungültiger CHMOD Befehl";
-$locale["Invalid color: %s"] =
-   "Ungültige Farbe: %s";
-$locale["Invalid image size"] =
-   "Ungültige Bildgröße";
-$locale["Invalid pagename!"] =
-   "Ungültiger Seitenname!";
-$locale["Invalid password or userid."] =
-   "Ungültiges Passwort oder falscher Benutzername.";
-$locale["Invalid password."] =
-   "Ungültiges Passwort.";
-$locale["Invalid username '%s' for LDAP Auth"] =
-   "Ungültiger Benutzername »%s« für LDAP Auth";
-$locale["Invalid username."] =
-   "Ungültiger Benutzername.";
-$locale["Italic text"] =
-   "Kursiver Text";
-$locale["Italic text [alt-i]"] =
-   "Kursiver Text [alt-k]";
-$locale["JabberPresence"] =
-   "JabberAnwesend";
-$locale["Keep up to %d major edits, but keep them no longer than %d days."] =
-   "Aufbewahrung größerer Änderungen für %d, aber nicht länger als %d Tage.";
-$locale["Language"] =
-   "Sprache";
-$locale["Last"] =
-   "Letzte";
-$locale["Last Author"] =
-   "Letzter Autor";
-$locale["Last Modified"] =
-   "Zuletzt geändert";
-$locale["Last Summary"] =
-   "Letzte Zusammenfassung";
-$locale["Last edited %s"] =
-   "Zuletzt geändert %s";
-$locale["Last edited on %s"] =
-   "Zuletzt bearbeitet am %s";
-$locale["LatestSnapshot"] =
-   "LetzeSicherung";
-$locale["Layout tables using a very rich markup style."] =
-   "Tabellen mit erweiterter HTML Syntax.";
-$locale["Layout tables using the old markup style."] =
-   "Tabellen unter Verwendung traditioneller (alter) Wikitext Formatierung.";
-$locale["LdapSearch"] =
-   "LdapSuche";
-$locale["Leading %s not allowed"] =
-   "Führende %s nicht erlaubt";
-$locale["Legend"] =
-   "Legende";
-$locale["Level 1 headline"] =
-   "H1 Überschrift";
-$locale["Like Pages"] =
-   "Ähnliche Seiten";
-$locale["LikePages"] =
-   "ÄhnlicheSeiten";
-$locale["Line %s does not begin with a '|'."] =
-   "Zeile %s beginnt nicht mit '|'.";
-$locale["Link"] =
-   "Verweis";
-$locale["Link to page"] =
-   "Link auf Seite";
-$locale["LinkDatabase"] =
-   "LinkDatenbank";
-$locale["LinkIcons"] =
-   "LinksIcons";
-$locale["LinkSearch"] =
-   "LinkSuche";
-$locale["Links"] =
-   "Links";
-$locale["List"] =
-   "Liste";
-$locale["List PageHistory for %s"] =
-   "Das Änderungsprotokoll für %s auflisten";
-$locale["List all new pages per month per user"] =
-   "Liste aller neuen Seiten pro Monat und Benutzer";
-$locale["List all once authenticated users."] =
-   "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 für einen Autor.";
-$locale["List all pages in this wiki."] =
-   "Alle Seiten in diesem Wiki auflisten.";
-$locale["List all pages which link to %s."] =
-   "Alle Seiten, die mit %s verlinkt sind.";
-$locale["List of pages created by [%s] (%d total):"] =
-   "Liste der Seiten erzeugt von [%s] (%d insgesamt):";
-$locale["List of pages last edited by [%s] (%d total):"] =
-   "Liste der Seiten last edited by [%s] (%d insgesamt):";
-$locale["List of pages owned by [%s] (%d total):"] =
-   "Liste der Seiten owned by [%s] (%d insgesamt):";
-$locale["List page names which share an initial or final title word with '%s'."] =
-   "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«.";
-$locale["List pages which are not linked to by any other page."] =
-   "Liste aller Seiten, die von keiner anderen Seite verlinkt sind.";
-$locale["List the most popular pages nearby."] =
-   "Liste die meistbesuchten Seiten in der Nähe.";
-$locale["List the most popular pages."] =
-   "Die meistbesucht Seiten werden aufgelistet.";
-$locale["List the user's ratings."] =
-   "Zeige die Benutzer Bewertungen.";
-$locale["List this page and all subpages"] =
-   "Auflistung aller Seiten und Unterseiten";
-$locale["ListPages"] =
-   "ListeSeiten";
-$locale["ListRelations"] =
-   "ListeRelationen";
-$locale["ListSubpages"] =
-   "ListeUnterseiten";
-$locale["Lists referenced page names which do not exist yet."] =
-   "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden.";
-$locale["Lists the names of all SubPages of the current page."] =
-   "Listet die Namen aller Unterseiten der aktuellen Seite.";
-$locale["LiveSearch"] =
-   "LiveSuche";
-$locale["Load File"] =
-   "Datei Laden";
-$locale["LoadDump"] =
-   "SeiteLaden";
-$locale["Loading '%s'"] =
-   "»%s« wird geladen";
-$locale["Loading InterWikiMap from external file %s."] =
-   "Die InterWikiListe wird von der externen Datei %s geladen.";
-$locale["Loading files"] =
-   "Dateien hinaufladen";
-$locale["Loading up virgin wiki"] =
-   "Lade neue Seiten in das frische Wiki";
-$locale["Lock"] =
-   "Sperren";
-$locale["Lock Page"] =
-   "Seite Sperren";
-$locale["Lock page to enable link"] =
-   "Seite sperren, um den Link zu aktivieren";
-$locale["Locked"] =
-   "Gesperrt";
-$locale["Locking pages"] =
-   "Seiten sperren";
-$locale["Login"] =
-   "Anmelden";
-$locale["MIME file %s"] =
-   "MIME-Datei %s";
-$locale["MISSING"] =
-   "FEHLEND";
-$locale["Make use of the Google API"] =
-   "Benutze die Google API";
-$locale["Markup"] =
-   "Quelltext";
-$locale["Markup cache purged!"] =
-   "HTML-Cachedaten entfernt!";
-$locale["Markup:"] =
-   "Quelltextformat:";
-$locale["Members:"] =
-   "Mitglieder:";
-$locale["Merge Edit"] =
-   "Zusammenfügen Bearbeiten";
-$locale["Merge and Edit: %s"] =
-   "Zusammenfügen und Bearbeiten: %s";
-$locale["Message"] =
-   "Nachricht";
-$locale["Method '%s' not implemented in this GROUP_METHOD %s"] =
-   "Methode »%s« in GROUP_METHOD %s nicht implementiert";
-$locale["Minor"] =
-   "kleinere";
-$locale["Minor Edit"] =
-   "Kleinere Änderung";
-$locale["Miscellaneous utility functions for the Administrator."] =
-   "Verschiedene Dienstfunktionen für den Administrator.";
-$locale["Missing %s for %s"] =
-   "Fehlender %s für %s";
-$locale["Missing PagePermission:"] =
-   "Fehlende Zugriffsberechtigung:";
-$locale["Missing ldap extension"] =
-   "Fehlende php LDAP extension";
-$locale["ModeratedPage"] =
-   "ModerierteSeite";
-$locale["ModeratedPage Notification Error: Couldn't send email"] =
-   "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden";
-$locale["ModeratedPage: No emails for the moderators defined"] =
-   "ModerierteSeite: Keine E-Mails für Moderatoren definiert";
-$locale["Modern"] =
-   "Modern";
-$locale["Modified"] =
-   "Geändert";
-$locale["Moniker"] =
-   "Kurzname";
-$locale["Most users ever online was %d at %s."] =
-   "Die meisten Besucher online waren %d am %s.";
-$locale["MostPopular"] =
-   "MeistBesucht";
-$locale["Name"] =
-   "Seitenname";
-$locale["Never edited"] =
-   "Noch nie bearbeitet.";
-$locale["New Topic"] =
-   "Neues Thema";
-$locale["New comment."] =
-   "Neuer Kommentar.";
-$locale["New entry"] =
-   "Neuer Eintrag";
-$locale["New page"] =
-   "Neue Seite";
-$locale["New password"] =
-   "Neues Passwort";
-$locale["New users may use an empty password."] =
-   "Neue Benutzer können auch ohne Passwort einloggen.";
-$locale["Newer page:"] =
-   "Neuere Seite:";
-$locale["Next"] =
-   "Nächste";
-$locale["Next Month"] =
-   "Nächster Monat";
-$locale["No Blog Entries"] =
-   "Keine Blog-Einträge";
-$locale["No LDAP in this PHP version"] =
-   "Kein LDAP in dieser PHP Version";
-$locale["No changes found"] =
-   "Keine Änderungen gefunden.";
-$locale["No changes."] =
-   "Keine Änderungen.";
-$locale["No comments found"] =
-   "Keine Kommentare gefunden.";
-$locale["No empty, unreferenced pages were found."] =
-   "Keine leeren, unverlinkten Seiten gefunden.";
-$locale["No metadata for %s"] =
-   "Keine Meta-Daten für %s";
-$locale["No or not enough GROUP_DB SQL statements defined"] =
-   "Keine oder zu wenige GROUP_DB SQL Statements definiert";
-$locale["No or unsupported GROUP_METHOD defined"] =
-   "Keine oder ungültige GROUP_METHOD definiert";
-$locale["No other page links to %s yet."] =
-   "Noch keine Seiten sind mit %s verlinkt.";
-$locale["No page links to %s."] =
-   "Keine Seiten sind mit %s verlinkt.";
-$locale["No pagedata for %s"] =
-   "Keine Daten für Seite %s";
-$locale["No pagename specified"] =
-   "Keine Seite angegeben";
-$locale["No pages changed."] =
-   "Keine Änderungen.";
-$locale["No pages with bad names had to be deleted."] =
-   "Keine Seiten mit ungültigen Namen mußten gelöscht werden.";
-$locale["No revisions found"] =
-   "Keine Versionen gefunden";
-$locale["No uploaded file to upload?"] =
-   "Keine Datei zum Hochladen?";
-$locale["NoCache"] =
-   "OhneCache";
-$locale["None"] =
-   "Keine";
-$locale["Not enough questions answered!"] =
-   "Nicht genügend Fragen beantwortet!";
-$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, dass Benutzer mit ungültigen E-Mail-Addressen gelöscht 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."] =
-   "Beachte: Nur wenn Sie Ihre persönliche HomePage mit dem selben Seitennamen wie Ihre Benutzernamen erzeugen, werden Sie Ihre BenutzerEinstellungen speichern können.";
-$locale["Nothing found"] =
-   "Nichts gefunden";
-$locale["OK"] =
-   "OK";
-$locale["Okay"] =
-   "OK";
-$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] =
-   "Ihre alte persönliche HomePage %s ohne gespeichertem Passwort wurde mit einem leeren Password gespeichert. Setzen Sie ein Passwort in Ihren BenutzerEinstellungen.";
-$locale["OldStyleTable"] =
-   "TraditionellerTabellenStil";
-$locale["OldStyleTablePlugin"] =
-   "TraditionellerTabellenStilPlugin";
-$locale["Older page:"] =
-   "Ältere Seite:";
-$locale["One page links to %s:"] =
-   "Eine Seite ist mit %s verlinkt:";
-$locale["One page would link to %s:"] =
-   "Eine Seite würde mit %s verlinkt sein:";
-$locale["Only files with extension HTML are allowed"] =
-   "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 gelöscht!";
-$locale["Operation undone"] =
-   "Aktion rückgängig gemacht";
-$locale["Optimizing database"] =
-   "Datenbank wird optimiert";
-$locale["Original (1.2 or 1.0)"] =
-   "Original (1,2 oder 1,0)";
-$locale["Orphaned Pages in this wiki (%d total):"] =
-   "Verwaiste Seiten in diesem Wiki (%d gesamt):";
-$locale["OrphanedPages"] =
-   "VerwaisteSeiten";
-$locale["Other diffs:"] =
-   "Andere Vergleiche:";
-$locale["Other version"] =
-   "Andere Version";
-$locale["Our users created a total of %d pages."] =
-   "Unsere Benutzer erzeugten insgesamt %d Seiten.";
-$locale["Owner"] =
-   "Besitzer";
-$locale["Owner: %s"] =
-   "Besitzer: %s";
-$locale["PHP syntax highlighting"] =
-   "Hervorhebung der PHP-Syntax (Syntax highlighting)";
-$locale["PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."] =
-   "PHP konnte keinen neues GD Bild erzeugen. Lesen Sie 'lib/plugin/text2png.php' für Details.";
-$locale["Page %s not found."] =
-   "Seite %s nicht gefunden.";
-$locale["Page Content: "] =
-   "Inhalt: ";
-$locale["Page Execution took %s seconds"] =
-   "Ausführung dieser Seite dauerte %s Sekunden";
-$locale["Page Locked"] =
-   "Seite Gesperrt";
-$locale["Page Name"] =
-   "Seitenname";
-$locale["Page Trail"] =
-   "Spur";
-$locale["Page Type:"] =
-   "Seitentyp:";
-$locale["Page Version:"] =
-   "Seiten Version:";
-$locale["Page change"] =
-   "Seiten Änderung";
-$locale["Page could not be updated. %s doesn't exist!\n"] =
-   "Seite konnte nicht geändert werden. %s existiert nicht!\n";
-$locale["Page names with prefix '%s'"] =
-   "Seitennamen mit dem Anfangswort »%s«";
-$locale["Page names with suffix '%s'"] =
-   "Seitennamen mit Endwort »%s«";
-$locale["Page now locked."] =
-   "Seite jetzt gesperrt.";
-$locale["Page now not-public."] =
-   "Seite jetzt nicht mehr öffentlich freigegeben.";
-$locale["Page now public."] =
-   "Seite jetzt öffentlich freigegeben.";
-$locale["Page now unlocked."] =
-   "Seite jetzt freigegeben.";
-$locale["Page rename %s to %s"] =
-   "Seite »%s« nach umbenennen »%s«";
-$locale["Page statistics"] =
-   "Seiten Statistiken";
-$locale["Page successfully updated."] =
-   "Datei erfolgreich geändert.";
-$locale["PageChange Notification Error: Couldn't send %s to %s"] =
-   "SeitenÄnderung Benachrichtigung Fehler: Konnte %s nicht an %s senden";
-$locale["PageChange Notification of %s"] =
-   "SeitenÄnderung Benachrichtigung von %s";
-$locale["PageChange Notification of %s sent to %s"] =
-   "SeitenÄnderung Benachrichtigung von %s an %s gesendet";
-$locale["PageDump"] =
-   "SeiteSpeichern";
-$locale["PageGroup"] =
-   "SeitenGruppe";
-$locale["PageGroup for %s"] =
-   "SeitenGruppe für »%s«";
-$locale["PageGroupTest"] =
-   "SeitenGruppenTest";
-$locale["PageGroupTest/Four"] =
-   "SeitenGruppenTest/Vier";
-$locale["PageGroupTest/One"] =
-   "SeitenGruppenTest/Eins";
-$locale["PageGroupTest/Three"] =
-   "SeitenGruppenTest/Drei";
-$locale["PageGroupTest/Two"] =
-   "SeitenGruppenTest/Zwei";
-$locale["PageHistory"] =
-   "SeitenProtokoll";
-$locale["PageHistory for %s"] =
-   "Verlaufsprotokoll für Seite %s";
-$locale["PageInfo"] =
-   "SeitenInfo";
-$locale["PageName|optional label"] =
-   "SeitenName|optionaler Name";
-$locale["PageTrail Plugin"] =
-   "PageTrail Plugin";
-$locale["Pagedata size: %d Kb"] =
-   "Größe der Seitendaten: %d KB";
-$locale["Password cannot be changed."] =
-   "Passwort konnte nicht geändert werden.";
-$locale["Password updated."] =
-   "Passwort geändert.";
-$locale["Password was not changed."] =
-   "Passwort wurde nicht geändert.";
-$locale["Password:"] =
-   "Passwort:";
-$locale["PasswordReset"] =
-   "PasswortZurücksetzen";
-$locale["Perform searches on InterWiki sites listed in InterWikiMap."] =
-   "Durchsuchen im InterWiki sites die im InterWikiMap verzeichnet sind.";
-$locale["Permanently remove all selected pages."] =
-   "Endgültige Löschung aller ausgewählten Seiten.";
-$locale["Permission"] =
-   "Zugriffsrecht";
-$locale["Personal Auth Settings for '%s'"] =
-   "Spezielle Authentifizierungs-Einstellungen %s";
-$locale["Personal language:"] =
-   "Ihre Sprache:";
-$locale["Personal theme:"] =
-   "Ihre Benutzeroberfläche:";
-$locale["PersonalPage login method:"] =
-   "PersonalPage Login Methode:";
-$locale["PgsrcTranslation"] =
-   "PgsrcTranslation";
-$locale["PhotoAlbum"] =
-   "BilderAlbum";
-$locale["PhotoAlbumPlugin"] =
-   "BilderAlbumPlugin";
-$locale["PhpHighlight"] =
-   "PhpHighlight";
-$locale["PhpHighlightPlugin"] =
-   "PhpHighlightPlugin";
-$locale["PhpWeather"] =
-   "PhpWetter";
-$locale["PhpWeatherPlugin"] =
-   "PhpWetterPlugin";
-$locale["PhpWiki"] =
-   "PhpWiki";
-$locale["PhpWiki engine version"] =
-   "PhpWikitriebwerksversion";
-$locale["PhpWikiAdministration"] =
-   "PhpWikiSystemverwalten";
-$locale["PhpWikiAdministration/Chmod"] =
-   "PhpWikiSystemverwalten/Chmod";
-$locale["PhpWikiAdministration/Chown"] =
-   "PhpWikiSystemverwalten/Chown";
-$locale["PhpWikiAdministration/Markup"] =
-   "PhpWikiSystemverwalten/Formatierung";
-$locale["PhpWikiAdministration/Remove"] =
-   "PhpWikiSystemverwalten/Löschen";
-$locale["PhpWikiAdministration/Rename"] =
-   "PhpWikiSystemverwalten/Umbenennen";
-$locale["PhpWikiAdministration/Replace"] =
-   "PhpWikiSystemverwalten/SuchenErsetzen";
-$locale["PhpWikiAdministration/SetAcl"] =
-   "PhpWikiSystemverwalten/AclSetzen";
-$locale["PhpWikiDocumentation"] =
-   "PhpWikiDokumentation";
-$locale["PhpWikiPoll"] =
-   "PhpWikiUmfrage";
-$locale["Please check it through before saving."] =
-   "Bitte überprüfen Sie erst alles, bevor Sie es abspeichern.";
-$locale["Please contact your PhpWiki administrator for assistance."] =
-   "Bitte bitten Sie Ihren PhpWiki Administrator um Unterstützung.";
-$locale["Please ensure that %s is writable, or redefine %s in config/config.ini."] =
-   "Bitte überprüfen 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 überprüfen sie auch ADMIN_PASSWD.";
-$locale["Please set ENCRYPTED_PASSWD to true in config/config.ini."] =
-   "Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen.";
-$locale["Please set a password in UserPreferences."] =
-   "Bitte setzen Sie ein Passwort in Ihren BenutzerEinstellungen.";
-$locale["Please use one of the downloadable versions rather than copying and pasting from the above preview."] =
-   "Verwenden Sie bitte eine der herunterladbaren Versionen als von der obigen Vorschau zu Kopieren und Einzufügen.";
-$locale["Ploticus"] =
-   "Ploticus";
-$locale["PloticusPlugin"] =
-   "PloticusPlugin";
-$locale["Plugin"] =
-   "Zusatzprogramm";
-$locale["Plugin %s disabled."] =
-   "Zusatzprogramm %s deaktiviert.";
-$locale["Plugin %s failed."] =
-   "Zusatzprogramm %s fehlgeschlagen.";
-$locale["Plugin %s: undefined"] =
-   "Zusatzprogramm %s: undefiniert";
-$locale["PluginManager"] =
-   "ZusatzprogrammManager";
-$locale["Plugins"] =
-   "Zusatzprogramme";
-$locale["PopularNearby"] =
-   "MeistBesuchtNahe";
-$locale["Post new"] =
-   "Neuer Eintrag";
-$locale["Posted: %s"] =
-   "Gepostet: %s";
-$locale["Preferences"] =
-   "Voreinstellungen";
-$locale["PreferencesInfo"] =
-   "EinstellungenInfo";
-$locale["PrevNext"] =
-   "VorigeNächste";
-$locale["Preview"] =
-   "Vorschau";
-$locale["Preview as backup format"] =
-   "Vorschau als Backupformat";
-$locale["Preview as developer format"] =
-   "Vorschau im Entwickler Format";
-$locale["Preview as normal format"] =
-   "Vorschau als normales Format";
-$locale["Preview only!  Changes not saved."] =
-   "Dies ist nur eine Vorschau! Die Änderungen sind noch nicht gespeichert.";
-$locale["Preview: Page dump of %s"] =
-   "Vorschau: Seitendump von %s";
-$locale["Previous"] =
-   "Vorherige";
-$locale["Previous Author"] =
-   "Voriger Autor";
-$locale["Previous Major Revision"] =
-   "Vorige größere Neubearbeitung";
-$locale["Previous Month"] =
-   "Voriger Monat";
-$locale["Previous Revision"] =
-   "Vorige Neubearbeitung";
-$locale["Printer"] =
-   "Drucker";
-$locale["Propagate new permissions to all subpages?"] =
-   "Aktiviere Vererbung dieser Zugriffsrechte auf alle Unterseiten?";
-$locale["Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."] =
-   "Gespeicherten HTML Cache dieser Seite löschen und beim nächsten Aufruf neu generieren.";
-$locale["Purge Markup Cache"] =
-   "HTML-Cachedatei Säubern";
-$locale["Purge Page"] =
-   "Seiten endgültig löschen";
-$locale["Purge all Pages With Invalid Names"] =
-   "Alle Seiten mit ungültigen Namen endgültig entfernen";
-$locale["Purge all empty, unreferenced Pages"] =
-   "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind.";
-$locale["Purge this page"] =
-   "Lösche diese Seite endgültig";
-$locale["PurgeHtmlCache"] =
-   "HtmlCacheSäubern";
-$locale["Purging pages"] =
-   "Das Durchblättern der Seiten dieses Wikis";
-$locale["Querying backend directly for '%s'"] =
-   "DB Debug Informationen von der Seite »%s«";
-$locale["Quick Search"] =
-   "SchnellSuche";
-$locale["RandomPage"] =
-   "ZufallsSeite";
-$locale["Rate"] =
-   "Bewerte";
-$locale["Rate It"] =
-   "Bewerte es";
-$locale["RateIt"] =
-   "BewerteEs";
-$locale["Rating system. Store user ratings per page"] =
-   "Bewertungssystem. Speichere Benutzerbewertungen pro Seite";
-$locale["Raw HTML"] =
-   "Reine HTML-Befehle";
-$locale["Raw HTML is disabled in this wiki."] =
-   "HTML-Befehle sind in diesem Wiki außer Kraft gesetzt.";
-$locale["RawHtmlPlugin"] =
-   "RawHtmlPlugin";
-$locale["Reason: "] =
-   "Grund: ";
-$locale["Recent Comments"] =
-   "Neueste Kommentare";
-$locale["Recent Edits"] =
-   "Geringfügige Änderungen";
-$locale["RecentChanges"] =
-   "NeuesteÄnderungen";
-$locale["RecentComments"] =
-   "NeuesteKommentare";
-$locale["RecentEdits"] =
-   "GeringfügigeÄnderungen";
-$locale["RecentVisitors"] =
-   "LetzteBesucher";
-$locale["Recursive redirect to self: '%s'"] =
-   "Eigenbezogene Selbstrückleitung: »%s«";
-$locale["Recursively get BackLinks or links"] =
-   "Alle BackLinks für %s (rekursiv)";
-$locale["Redirect"] =
-   "Weiterleiten";
-$locale["RedirectTo"] =
-   "WeiterLeiten";
-$locale["RedirectToPlugin"] =
-   "WeiterLeitenPlugin";
-$locale["Redirects to an external web site based on form input"] =
-   "Weiterleitung der Suche zu einer externen Webseite aufgrund einer Formulareingabe";
-$locale["References"] =
-   "Fußnoten";
-$locale["Regex?"] =
-   "Regulärer Ausdruck?";
-$locale["Registered Users"] =
-   "Angemeldete Benutzer";
-$locale["Registered Users Online: "] =
-   "Registrierte Benutzer Online: ";
-$locale["Reject"] =
-   "Ablehnen";
-$locale["Related Changes"] =
-   "Verlinkte Änderungen";
-$locale["Related Links"] =
-   "Verwandte Links";
-$locale["RelatedChanges"] =
-   "VerlinkteÄnderungen";
-$locale["Relation %s to page %s"] =
-   "Relation %s zu Seite %s";
-$locale["Relations"] =
-   "Relationen";
-$locale["Remove"] =
-   "Löschen";
-$locale["Remove Page"] =
-   "Seite Löschen";
-$locale["Remove selected pages"] =
-   "Ausgewählte Seiten löschen";
-$locale["Remove this page"] =
-   "Löschen der Seite";
-$locale["Removed page '%s' successfully."] =
-   "Seite »%s« erfolgreich gelöscht.";
-$locale["Removing pages"] =
-   "Die Seitenlöschung in diesem Wiki";
-$locale["Rename"] =
-   "Umbenennen";
-$locale["Rename Page"] =
-   "Seite Umbenennen";
-$locale["Rename selected pages"] =
-   "Ausgewählte Seiten umbenennen";
-$locale["Rename to"] =
-   "Umbennen zu";
-$locale["Renamed page '%s' to '%s'."] =
-   "Seite '%s' auf '%s' umbenannt.";
-$locale["Replace"] =
-   "Ersetze";
-$locale["Replace all occurences of the given string in the content of all pages."] =
-   "Ersetze alle Wörter in den angegebenen Seiten.";
-$locale["Replace with"] =
-   "Ersetze mit";
-$locale["Replaced '%s' with '%s' in page '%s'."] =
-   "'%s' mit '%s' in Seite '%s' ersetzt.";
-$locale["Reply"] =
-   "Antwort";
-$locale["Requires WikiAdmin privileges to edit."] =
-   "Verlangt Administratorenrechte zur Bearbeitung.";
-$locale["Reset"] =
-   "Zurücksetzen";
-$locale["Reset password of user: "] =
-   "Setze Passwort für Benutzer zurück: ";
-$locale["Restore Anyway"] =
-   "Ungeprüft überschreiben";
-$locale["Return to %s"] =
-   "Zurück zu %s";
-$locale["Revert"] =
-   "Zurückspeichern";
-$locale["Revert: %s"] =
-   "Zurückspeichern: %s";
-$locale["Reverting to a previous version of pages"] =
-   "Zurückspeichern einer älteren Version";
-$locale["Revision Not Found"] =
-   "Version nicht gefunden";
-$locale["RichTable"] =
-   "ErweiterteTabellen";
-$locale["RichTablePlugin"] =
-   "ErweiterteTabellenPlugin";
-$locale["SOAP access"] =
-   "SOAP-Zugriff";
-$locale["Sample table"] =
-   "Beispieltabelle";
-$locale["SandBox"] =
-   "SandKasten";
-$locale["Save"] =
-   "Speichern";
-$locale["Saved on:"] =
-   "Gespeichert am:";
-$locale["Saved: %s"] =
-   "Gespeichert: %s";
-$locale["Saving this page will overwrite the current version."] =
-   "Wenn Sie diese Seite jetzt speichern, wird die aktuelle Version überschrieben.";
-$locale["Score"] =
-   "Gewichtung";
-$locale["Search"] =
-   "Suche";
-$locale["Search & Replace"] =
-   "Suchen & Ersetzen";
-$locale["Search an LDAP directory"] =
-   "Durchsuche ein LDAP Verzeichnis";
-$locale["Search and replace text in selected wiki pages."] =
-   "Suche und ersetze Text in den gewählten Seiten.";
-$locale["Search for"] =
-   "Suche nach";
-$locale["Search for page titles similar to %s."] =
-   "Suche nach Seitentitel die ähnlich klingen wie %s.";
-$locale["Search the content of all pages in this wiki."] =
-   "Den Text aller Seiten dieses Wikis durchsuchen.";
-$locale["Search the titles of all pages in this wiki."] =
-   "Die Titeln aller Seiten dieses Wikis durchsuchen.";
-$locale["SearchHighlight"] =
-   "SucheHervorheben";
-$locale["See %s"] =
-   "Siehe %s";
-$locale["See %s tips for editing."] =
-   "Siehe %s Tips fürs Edieren.";
-$locale["See: %s"] =
-   "Siehe: %s";
-$locale["Select pages"] =
-   "Seiten auswählen";
-$locale["Select the pages to change:"] =
-   "Wählen Sie die Seiten zum Ändern:";
-$locale["Select the pages to rename:"] =
-   "Wähle Seiten zum Umbenennen aus:";
-$locale["Select: "] =
-   "Auswahl: ";
-$locale["Selected Grant checkboxes allow access, unselected checkboxes deny access."] =
-   "Gesetzte Erlaube Kästchen erlauben Zugriff, ungesetzte Kästchen sperren Zugriff.";
-$locale["Selected Pages: "] =
-   "Ausgewählte Seiten: ";
-$locale["Selected page '%s' passed to '%s'."] =
-   "Ausgewählte Seite »%s« an »%s« übergeben.";
-$locale["Semantic relations for %s"] =
-   "Semantische Beziehungen für %s";
-$locale["SemanticRelations"] =
-   "SemantischeBeziehungen";
-$locale["SemanticSearch"] =
-   "SemantischeSuche";
-$locale["Send email"] =
-   "Versende E-Mail";
-$locale["Serialized file %s"] =
-   "Serialisierte Datei %s";
-$locale["Set Password"] =
-   "Setze Passwort";
-$locale["Set USE_DB_SESSION to false."] =
-   "Setzen Sie USE_DB_SESSION auf false.";
-$locale["Set individual page permissions."] =
-   "Setze individuelle Zugangsrechte.";
-$locale["SetAcl"] =
-   "AclSetzen";
-$locale["Show and add blogs for %s"] =
-   "Blogs für %s zeigen und hinzufügen";
-$locale["Show and add comments for %s"] =
-   "Kommentare für %s zeigen und hinzufügen";
-$locale["Show changes for:"] =
-   "Zeige Änderungen innerhalb von:";
-$locale["Show extra page Info and statistics for %s."] =
-   "Zusätzliche Seiten-Info und Statistiken über %s zeigen.";
-$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.";
-$locale["Show summary information of the current user sessions."] =
-   "Zeige Überblick über alle aktuellen Benutzersessions.";
-$locale["Show translations of various words or pages"] =
-   "Zeige Übersetzungen für verschiedene Wörter oder Seiten";
-$locale["Sidebar"] =
-   "Sidebar";
-$locale["Sign In"] =
-   "Anmelden";
-$locale["Sign Out"] =
-   "Abmelden";
-$locale["Sign in as:"] =
-   "Anmelden als:";
-$locale["SignIn"] =
-   "AnMelden";
-$locale["SignOut"] =
-   "Abmelden";
-$locale["Signed Users"] =
-   "Angemeldete Benutzer";
-$locale["Simple RSS Feed aggregator Plugin"] =
-   "Einfaches RSS Feed Plugin";
-$locale["Simple Sample Plugin"] =
-   "Zusatzprogramm Minimalbeispiel";
-$locale["Simple jabber presence plugin"] =
-   "Einfaches Jabber-Anwesenheits Zusatzprogramm";
-$locale["Since you started the deletion process, someone has saved a new version of %s.  Please check to make sure you still want to permanently remove the page from the database."] =
-   "Während Sie den Löschungsprozess begonnen haben, hat jemand anderer eine neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch von der Datenbank permanent löschen wollen.";
-$locale["SiteMap"] =
-   "SeitenÜbersicht";
-$locale["Size"] =
-   "Größe";
-$locale["Size:"] =
-   "Größe:";
-$locale["Skipped."] =
-   "Ausgelassen.";
-$locale["Skipping"] =
-   "Übersprungen";
-$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."] =
-   "Einige der Änderungen konnten nicht automatisch miteinander verbunden werden. Bitte suchen Sie nach den Teilen, die mit »%s« anfangen und mit »%s« enden. Sie müssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern klicken.";
-$locale["Someone has edited the page!"] =
-   "Jemand hat die Seite bereits bearbeitet!";
-$locale["Sorry but this file is too big."] =
-   "Leider ist diese Datei zu groß.";
-$locale["Sorry for the inconvenience."] =
-   "Entschuldigen Sie bitte die hiermit für Sie verbundenen Unannehmlichkeiten.";
-$locale["Sorry! You must wait at least 20 minutes until you can vote again!"] =
-   "Leider! Du kannst erst wieder in 20 Minuten wählen!";
-$locale["Sorry, no dynamic DB Session support."] =
-   "Leider! Dynamische DB Session Unterstützung nicht vorhanden.";
-$locale["Sorry, this version of PHP cannot create PNG image files."] =
-   "Das geht leider nicht. Diese PHP Version kann keine PNG Bilder erzeugen.";
-$locale["Sort by %s"] =
-   "Sortiere nach %s";
-$locale["Sound Score"] =
-   "Aussprachliche";
-$locale["Spam Prevention"] =
-   "AntiSpam";
-$locale["SpamAssassin reports: "] =
-   "SpamAssassin sagt: ";
-$locale["Spelling Score"] =
-   "Buchstabierende";
-$locale["SqlResult"] =
-   "SqlErgebnis";
-$locale["Statistics about %s."] =
-   "Statistik über %s.";
-$locale["Status:"] =
-   "Gültigkeit:";
-$locale["Strike"] =
-   "Durchstreichen";
-$locale["Strike-through text"] =
-   "Durchgestrichen";
-$locale["String \"%s\" not found."] =
-   "Zeichenkette \"%s\" nicht gefunden.";
-$locale["SubPages of %s:"] =
-   "Unterseiten von %s:";
-$locale["Submit"] =
-   "Eingeben";
-$locale["Submit country"] =
-   "Land eingeben";
-$locale["Submit location"] =
-   "Land eingeben";
-$locale["Subpage"] =
-   "Unterseite";
-$locale["Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"] =
-   "Substring \"\\1\" \\2 mal gefunden. Ersetze mit \"\\3\"?";
-$locale["Summary"] =
-   "Zusammenfassung";
-$locale["Supplanted on:"] =
-   "Ersetzt am:";
-$locale["Support moderated pages"] =
-   "Unterstütze moderierte Seiten";
-$locale["Supported handlers are: %s"] =
-   "Unterstützte DBA Methoden sind: %s";
-$locale["Supported languages"] =
-   "Unterstützte Sprachen";
-$locale["Supported themes"] =
-   "Unterstützte Benutzeroberfläche";
-$locale["Switch to detailed list"] =
-   "Wechsle zu detallierter Liste";
-$locale["Switch to summary"] =
-   "Zur Übersicht wechseln";
-$locale["Synopsis"] =
-   "Übersicht";
-$locale["Syntax language not specified."] =
-   "Keine Syntax angegeben.";
-$locale["SyntaxHighlighter"] =
-   "SyntaxHervorhebung";
-$locale["Table of Contents"] =
-   "Inhaltsverzeichnis";
-$locale["Table of content"] =
-   "Inhaltsverzeichnis";
-$locale["Template"] =
-   "Vorlage";
-$locale["Template Name"] =
-   "Vorlagenname";
-$locale["TermsOfUse"] =
-   "BenutzungsBedingungen";
-$locale["TextFormattingRules"] =
-   "TextFormatierungsRegeln";
-$locale["Thank you for editing %s."] =
-   "Danke für das Bearbeiten von %s.";
-$locale["Thanks for adding this translation!"] =
-   "Danke für diese Übersetzung!";
-$locale["Thanks for participating!"] =
-   "Danke für die Teilnahme!";
-$locale["The %d least popular pages of this wiki:"] =
-   "Die %d selten besuchten Seiten dieses Wikis:";
-$locale["The %d most popular pages of this wiki:"] =
-   "Die %d meistbesuchten Seiten dieses Wikis:";
-$locale["The %d most recent %s are listed below."] =
-   "Die %d jüngste %s sind unten aufgelistet.";
-$locale["The %d most recent %s during the past %s days are listed below."] =
-   "Die %d jüngste %s innerhalb der letzten %s Tage sind unten aufgelistet.";
-$locale["The %d most recent %s during the past day are listed below."] =
-   "Die %d jüngste %s innerhalb des letzten Tages sind unten aufgelistet.";
-$locale["The %d oldest %s are listed below."] =
-   "Die %d älteste %s sind unten aufgelistet.";
-$locale["The %d oldest %s during the past %s days are listed below."] =
-   "Die %d älteste %s innerhalb der letzten %s Tage sind unten aufgelistet.";
-$locale["The %d oldest %s during the past day are listed below."] =
-   "Die %d älteste %s innerhalb des letzten Tages sind unten aufgelistet.";
-$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!"] =
-   "Die %s Dateien liegen im Verzeichnis %s. Bitte lesen Sie jetzt zuerst die INSTALL Anleitung und verschieben Sie danach die DB Datei an einen anderen endgültigen Speicherplatz, Sie laufen sonst Gefahr, alle Seiten zu verlieren.";
-$locale["The %s subpage enables simple weblogging."] =
-   "Die %s UnterSeite ermöglicht ein einfaches Weblog.";
-$locale["The DBA handler %s is unsupported!"] =
-   "Die DBA Methode %s wird nicht unterstützt!";
-$locale["The ICAO '%s' wasn't recognized."] =
-   "Die angegebene ICAO »%s« war nicht bekannt.";
-$locale["The PhpWeather plugin provides weather reports from the Internet."] =
-   "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet.";
-$locale["The PhpWiki access log file"] =
-   "Die PhpWiki Zugriffslog Datei";
-$locale["The SQL_ACCESS_LOG is not enabled."] =
-   "SQL_ACCESS_LOG ist nicht aktiviert.";
-$locale["The current page has no subpages defined."] =
-   "Diese Seite hat keine zugewiesenen Unterseiten.";
-$locale["The current time at the server is %s."] =
-   "Die Uhrzeit am Server ist gerade %s.";
-$locale["The length of the password is shorter than the system policy allows."] =
-   "Die Länge des Passwortes ist kürzer als vom System gefordert.";
-$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."] =
-   "Die Länge des gespeicherten Passwortes ist kürzer als vom System gefordert.Sie können sich leider nicht anmelden.\n Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen.";
-$locale["The most recent %s during the past %s days are listed below."] =
-   "Die jüngste %s innerhalb der letzten %s Tage sind unten aufgelistet.";
-$locale["The most recent %s during the past day are listed below."] =
-   "Die jüngste %s innerhalb des letzten Tages sind unten aufgelistet.";
-$locale["The newest registered user is %s."] =
-   "Wir haben insgesamt %d registrierte Benutzer.";
-$locale["The requested information is available only to Administrators."] =
-   "Diese Information ist nur für Administratoren zugänglich.";
-$locale["The result of this poll so far:"] =
-   "Aktuelle Ergebnisse der Umfrage:";
-$locale["The session.save_path directory"] =
-   "Das session.save_path Verzeichnis";
-$locale["Theme"] =
-   "Benutzeroberfläche";
-$locale["There is already a file with name %s uploaded."] =
-   "Es existiert schon eine gleichnamige, hochgeladene Datei %s.";
-$locale["There is no image creation data available to id '%s'. Please reload referring page."] =
-   "Es sind keine Bilddaten vorhanden für '%'. Bitte laden Sie die Seite neu.";
-$locale["These page titles match fuzzy with '%s'"] =
-   "Diese Seitentitel sind das Ergebnis der FuzzySuche nach »%s«.";
-$locale["These pages share an initial or final title word with '%s'"] =
-   "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«";
-$locale["This data is based on users active over the past %s."] =
-   "Diese Daten basieren auf den Benutzern für die letzten %s.";
-$locale["This is a minor change."] =
-   "Kleinere Änderung.";
-$locale["This page edit seems to contain spam and was therefore not saved."] =
-   "Diese Bearbeitung scheint Spam beinzuhalten und wurde ignoriert.";
-$locale["This page has been locked by the administrator so your changes can not be saved."] =
-   "Diese Seite wurde vom Administrator für die allgemeine Bearbeitung gesperrt. Ihre Änderungen können deshalb nicht gespeichert werden.";
-$locale["Those"] =
-   "Diese";
-$locale["Time Zone"] =
-   "Zeitzone";
-$locale["Title"] =
-   "Titel";
-$locale["Title 1"] =
-   "Titel 1";
-$locale["Title 2"] =
-   "Titel 2";
-$locale["Title 3"] =
-   "Titel 3";
-$locale["Title Search"] =
-   "TitelSuche";
-$locale["Title search results for '%s'"] =
-   "Titel-Suchresultate nach »%s«";
-$locale["Title:"] =
-   "Titel:";
-$locale["TitleSearch"] =
-   "TitelSuche";
-$locale["To add check 'Add' near the dropdown list."] =
-   "Setze '+' um ACL Zeile hinzufügen.";
-$locale["To ignore delete the line."] =
-   "Lösche Zeile mit 'X' um ACL Eintrag zu ignorieren.";
-$locale["Today"] =
-   "Heute";
-$locale["Too many external links."] =
-   "Zu viele externe Links.";
-$locale["Top & bottom toolbars"] =
-   "Obere u. untere Werkzeugleisten";
-$locale["Top Recommendations"] =
-   "Beste Bewertungungen";
-$locale["Topic"] =
-   "Thema";
-$locale["Total %d plugins: "] =
-   "%d Gesamte Zusatzprogramme: ";
-$locale["Total of %d languages: "] =
-   "%d Sprache gesamt: ";
-$locale["Total of %d themes: "] =
-   "%d Benutzeroberfläche gesamt: ";
-$locale["Transclude"] =
-   "Einbetten";
-$locale["TranscludePlugin"] =
-   "EinbettenPlugin";
-$locale["Transcluded from %s"] =
-   "Eingebetteter Text von %s";
-$locale["Transcluded page"] =
-   "Eingebettete Seite";
-$locale["Translate"] =
-   "Übersetzen";
-$locale["Translate %s to %s in %s"] =
-   "Übersetze '%s' nach '%s' in %s";
-$locale["Translate '%s' to '%s' in *%s*"] =
-   "Übersetze '%s' nach '%s' in *%s*";
-$locale["TranslateText"] =
-   "ÜbersetzeText";
-$locale["Translation Error!"] =
-   "Übersetzungsfehler!";
-$locale["Type"] =
-   "Typ";
-$locale["Type it again"] =
-   "Bitte hier wiederholen";
-$locale["UNOBTAINABLE"] =
-   "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 open directory '%s' for reading"] =
-   "Konnte Verzeichnis »%s« nicht zum Lesen öffnen";
-$locale["Unable to read src='%s'"] =
-   "Konnte src='%s' nicht lesen";
-$locale["Undefined method %s for special group %s"] =
-   "Undefinierte Methode %s für Spezialgruppe %s";
-$locale["Undo"] =
-   "Rückgängig";
-$locale["Undo Search & Replace"] =
-   "Suchen & Ersetzen rückgängig machen";
-$locale["Undo disabled"] =
-   "Undo deaktiviert";
-$locale["Unexpected EOF in zip file"] =
-   "Unerwartetes Dateiende (EOF-Fehler) in ZIP-Datei";
-$locale["UnfoldSubpages"] =
-   "UnterseitenEntfalten";
-$locale["UnfoldSubpagesPlugin"] =
-   "UnterseitenEntfaltenPlugin";
-$locale["Unknown special group '%s'"] =
-   "Unbekannte Spezialgruppe »%s«";
-$locale["Unlock"] =
-   "Entsperren";
-$locale["Unlock Page"] =
-   "Seite Freigeben";
-$locale["Unlocking pages"] =
-   "Die Seitenfreigabe in diesem Wiki";
-$locale["Unrecognised parameter 'mode=%s'"] =
-   "Ungültiges Argument 'mode=%s'";
-$locale["Unsupported ACL access type %s ignored."] =
-   "Nicht unterstützter ACL Zugiffsmodus %s ignoriert.";
-$locale["Unsupported argument: %s=%s"] =
-   "Nicht unterstütztes Argument: %s=%s";
-$locale["Unsupported format argument %s"] =
-   "Nicht unterstützter format Parameter %s";
-$locale["Up"] =
-   "Oben";
-$locale["UpLoad"] =
-   "HochLaden";
-$locale["UpLoadPlugin"] =
-   "HochLadenPlugin";
-$locale["Update Preferences"] =
-   "Einstellungen Speichern";
-$locale["Upgrade"] =
-   "Updaten";
-$locale["Upload"] =
-   "Hochladen";
-$locale["Upload File"] =
-   "Datei Hochladen";
-$locale["Uploading %s"] =
-   "%s wird hochgeladen";
-$locale["Uploading failed."] =
-   "Hochladen fehlgeschlagen.";
-$locale["Uploading zip dumps"] =
-   "Das Hochladen von ZIP-Dumps in diesem Wiki";
-$locale["Use old markup"] =
-   "Alte Formatierungssyntax verwenden";
-$locale["User not found in LDAP"] =
-   "Benutzer in LDAP nicht gefunden";
-$locale["User page"] =
-   "Benutzer Seite";
-$locale["User statistics"] =
-   "Benutzer Statistiken";
-$locale["UserId"] =
-   "Benutzername";
-$locale["UserId:"] =
-   "Benutzername:";
-$locale["UserPreferences"] =
-   "BenutzerEinstellungen";
-$locale["UserRatings"] =
-   "BenutzerBewertungen";
-$locale["Users will not be able to sign in."] =
-   "Benutzer werden sich nicht anmelden können.";
-$locale["Using directory '%s'"] =
-   "Das Verzeichnis »%s« wird verwendet";
-$locale["Verification Status"] =
-   "Bestätigungs-Status";
-$locale["Verify the current action"] =
-   "Bestätigen Sie die gegenwärtige Aktion";
-$locale["Version"] =
-   "Version";
-$locale["Version %d"] =
-   "Version %d.";
-$locale["Version %s"] =
-   "Version %s.";
-$locale["Version %s, saved %s"] =
-   "Version %s. %s gespeichert";
-$locale["Version %s, saved on %s"] =
-   "Version %s. gespeichert am %s";
-$locale["Versions are identical"] =
-   "Versionen sind identisch";
-$locale["View Source"] =
-   "QuellTextAnsicht";
-$locale["View Source: %s"] =
-   "Quelltext Ansicht: %s";
-$locale["View a single page dump online."] =
-   "Betrachte das interne Speicherformat einer einzelnen Seite.";
-$locale["View the current version"] =
-   "Die aktuelle Version ansehen";
-$locale["View this page and all subpages"] =
-   "Anzeige aller Seiten und Unterseiten";
-$locale["Viewing redirecting page."] =
-   "Zeige Redirekt-Seite.";
-$locale["Viewing the source of pages"] =
-   "Die Quelltextansicht der Seiten in diesem Wiki";
-$locale["Visited pages on this wiki, ordered by popularity:"] =
-   "Die besuchten Seiten dieses Wikis, nach Popularität geordnet:";
-$locale["W"] =
-   "Br.";
-$locale["WARNING: InterWikiMap page is unlocked, so not using those links."] =
-   "ACHTUNG: Die InterWikiListe Seite ist ungesperrt. Ignoriert.";
-$locale["Wanted From"] =
-   "Benötigt von";
-$locale["Wanted Pages for %s (%d total):"] =
-   "WunschZettelSeiten für %s (%d gesamt):";
-$locale["Wanted Pages for %s:"] =
-   "WunschZettelSeiten für %s:";
-$locale["Wanted Pages in this wiki (%d total):"] =
-   "WunschZettelSeiten in diesem Wiki (%d gesamt):";
-$locale["Wanted Pages in this wiki:"] =
-   "WunschZettelSeiten in diesem Wiki:";
-$locale["WantedPages"] =
-   "WunschZettelSeiten";
-$locale["Warning:"] =
-   "Achtung:";
-$locale["Warning: The search string cannot be empty!"] =
-   "Achtung! Das Suchwort darf nicht leer sein!";
-$locale["Warning: You are editing an old revision."] =
-   "Achtung: Sie bearbeiten eine alte Version.";
-$locale["We have a total of %d registered users."] =
-   "Wir haben insgesamt %d registrierte Benutzer.";
-$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] =
-   "Willkommen bei %s!\nIhr E-Mail Konto ist bestätigt und\nwird benutzt, um SeitenÄnderungs Benachrichtigungen per E-Mail zu versenden.\nSiehe %s";
-$locale["What links here"] =
-   "Was verlinkt hierher";
-$locale["Who Is Online"] =
-   "Wer ist Online";
-$locale["Who is online"] =
-   "Wer ist Online";
-$locale["WhoIsOnline"] =
-   "WerIstOnline";
-$locale["Width"] =
-   "Breite";
-$locale["Wiki Name"] =
-   "Name des Wikis";
-$locale["WikiAdminChmod"] =
-   "WikiAdminChmod";
-$locale["WikiAdminChown"] =
-   "WikiAdminChown";
-$locale["WikiAdminMarkup"] =
-   "WikiAdminFormatierung";
-$locale["WikiAdminRemove"] =
-   "WikiAdminLöschen";
-$locale["WikiAdminRename"] =
-   "WikiAdminUmbenennen";
-$locale["WikiAdminSearchReplace"] =
-   "WikiAdminSuchenErsetzen";
-$locale["WikiAdminSelect"] =
-   "WikiAdminAuswahl";
-$locale["WikiAdminSetAcl"] =
-   "WikiAdminAclSetzen";
-$locale["WikiAdminUtils"] =
-   "WikiAdminUtils";
-$locale["WikiAdminUtils %s returned:"] =
-   "WikiAdminUtils %s gibt zurück:";
-$locale["WikiBlog"] =
-   "WikiBlog";
-$locale["WikiBlogPlugin"] =
-   "WikiBlogPlugin";
-$locale["WikiDB::renamePage() not yet implemented for this backend"] =
-   "WikiDB::renamePage() für dieses Backend noch nicht implementiert";
-$locale["WikiForm"] =
-   "WikiFormular";
-$locale["WikiForm: %s: unknown action"] =
-   "WikiForm: %s: unbekannte Aktion";
-$locale["WikiForum"] =
-   "WikiForum";
-$locale["WikiPlugin"] =
-   "WikiPlugin";
-$locale["WikiPoll"] =
-   "WikiUmfrage";
-$locale["WikiWikiWeb"] =
-   "WikiWikiWeb";
-$locale["Wikiname regexp"] =
-   "Wikiname regexp";
-$locale["With the current offset, this would be reported as %s."] =
-   "Mit dem eingegebenen Zeit-Unterschied, würde die Zeit %s angezeigt.";
-$locale["Wk"] =
-   "Cw";
-$locale["Wrong password. Try again."] =
-   "Falsches Password. Noch einmal eingeben.";
-$locale["Wrong password: "] =
-   "Falsches Password: ";
-$locale["XML-RPC access"] =
-   "XML-RPC Zugriff";
-$locale["Yes"] =
-   "Ja";
-$locale["You are about to remove '%s'!"] =
-   "Sie sind im Begriff »%s« zu löschen!";
-$locale["You are signed but not authenticated as %s. "] =
-   "Angemeldet aber nicht authentifiziert als %s.";
-$locale["You are signed in as %s"] =
-   "Sie sind angemeldet als %s";
-$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 können 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 können sich mit jedem gewünschten [WikiWort|SeitenErzeugen] als Benutzernamen ins Wiki eintragen. (Auch %s u. deutsche Umlaute sind zulässig). Der Benutzername wird in NeuesteÄnderungen als Link auf Ihre Homepage verwendet.";
-$locale["You must be an administrator to %s."] =
-   "Sie müssen Administratorrechte haben %s.";
-$locale["You must be an administrator to use this plugin."] =
-   "Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen.";
-$locale["You must be logged in to view ratings."] =
-   "Sie müssen sich anmelden um die Bewertungen zu sehen.";
-$locale["You must sign in to %s."] =
-   "Sie müssen sich anmelden %s.";
-$locale["You must specify a directory to dump to"] =
-   "Sie müssen zum Sichern ein Verzeichnis angeben.";
-$locale["You must wait for moderator approval."] =
-   "Sie müssen auf die Zustimmung des Moderators warten.";
-$locale["You need to specify the userid!"] =
-   "Sie müssen den Benutzernamen angeben!";
-$locale["You stored an empty password in your '%s' page."] =
-   "Sie haben ein leeres Passwort in Ihrer HomePage »%s« gespeichert.";
-$locale["Your E-Mail:"] =
-   "Ihre E-Mail-Adresse:";
-$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] =
-   "Ihr WikiDB DB backend '%s' wird von DbSession nicht unterstützt.";
-$locale["Your access permissions are only for a BogoUser."] =
-   "Ihre Zugriffsberechtigung entspricht lediglich einem BogoUser.";
-$locale["Your are probably trying to edit/create an invalid version of this page."] =
-   "Sie versuchen offenbar eine ungültige Version dieser Seite zu bearbeiten.";
-$locale["Your careful attention to detail is much appreciated."] =
-   "Die besondere Aufmerksamkeit, die Sie soeben der Bearbeitung dieser Seite gewidmet haben, wird von allen Benutzern dieses Wikis gern gesehen und hoch geschätzt.";
-$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."] =
-   "Ihre Änderungen können so, wie sie sind, nicht gespeichert werden. Das hätte unzulässigerweise die bereits gesicherten Änderungen des anderen Autors überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors miteinander kombiniert worden. Das Ergebnis sehen Sie unten.";
-$locale["Your home page has not been created yet so your preferences cannot not be saved."] =
-   "Sie haben Ihre persönliche HomePage Seite noch nicht erstellt, deshalb können Ihre Einstellungen nicht gespeichert werden.";
-$locale["Your home page is locked so your preferences cannot not be saved."] =
-   "Ihre persönliche HomePage Seite ist gesperrt, deshalb können Ihre Änderungen nicht gespeichert werden.";
-$locale["Your rating was %.1f"] =
-   "Deine Bewertung war %.1f";
-$locale["Your signature"] =
-   "Deine Signatur";
-$locale["Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation."] =
-   "Dein übersetzter Text erscheint noch nicht in %s, aber ein Administrator wird sich darum kümmern.";
-$locale["Your translation is stored in %s"] =
-   "Deine Übersetzung ist in %s abgespeichert";
-$locale["Your version"] =
-   "Ihre Version";
-$locale["ZIP files of database"] =
-   "Speichern und Archivieren";
-$locale["[%d] See [%s]"] =
-   "[%d] Siehe [%s]";
-$locale["[not purgable]"] =
-   "[nicht entfernbar]";
-$locale["[purged]"] =
-   "[entfernt]";
-$locale["_WikiTranslation"] =
-   "_WikiÜbersetzung";
-$locale["access this wiki via SOAP"] =
-   "um via SOAP auf dieses Wiki zuzugreifen";
-$locale["access this wiki via XML-RPC"] =
-   "um via XML-RPC auf dieses Wiki zuzugreifen";
-$locale["add "] =
-   "hinzufügen ";
-$locale["argument '%s' not declared by plugin"] =
-   "Argument »%s« nicht im Zusatzprogramm deklariert";
-$locale["authenticated"] =
-   "authentifizierten";
-$locale["blog"] =
-   "Blog";
-$locale["by"] =
-   "mit";
-$locale["by %s"] =
-   "von %s";
-$locale["cached pagedata:"] =
-   "Seitendaten in den Cachespeicher aufgenommen:";
-$locale["cached versiondata:"] =
-   "Versionendaten in den Cachespeicher aufgenommen:";
-$locale["change page '%s' to markup type '%s'."] =
-   "Formatierung der Seite '%s' auf '%s' geändert.";
-$locale["chmod page '%s' to '%s'."] =
-   "Berechtigung der Seite '%s' auf '%s' geändert.";
-$locale["comments"] =
-   "Kommentare";
-$locale["compare revisions"] =
-   "Versionen vergleichen";
-$locale["content is identical to current version %d - no new revision created"] =
-   "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version erzeugt";
-$locale["couldn't move %s to %s"] =
-   "Kann »%s« nicht nach »%s« verschieben";
-$locale["couldn't open file '%s' for writing"] =
-   "Datei »%s« konnte nicht zum Schreiben geöffnet werden";
-$locale["create this page"] =
-   "um diese Seite zu erzeugen";
-$locale["current version"] =
-   "aktuelle Version";
-$locale["days"] =
-   "Tage";
-$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["dump html pages"] =
-   "um von diesem Wiki HTML-Dateien lokal abzuspeichern";
-$locale["dump serial pages"] =
-   "um von diesem Wiki die Seiten lokal abzuspeichern";
-$locale["edit area"] =
-   "Texteingabe Fenster";
-$locale["edit this page"] =
-   "um diese Seite zu bearbeiten";
-$locale["edits"] =
-   "Änderungen";
-$locale["empty source"] =
-   "fehlender Quelltext";
-$locale["fixed"] =
-   "Geändert";
-$locale["from"] =
-   "von";
-$locale["from %s"] =
-   "von %s";
-$locale["has edit conflicts - overwriting anyway"] =
-   "hat unauflösbare Konflikte beim Speichern - wird ungeprüft überschrieben";
-$locale["has edit conflicts - skipped"] =
-   "hat unauflösbare Konflikte beim Speichern - übersprungen";
-$locale["home page"] =
-   "Start Seite";
-$locale["hours"] =
-   "Stunden";
-$locale["http://www.example.com|optional label"] =
-   "http://www.example.com|optionaler Name";
-$locale["incoming"] =
-   "eingehend";
-$locale["invalid %s ignored"] =
-   "ungültiges %s ignoriert";
-$locale["invalid argument %s"] =
-   "Ungültiger Parameter %s";
-$locale["latest comment by "] =
-   "Letzter Kommentar von ";
-$locale["load files into this wiki"] =
-   "um Seiten in dieses Wiki zu laden";
-$locale["lock this page"] =
-   "um diese Seite zu sperren";
-$locale["locked"] =
-   "gesperrt";
-$locale["major edits"] =
-   "Größere Änderungen";
-$locale["max: %d"] =
-   "Max: %d";
-$locale["mean: %2.3f"] =
-   "Mittel: %2.3f";
-$locale["median: %d"] =
-   "Median: %d";
-$locale["minor"] =
-   "kleinere";
-$locale["minor edit"] =
-   "geringfügige";
-$locale["minor edits"] =
-   "Kleinere Änderungen";
-$locale["minutes"] =
-   "Minuten";
-$locale["missing required version argument"] =
-   "Parameter version muß angegeben werden";
-$locale["new window"] =
-   "neues Fenster";
-$locale["newer than the existing page."] =
-   "neuer als die bestehende Seite.";
-$locale["no RSS items"] =
-   "keine RSS Einträge";
-$locale["no cache used"] =
-   "kein Cache verwendet";
-$locale["no page content"] =
-   "leerer Seiteninalt";
-$locale["no page specified"] =
-   "Keine Seite angegeben";
-$locale["not affected"] =
-   "nicht betroffen";
-$locale["not authenticated"] =
-   "nicht authentifizierten";
-$locale["not yet"] =
-   "noch nicht";
-$locale["older than the existing page."] =
-   "älter als die bestehende Seite.";
-$locale["only %d pages displayed"] =
-   "nur %d Seiten angezeigt";
-$locale["outgoing"] =
-   "ausgehend";
-$locale["page not locked"] =
-   "Seite nicht gesperrt";
-$locale["page permission inherited from %s"] =
-   "Zugriffsrecht geerbt von %s";
-$locale["plain file %s"] =
-   "Nur-Text-Datei %s";
-$locale["predecessor to the previous major change"] =
-   "Vorgänger zur vorherigen größeren Änderung";
-$locale["previous revision"] =
-   "vorige Neubearbeitung";
-$locale["purge this page"] =
-   "um diese Seite endgültig zu löschen";
-$locale["recursive inclusion of page %s"] =
-   "Fehler beim Einbetten der Seite %s: Rekursiver Selbstaufruf der Seite";
-$locale["recursive inclusion of page %s ignored"] =
-   "Fehler beim Einfügen der Seite %s: rekursiver Selbstaufruf ignoriert";
-$locale["recursive inclusion of url %s"] =
-   "Fehler beim Aufruf der Seite %s: Rekursion (sich selbst aufrufend)";
-$locale["remove this page"] =
-   "um diese Seite zu löschen";
-$locale["rename this page"] =
-   "um diese Seite umzubennen";
-$locale["renamed from %s"] =
-   "umbenannt von %s";
-$locale["reverse"] =
-   "umdrehen";
-$locale["revert to a previous version of this page"] =
-   "Zurückspeichern einer älteren Version dieser Seite.";
-$locale["revert to version %d"] =
-   "Speichere Version %d zurück.";
-$locale["revision by previous author"] =
-   "Revidierte Ausgabe des vorigen Autors";
-$locale["same version page"] =
-   "selbe Version der Seite";
-$locale["saved as "] =
-   "gespeichert als ";
-$locale["saved as %s"] =
-   "gespeichert als %s";
-$locale["sent to %s"] =
-   "an %s gesendet";
-$locale["stddev: %2.3f"] =
-   "Standardabweichung: %2.3f";
-$locale["the file '%s'"] =
-   "die Datei %s";
-$locale["the session.save_path directory '%s'"] =
-   "das session.save_path Verzeichnis »%s«";
-$locale["to"] =
-   "nach";
-$locale["today"] =
-   "heute";
-$locale["too long"] =
-   "zu lang";
-$locale["total hits: %d"] =
-   "Anzahl aller Seitenaufrufe %d";
-$locale["trailing cruft in plugin args: '%s'"] =
-   "Überflüssiger Müll in den Zusatzprogramm Argumenten: »%s«";
-$locale["unknown color %s ignored"] =
-   "unbekannte Farbe %s ignoriert";
-$locale["unlock this page"] =
-   "um diese Seite zu entsperren";
-$locale["upload a zip dump"] =
-   "um einen ZIP-Speicherauszug in dieses Wiki zu laden";
-$locale["uploaded %s"] =
-   "%s wurde hochgeladen";
-$locale["use"] =
-   "benutze";
-$locale["use this plugin"] =
-   "um diese Zusatzprogramme zu verwenden";
-$locale["users"] =
-   "Benutzer";
-$locale["verify the current action"] =
-   "um die gegenwärtige Aktion durchzuführen";
-$locale["version %d"] =
-   "Version %d.";
-$locale["version %s"] =
-   "Version %s";
-$locale["version <em>%s</em>"] =
-   "version <em>%s</em>";
-$locale["version <em>%s</em> not affected"] =
-   "version <em>%s</em> nicht betroffen";
-$locale["view the source of this page"] =
-   "um den Quelltext dieser Seiten anzusehen";
-$locale["view this page"] =
-   "um diese Seite anzuzeigen";
-$locale["weeks"] =
-   "Wochen";
+$locale["  %d%% (%d/%d)"] = "  %d%% (%d/%d)";
+$locale[" %s AUTH ignored."] = "%s AUTH ignoriert.";
+$locale[" (to pages linked from \"%s\")"] = "(auf Seiten verlinkt von \"%s\")";
+$locale[" ... around %s"] = "... cirka %s";
+$locale[" ... first %d bytes"] = " ... erste %d Bytes";
+$locale[" ... first %d lines"] = " ... erste %d Zeilen";
+$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d Tage aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als %d einzelne Autoren Revisionen.";
+$locale[" Keep the latest contributions of the last %d authors up to %d days."] = "Aufbewahrung der neueren Beiträge der letzten %d Autoren für %d Tage.";
+$locale[" Keep up to %d minor edits, but keep them no longer than %d days."] = "Aufbewahrung kleinerer Änderungen für %d, aber nicht länger als %d Tage.";
+$locale[" Skipped"] = "Ausgelassen";
+$locale[" Sorry, cannot merge."] = " Konnte leider nicht automatisch einpflegen.";
+$locale[" and "] = " und  ";
+$locale[" is identical."] = " sind identisch.";
+$locale[" replace "] = " ersetze mit ";
+$locale[" skipped"] = " ausgelassen";
+$locale["%4d  %s\n"] = "%4d  %s\n";
+$locale["%d UserPreferences fields successfully updated."] = "%d BenutzerEinstellungen erfolgreich auf neuesten Stand gebracht.";
+$locale["%d best incoming links: "] = "Die %d besten hereinkommenden Links: ";
+$locale["%d best outgoing links: "] = "Die %d besten hinausgehenden Links: ";
+$locale["%d homepages"] = "%d Homepages";
+$locale["%d minutes"] = "%d Minuten";
+$locale["%d most popular nearby: "] = "Die %d meistbesuchten Seiten in der Nähe: ";
+$locale["%d not-empty pages"] = "%d nicht leere Seiten";
+$locale["%d online users"] = "%d Benutzer Online";
+$locale["%d page(s) with more than %d hits (>%d%%)."] = "%d Seite(n) die mehr als %d aufgerufen haben (>%d%%).";
+$locale["%d pages"] = "%d Seiten";
+$locale["%d pages have been changed."] = "%d Seiten wurden geändert.";
+$locale["%d pages have been changed:"] = "%d Seiten wurden geändert.";
+$locale["%d pages have been permanently purged:"] = "%d Seiten wurden unwiderruflich gelöscht.";
+$locale["%d pages have been removed:"] = "%d Seiten wurden geändert.";
+$locale["%d pages have been renamed:"] = "%d Seiten wurden geändert.";
+$locale["%d pages with less than %d hits (<%d%%)."] = "%d Seiten die weniger als %d aufgerufen haben (<%d%%).";
+$locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] = "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht zugelassen.";
+$locale["%s KiB (%s bytes)"] = "%s KiB (%s Bytes)";
+$locale["%s already exists"] = "%s existiert bereits";
+$locale["%s at %s"] = "%s um %s";
+$locale["%s by %s"] = "%s von %s";
+$locale["%s bytes"] = "%s Bytes";
+$locale["%s bytes written"] = "%s Bytes geschrieben";
+$locale["%s days"] = "%s Tagen";
+$locale["%s does not appear to be a WikiPlugin."] = "%s scheint kein Zusatzprogramm zu sein.";
+$locale["%s does not exist"] = "%s existiert nicht";
+$locale["%s does not know about the language '%s', using 'en' instead."] = "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet.";
+$locale["%s has no subpages defined."] = "%s hat keine zugewiesenen Unterseiten.";
+$locale["%s is disallowed on this wiki."] = "»%s« ist auf diesem Wiki nicht zugelassen.";
+$locale["%s is empty"] = "%s ist leer";
+$locale["%s is empty."] = "%s ist leer.";
+$locale["%s is listed at %s with %s"] = "%s ist gelistet auf %s mit %s";
+$locale["%s is missing"] = "%s Argument fehlt";
+$locale["%s is not locked!"] = "%s ist nicht gesperrt!";
+$locale["%s is not writable."] = "%s is nicht änderbar.";
+$locale["%s is only allowed in locked pages."] = "%s wird/werden nur in gesperrten Seiten erlaubt.";
+$locale["%s not defined"] = "%s nicht definiert";
+$locale["%s not found"] = "%s nicht gefunden";
+$locale["%s not found in %s"] = "%s nicht gefunden in %s";
+$locale["%s of this page"] = "%s von dieser Seite";
+$locale["%s on %s:"] = "%s um %s:";
+$locale["%s or %s parameter missing"] = "%s oder %s Argument fehlt";
+$locale["%s pages link to %s:"] = "%s Seiten sind mit %s verlinkt:";
+$locale["%s pages would link to %s:"] = "%s Seiten würden mit %s verlinkt sein:";
+$locale["%s parameter missing"] = "%s Argument fehlt";
+$locale["%s words"] = "%s Wörter";
+$locale["%s: %s"] = "%s: %s";
+$locale["%s: Bad action"] = "%s: Ungültige Aktion";
+$locale["%s: Can't open dba database"] = "%s: Konnte DBA Datenbank nicht öffnen";
+$locale["%s: Date of new revision is %s"] = "%s: Datum dieser aktuellen Neubearbeitung ist %s";
+$locale["%s: argument index out of range"] = "%s: Ungültiger Index in Array";
+$locale["%s: error while handling error:"] = "%s: Fehler während der Fehlerbehandlung von:";
+$locale["%s: file not found"] = "»%s«: Datei nicht gefunden";
+$locale["%s: no such class"] = "Unbekannte Klasse: »%s«";
+$locale["%s: no such revision %d."] = "%s(%d): keine solche Version";
+$locale["%s: not a subclass of WikiPlugin."] = "%s scheint kein WikiPlugin zu sein.";
+$locale["%s: not defined"] = "%s: nicht definiert";
+$locale["&version=-1 might help."] = "&version=-1 wird empfohlen.";
+$locale["' in page name."] = "' in Seitenname.";
+$locale["'%s' is no ModeratedPage anymore."] = "'%s' ist keine ModeratierteSeite mehr.";
+$locale["'%s': Bad page name"] = "»%s«: Ungültiger Seitenname";
+$locale["'%s': Bad page name: %s"] = "»%s«: Ungültiger Seitenname: %s";
+$locale["'%s': corrupt file"] = "»%s«: Datei korrumpiert";
+$locale["'s %d page ratings:"] = "s %d Seiten Bewertungen:";
+$locale["(%d Links)"] = "(%d Verweise)";
+$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)";
+$locale["(Currently not working)"] = "(Funktioniert momentan nicht)";
+$locale["(Redirected from %s)"] = "(Weitergeleitet von %s)";
+$locale["(Your preferences are stored as hidden data within this page)."] = "(Ihre Einstellungen sind als versteckte Daten in dieser Seite hintergelegt).";
+$locale["(diff)"] = "(diff)";
+$locale["(disable individual page permissions, enable inheritance)?"] = "(deaktiviere individuelle Zugriffsrechte, aktiviere Vererbung)";
+$locale["(formatted for PhpWiki developers as pgsrc template, not for backing up)"] = "(formatiert für die PhpWiki Entwickler als pgsrc Vorlage, nicht zum Backup)";
+$locale["(formatted for backing up: all revisions)"] = "(formatiert zum Backup: Alle Versionen)";
+$locale["(max. recursion level: %d)"] = "(max. Rekursionstiefe: %d)";
+$locale["(normal formatting: latest revision only)"] = "(Normales Format: Nur aktuelle Version)";
+$locale[", Memory: %s"] = ", RAM: %s";
+$locale["- saved to database as version %d"] = "- in der Datenbank gespeichert als Version %d.";
+$locale["- version %d saved to database as version %d"] = "- version %d in der Datenbank gespeichert als Version %d.";
+$locale["... (first %s words)"] = "... (erste %s Wörter)";
+$locale["... copied to %s"] = "... kopiert nach %s";
+$locale["... not copied to %s"] = "... nicht kopiert nach %s";
+$locale["... not found"] = "... nicht gefunden";
+$locale["1 day"] = "1 Tag";
+$locale["1 word"] = "1 Wort";
+$locale[": "] = ": ";
+$locale["<%s: no such section>"] = "<%s: unbekannte Sektion>";
+$locale["<<ModeratedPage ... >> not found in first line of %s"] = "<<ModeratedPage ... >> nicht in erster Zeile von %s gefunden";
+$locale["<empty>"] = "<leer>";
+$locale["<no matches>"] = "<nichts gefunden>";
+$locale["<none>"] = "<Keine>";
+$locale["<not displayed>"] = "<nicht angezeigt>";
+$locale["<system language>"] = "<Sprache des Servers>";
+$locale["<system theme>"] = "<Darstellung des Systems>";
+$locale["<unknown>"] = "<unbekannt>";
+$locale["A plugin to provide for raw HTML within wiki pages."] = "Einer Zusatzprogramm der reine HTML-Befehle im Wiki-Seiten abrufbar stellt.";
+$locale["A required argument '%s' is missing."] = "Erforderliches Argument »%s« fehlt.";
+$locale["ACCESS DENIED: You must log in to upload files."] = "ZUGRIFF VERWEIGERT: Bitte melden Sie sich erst an, um Dateien hochzuladen.";
+$locale["ACL"] = "ACL";
+$locale["ACL changed for page '%s'"] = "ACL für Seite '%s' geändert.";
+$locale["ACL changed for page '%s' from '%s' to '%s'."] = "ACL für Seite '%s' geändert von '%s' zu '%s'.";
+$locale["ACL not changed for page '%s'."] = "ACL für Seite '%s' nicht geändert.";
+$locale["ADDING"] = "HINZU";
+$locale["ADMIN"] = "ADMIN";
+$locale["ANON"] = "ANON";
+$locale["About"] = "Über";
+$locale["Access"] = "Zugriff";
+$locale["Access denied to change page '%s'."] = "Zugang verweigert um Seite '%s' zu ändern.";
+$locale["Access denied to rename page '%s'."] = "Zugang verweigert um Seite '%s' zu ändern.";
+$locale["Action Page"] = "Aktion Seite";
+$locale["Action page"] = "Aktion Seite";
+$locale["ActionPage"] = "Aktion Seite";
+$locale["Add %s hours to the server's local time when reporting times."] = "Addieren Sie %s Stunden zur lokalen Serverzeit, bei jeder Zeitanzeige (z.B. NeuesteÄnderungen).";
+$locale["Add %s:"] = "%s Hinzufügen:";
+$locale["Add Comment"] = "Neuer Kommentar";
+$locale["Add Image or Video"] = "Bild oder Video einfügen";
+$locale["Add Message"] = "Neue Nachricht";
+$locale["Add this ACL"] = "Füge diese ACL hinzu";
+$locale["AddCategory"] = "NeueKategorie";
+$locale["AddComment"] = "NeuerKommentar";
+$locale["AddPageLink"] = "SeitenLink einfügen";
+$locale["AddPlugin"] = "Plugin einfügen";
+$locale["AddTemplate"] = "NeueVorlage";
+$locale["Adjust"] = "Justieren";
+$locale["Admin"] = "Admin";
+$locale["Admin is also online."] = "Administrator ist auch online.";
+$locale["Administrators"] = "Administratoren";
+$locale["All %s are listed below."] = "Alle %s sind unten aufgelistet.";
+$locale["All pages"] = "Alle Seiten";
+$locale["All pages in this wiki (%d total):"] = "Alle Seiten in diesem Wiki (%d insgesamt):";
+$locale["All pages with all links in this wiki (%d total):"] = "Alle Seiten mit allen Links in diesem Wiki (%d insgesamt):";
+$locale["All users"] = "Alle Benutzer";
+$locale["AllPages"] = "AlleSeiten";
+$locale["AllPagesCreatedByMe"] = "AlleSeitenErzeugtVonMir";
+$locale["AllPagesLastEditedByMe"] = "AlleSeitenEditiertVonMir";
+$locale["AllPagesOwnedByMe"] = "AlleSeitenImBesitzVonMir";
+$locale["AllUsers"] = "AlleBenutzer";
+$locale["Allow / Deny"] = "Erlaube / Sperre";
+$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] = "Erlaubt die Auswahl mehrerer Seiten, die dann mit weiteren WikiAdmin Zusatzprogrammen bearbeitet werden.";
+$locale["Already logged in"] = "Bereits eingeloggt";
+$locale["Also pages which have been deleted at least %s days."] = "Auch Seiten, die in den letzten %s Tagen gelöscht wurden.";
+$locale["An unnamed PhpWiki"] = "Unbenanntes PhpWiki";
+$locale["Analyzes preferences based on voting budget and ratings."] = "Analysiere Empfehlungen auf Grund von Bewertungen.";
+$locale["Anonymous Users"] = "Anonyme Benutzer";
+$locale["Appearance"] = "Darstellung";
+$locale["Append text to any page in this wiki."] = "Füge Text zu einer Seite in diesem Wiki hinzu.";
+$locale["AppendText"] = "TextHinzufügen";
+$locale["AppendText to %s"] = "TextHinzufügen zu %s";
+$locale["Appending at the end."] = "Füge am Ende hinzu.";
+$locale["Application name"] = "Anwendungsname";
+$locale["Apply changes"] = "Änderungen anwenden";
+$locale["Approve"] = "Akzeptieren";
+$locale["Are you sure you want to change the markup type of the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
+$locale["Are you sure you want to change the owner of the selected pages?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
+$locale["Are you sure you want to permanently change access rights to the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
+$locale["Are you sure you want to permanently change the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?";
+$locale["Are you sure you want to permanently purge the following files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?";
+$locale["Are you sure you want to remove the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?";
+$locale["Are you sure you want to rename the selected pages?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?";
+$locale["Are you sure you want to replace text in the selected files?"] = "Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen wollen?";
+$locale["Argument '%s' not declared by plugin."] = "Argument »%s« nicht im Zusatzprogramm deklariert.";
+$locale["Arguments"] = "Parameter";
+$locale["Attempting to use the directory '%s' instead."] = "Versuche stattdessen das Verzeichnis »%s« zu verwenden.";
+$locale["Attribute"] = "Attribut";
+$locale["Attribute %s, base value: %s"] = "Attribut %s, Basis: %s";
+$locale["Attribute %s, value: %s"] = "Attribut %s, Wert: %s";
+$locale["Attributes of %s"] = "Attribute für %s";
+$locale["Auth Level"] = "Auth. Ebene";
+$locale["Auth Method"] = "Auth. Methode";
+$locale["AuthInfo"] = "AuthentifizierungsInfo";
+$locale["Authenticated Users"] = "Authentifizierte Benutzer";
+$locale["Authenticated as %s"] = "Authentifiziert als %s";
+$locale["Authenticated users on this wiki (%d total):"] = "Eingetragene Benutzer in diesem Wiki (Gesamt: %d):";
+$locale["Author"] = "Autor";
+$locale["Author will be logged as %s."] = "%s wird als Autor aufgenommen.";
+$locale["AuthorHistory"] = "AutorenProtokoll";
+$locale["Available plugins"] = "Verfügbare Einschubprogramme";
+$locale["Avg. Rating"] = "Durchschnittsbewertung";
+$locale["BAD URL -- remove all of <, >, \""] = "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \"";
+$locale["BAD phpwiki: URL"] = "phpwiki: URL Formfehler";
+$locale["BOGO"] = "BOGO";
+$locale["Back"] = "Zurück";
+$locale["Back Links"] = "Back Links";
+$locale["BackLinks"] = "BackLinks";
+$locale["BackLinks for %s"] = "BackLinks für %s";
+$locale["Backend type: "] = "Backend Typ: ";
+$locale["Bad Version"] = "Ungültige Version";
+$locale["Bad file type: %s"] = "Ungültiger Dateityp: %s";
+$locale["Bad url in src: remove all of <, >, \""] = "URL Formfehler in Quellcode: alle der folgenden Zeichen entfernen <, >, \"";
+$locale["Blog"] = "Blog";
+$locale["Blog Archives:"] = "Blog-Archive:";
+$locale["Blog Entries for %s:"] = "Blog-Einträge für %s:";
+$locale["Blog page"] = "Blog Seite";
+$locale["BlogArchives"] = "BlogArchiv";
+$locale["Bogo Users"] = "Bogo Benutzer";
+$locale["Bold text"] = "Fetter Text";
+$locale["Bold text [alt-b]"] = "Fetter Text [alt-f]";
+$locale["Browsing pages"] = "Das Durchblättern der Seiten dieses Wikis";
+$locale["CANCEL"] = "ABBRUCH";
+$locale["CONVERTING"] = "KONVERTIERE";
+$locale["CREATED"] = "ERZEUGT";
+$locale["Cache statistics"] = "Cache Statistiken";
+$locale["Calendar"] = "Kalender";
+$locale["CalendarList"] = "KalenderListe";
+$locale["Can't inflate data: zlib support not enabled in this PHP"] = "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 geöffnet worden.";
+$locale["Can't open zip file '%s' for reading"] = "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen";
+$locale["Cancel"] = "Abbrechen";
+$locale["Cancelled"] = "Abgebrochen";
+$locale["Cannot create directory '%s'"] = "Das Verzeichnis »%s« kann nicht erzeugt werden";
+$locale["Cannot create page with empty name!"] = "Kann Seite mit leerem Namen nicht erzeugen";
+$locale["Cannot open AUTH_GROUP_FILE %s"] = "Kann AUTH_GROUP_FILE %s nicht öffnen";
+$locale["Case exact?"] = "Groß-/Kleinschreibung beachten";
+$locale["Case insensitive?"] = "Groß-/Kleinschreibung beachten?";
+$locale["Category"] = "Kategorie";
+$locale["CategoryCategory"] = "KategorieKategorie";
+$locale["CategoryGroup"] = "KategorieGruppen";
+$locale["CategoryHomePages"] = "KategorieHomepage";
+$locale["CategoryHomepage"] = "KategorieHomepage";
+$locale["CategoryPage"] = "KategorieSeite";
+$locale["Change Password"] = "Ändere Passwort";
+$locale["Change Verification Status"] = "Ändere Bestätigungs-Status";
+$locale["Change country"] = "Land ändern";
+$locale["Change markup to: "] = "Ändere Formatierung zu:";
+$locale["Change markup type"] = "Ändere Formatierungs-Typ";
+$locale["Change markup type from %s to %s"] = "Ändere Formatierungs-Typ von %s zu %s";
+$locale["Change owner of page '%s' to '%s'."] = "Besitzer der Seite '%s' auf '%s' geändert.";
+$locale["Change owner of selected pages"] = "Den Besitzer der ausgewählte Seiten ändern";
+$locale["Change owner of selected pages."] = "Den Besitzer ausgewählte Seiten ändern.";
+$locale["Change owner to: "] = "Besitzer ändern zu:";
+$locale["Change page attributes"] = "Ändern von Eigenschaften";
+$locale["Change the markup type of selected pages."] = "Ändere den Formatierungstyp aller ausgewählte Seiten.";
+$locale["Changes"] = "Änderungen";
+$locale["Check any two boxes then %s."] = "Wählen Sie zwei Versionen aus, dann %s.";
+$locale["Check any two boxes to compare revisions."] = "Wählen Sie zwei Versionen zum Vergleich aus.";
+$locale["Check for %s"] = "Prüfe %s";
+$locale["Check for ACCESS_LOG_SQL passwords in POST requests"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests";
+$locale["Check for ACCESS_LOG_SQL remote_host varchar(50)"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests";
+$locale["Check for mysql 4.1.x/5.0.0 binary search on windows problem"] = "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)";
+$locale["Check for mysql LOCK TABLE privilege"] = "Prüfe mysql LOCK TABLE Rechte";
+$locale["Check for mysql page.id auto_increment flag"] = "Prüfe auf mysql page.id auto_increment Flag";
+$locale["Check for mysql session.sess_id sanity"] = "Prüfe auf mysql session.sess_id Korrektheit";
+$locale["Check for new session.sess_ip column"] = "Prüfe auf neue Spalte session.sess_ip column";
+$locale["Check for table %s"] = "Prüfe Tabelle %s";
+$locale["Check to add this ACL"] = "Anklicken um diese ACL hinzuzufügen";
+$locale["Chmod"] = "Chmod";
+$locale["Chmod to permission:"] = "Ändere auf Berechtigung:";
+$locale["Chown"] = "Chown";
+$locale["Click to authenticate as %s"] = "Hier klicken um sich anzumelden als %s";
+$locale["Click to de-/select all pages"] = "Klicken Sie um alle/keine Seiten auszuwählen";
+$locale["Click to display"] = "Klicken um anzuzeigen";
+$locale["Click to display all comments"] = "Klicken um Kommentare anzuzeigen";
+$locale["Click to display to TOC"] = "Klicken um TOC anzuzeigen";
+$locale["Click to hide the comments"] = "Klicken um Kommentare zu verstecken";
+$locale["Click to hide/show"] = "Hier klicken um zu verstecken";
+$locale["Click to reverse sort order"] = "Klicken Sie um die Reihenfolge umzudrehen";
+$locale["Click to sort by %s"] = "Sortiere nach %s";
+$locale["Close"] = "Schließen";
+$locale["Color"] = "Farbe";
+$locale["Color text"] = "Farbiger Text";
+$locale["Columns: %s."] = "Spalten: %s.";
+$locale["Comment"] = "Kommentar";
+$locale["Comment modified on %s by %s"] = "Kommentare am %s geändert von %s";
+$locale["Comments"] = "Kommentare";
+$locale["Comments on %s by %s."] = "Kommentar zu %s von %s.";
+$locale["Complete."] = "Fertig.";
+$locale["Conflicting Edits!"] = "Widersprechende Änderungen!";
+$locale["Content"] = "Inhalt";
+$locale["Contents"] = "Inhalt";
+$locale["ContributedTranslations"] = "MeineÜbersetzungen";
+$locale["Control characters not allowed"] = "Steuerzeichen nicht erlaubt";
+$locale["Convert"] = "Konvertieren";
+$locale["Convert text into a png image using GD."] = "Text mit der GD Bibliothek in ein PNG Bild konvertieren.";
+$locale["Converted successfully %d pages"] = "%d Seiten erfolgreich konvertiert";
+$locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "(La)TeX-Dokument nach ein Bild erstellen. Dadurch konnte eine Formel in PhpWiki eingebettet worden.";
+$locale["Copyrights"] = "Urheberrechte";
+$locale["Could not change owner of page '%s' to '%s'."] = "Konnte den Besitzer der Seite '%s' nicht in '%s' ändern.";
+$locale["Could not connect to LDAP host %s"] = "Kann nicht zu LDAP host »%s« verbinden";
+$locale["Couldn't change page '%s' to markup type '%s'."] = "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 connect to %s"] = "Kann nicht zu »%s« verbinden";
+$locale["Couldn't rename page '%s' to '%s'."] = "Konnte Seite '%s' nicht in '%s' umbenennen.";
+$locale["Couldn't start commandline '%s'"] = "Konnte Programm »%s« nicht starten";
+$locale["Count"] = "Anzahl";
+$locale["Create Page"] = "Neue Seite";
+$locale["Create a Wiki page by the provided name."] = "Erzeuge neue Wiki-Seite mit dem angegebenem Namen.";
+$locale["Create a Wiki page."] = "Erzeuge eine neue Wiki-Seite.";
+$locale["Create a new (sub)page"] = "Erzeuge eine neue (Unter)Seite";
+$locale["Create: %s"] = "Erzeugen: %s";
+$locale["CreatePage"] = "NeueSeite";
+$locale["CreateToc"] = "InhaltsVerzeichnis";
+$locale["CreateToc disabled for old markup."] = "InhaltsVerzeichnis deaktiviert für altes Markup.";
+$locale["Created by CreatePage"] = "Erzeugt von NeueSeite";
+$locale["Created directory '%s' for the page dump..."] = "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen...";
+$locale["Creating pages"] = "Neue Seiten erzeugen";
+$locale["Creator"] = "Erzeuger";
+$locale["Current Language"] = "Ausgewählte Sprache";
+$locale["Current Theme"] = "Ausgewählte Darstellung";
+$locale["Current language: '%s'"] = "Ihre Sprache: »%s«";
+$locale["Current theme: '%s'"] = "Ihre Benutzeroberfläche: »%s«";
+$locale["CurrentTime"] = "AktuelleZeit";
+$locale["DB admin password:"] = "DB Admin passwort:";
+$locale["DB admin user:"] = "DB Admin Benutzername:";
+$locale["Database"] = "Datenbank";
+$locale["Date Format"] = "Datumsformat";
+$locale["DeadEndPages"] = "VerwaisteSeiten";
+$locale["DebugGroupInfo"] = "DebugGruppenInfo";
+$locale["DebugInfo"] = "DebugInfo";
+$locale["Default InterWiki map file not loaded."] = "Standard-Datei der InterWikiListe nicht geladen.";
+$locale["Default language: '%s'"] = "Standardsprache für dieses Wiki: »%s«";
+$locale["Default preferences will be used."] = "Die Vorgabe Benutzereinstellungen werden verwendent.";
+$locale["Default theme: '%s'"] = "Darstellung des Systems: »%s«";
+$locale["Define a translation for a specified text"] = "Definiere die Übersetzung für einen gegebenen Text";
+$locale["Define the translation for %s in %s"] = "Definiere die Übersetzung für %s nach %s";
+$locale["Del/+"] = "Lö/+";
+$locale["Delete this ACL"] = "Lösche diese ACL";
+$locale["Deleted"] = "Gelöscht";
+$locale["Deleted %d pages with invalid names:"] = "%d Seiten mit ungültigen Namen gelöscht:";
+$locale["Deleted %d unreferenced pages:"] = "%d unverlinkte Seiten entfernt:";
+$locale["Describe %s here."] = "Beschreiben Sie %s hier.";
+$locale["Description"] = "Beschreibung";
+$locale["Dialog"] = "Dialog";
+$locale["Didn't purge page '%s'. Access denied."] = "Seite »%s« wurde nicht gelöscht. Zugriff verweigert.";
+$locale["Didn't remove page '%s'. Access denied."] = "Seite »%s« wurde nicht gelöscht. Zugriff verweigert.";
+$locale["Diff"] = "Diff";
+$locale["Diff previous Author"] = "Diff zu vorigem Autor";
+$locale["Diff previous Revision"] = "Diff zu voriger Version";
+$locale["Diff: %s"] = "Vergleich von: %s";
+$locale["Differences between %s and %s of %s."] = "Zeilenweiser Vergleich von %3\$s, von %1\$s mit %2\$s.";
+$locale["Diffing pages"] = "Die Inhalts-Differenz-Seiten dieses Wikis";
+$locale["Discussion"] = "Diskussion";
+$locale["Display arbitrary SQL result tables"] = "Zeige Tabelle von SQL Abfragen an";
+$locale["Display differences between revisions"] = "Zeilenweiser Vergleich der Versionen";
+$locale["Displays a list of randomly chosen pages or redirects to a random page."] = "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten.";
+$locale["Displays a set of photos listed in a text file with optional descriptions"] = "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["Don't cache this page."] = "Cache diese Seite nicht.";
+$locale["Double redirect not allowed."] = "Rekursive Redirektion verboten.";
+$locale["Download all revisions for backup"] = "Alle Versionen für Backup herunterladen";
+$locale["Download for Subversion"] = "Für Subversion herunterladen";
+$locale["Download for backup"] = "Für Backup herunterladen";
+$locale["Download page contents"] = "Runterladen der Seite";
+$locale["Downloading html zip dumps"] = "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei";
+$locale["Downloading zip dumps"] = "Das Herunterladen aller Wiki-Seiten als gezippte Datei";
+$locale["Dump Pages"] = "Seiten Schreiben";
+$locale["Dump Pages as XHTML"] = "Seiten als XHTML schreiben";
+$locale["Dump pages as XHTML"] = "Seiten als XHTML Dateien speichern";
+$locale["Dump to directory"] = "Wiki Seiten als Dateien in lokales Verzeichnis speichern";
+$locale["Dumping Pages"] = "Die Seiten werden geschrieben";
+$locale["Dumping html pages"] = "Die Speicherung von Wiki Seiten als HTML-Dateien";
+$locale["Dumping serial pages"] = "Die Speicherung von Wiki Seiten als Dateien";
+$locale["Dynamically include the content from another wiki page."] = "Text von einer andere Seite einfügen.";
+$locale["E-Mail"] = "E-Mail";
+$locale["E-Mail address confirmation"] = "E-Mail Bestätigung";
+$locale["E-mail"] = "E-Mail";
+$locale["Easy navigation buttons for %s"] = "Einfache Navgiationsknöpfe für %s";
+$locale["Edit"] = "Bearbeiten";
+$locale["Edit %s"] = "Bearbeite %s";
+$locale["Edit Area Size"] = "Texteingabe Fenstergröße";
+$locale["Edit Old Revision"] = "Alte Version Bearbeiten";
+$locale["Edit aborted."] = "Bearbeiten abgebrochen.";
+$locale["Edit metadata for %s"] = "Meta-Daten für %s bearbeiten";
+$locale["Edit old revision"] = "Alte Version Bearbeiten";
+$locale["Edit this page"] = "Diese Seite bearbeiten";
+$locale["Edit this page and all subpages"] = "Bearbeiten aller Seiten und Unterseiten";
+$locale["Edit: %s"] = "Bearbeite: %s";
+$locale["EditMetaData"] = "MetaDatenBearbeiten";
+$locale["EditText"] = "TextBearbeiten";
+$locale["Edited by: %s"] = "Bearbeitet von: %s";
+$locale["Editing pages"] = "Ändern in diesem Wiki";
+$locale["Elapsed time: %s s"] = "Dauer: %s s";
+$locale["Email Verification"] = "E-Mail Bestätigung";
+$locale["Email not yet verified."] = "E-Mail noch nicht bestätigt.";
+$locale["Email verified."] = "E-Mail bestätigt.";
+$locale["Embed hidden comments in WikiPages."] = "Kommentar in WikiText verstecken.";
+$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt.";
+$locale["Empty link to: %s"] = "Leerer Link zu: %s";
+$locale["Empty pagename!"] = "Leerer Seitenname!";
+$locale["Enable configurable polls"] = "Erlaubt konfigurierbare Umfragen";
+$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt.";
+$locale["Enter your UserId to sign in"] = "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein";
+$locale["Entry on %s by %s."] = "Kommentar zu %s von %s.";
+$locale["Enumeration"] = "Num. Liste";
+$locale["Error sending email with password for user %s."] = "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
+$locale["Error: Couldn't send %s to %s"] = "Fehler: Konnte nicht %s an %s senden";
+$locale["Error: Empty search string."] = "Fehler: Leeres Suchwort.";
+$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "Fehler: Ihre Homepage Seite muß ein gültiges WikiWord sein. Die BenutzerEinstellungen können deshalb leider nicht gespeichert werden.";
+$locale["Every"] = "Jeder";
+$locale["Exit toolbar"] = "Beende Werkzeugleiste";
+$locale["External"] = "Externe";
+$locale["External Links"] = "Externe Links";
+$locale["External link (remember http:// prefix)"] = "Externer Link (http:// prefix)";
+$locale["ExternalSearch"] = "FremdSuche";
+$locale["FAIL"] = "FEHLER";
+$locale["FAILED"] = "FEHLER";
+$locale["FIXED"] = "AUSGEBESSERT";
+$locale["FORBIDDEN"] = "VERBOTEN";
+$locale["Failed to bind LDAP host"] = "Konnte nicht mit LDAP Host verbinden";
+$locale["Failed to connect to LDAP host"] = "LDAP Server nicht gefunden";
+$locale["Fatal PhpWiki Error"] = "Fataler PhpWiki-Fehler";
+$locale["File '%s' not found."] = "Datei '%s' nicht gefunden";
+$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"] = "SeiteFinden";
+$locale["First"] = "Erste";
+$locale["FoafViewer"] = "FoafBetrachter";
+$locale["Found by "] = "Gefunden von ";
+$locale["FrameInclude"] = "FrameEinbetten";
+$locale["From english to %s: "] = "Von Englisch nach %s: ";
+$locale["Full text search results for '%s'"] = "Volltext-Suchresultate nach »%s«";
+$locale["FullDump"] = "VollSicherung";
+$locale["FullRecentChanges"] = "AlleNeuesteÄnderungen";
+$locale["FullTextSearch"] = "VolltextSuche";
+$locale["FuzzyPages"] = "FuzzySuche";
+$locale["General Auth Settings"] = "Allgemeine Authentifizierungs-Einstellungen";
+$locale["Get an email notification at changes of the following pages:"] = "E-Mail Nachricht bei Änderung folgender Seiten:";
+$locale["Get debugging information for %s."] = "Debug-Informationen von %s.";
+$locale["Get preferences information for current user %s."] = "Zeige Benutzereinstellungen für den aktuellen Benutzer %s.";
+$locale["Given password ignored."] = "Passwort ignoriert.";
+$locale["Go"] = "Los";
+$locale["Go to %s."] = "Gehe zu %s.";
+$locale["Go to or create page."] = "Gehe zu oder erzeuge diese Seite.";
+$locale["Go?"] = "Los?";
+$locale["GoTo"] = "GeheZu";
+$locale["GooglePlugin"] = "GoogleZusatzprogramm";
+$locale["Grant"] = "Erlaube";
+$locale["Group %s does not exist"] = "Gruppe %s existiert nicht";
+$locale["Group page '%s' does not exist"] = "Gruppenseite »%s« existiert nicht";
+$locale["Group/User"] = "Gruppe/Benutzer";
+$locale["Guest"] = "Gast";
+$locale["Guests"] = "Gäste";
+$locale["H"] = "H.";
+$locale["Headline text"] = "Überschrift";
+$locale["Height"] = "Höhe";
+$locale["HelloWorld"] = "HalloWelt";
+$locale["Help"] = "Hilfe";
+$locale["Help/AddCommentPlugin"] = "Hilfe/NeuerKommentarPlugin";
+$locale["Help/AddingPages"] = "Hilfe/SeitenErzeugen";
+$locale["Help/AuthorHistoryPlugin"] = "Hilfe/AutorenProtokollPlugin";
+$locale["Help/CalendarListPlugin"] = "Hilfe/KalenderListePlugin";
+$locale["Help/CalendarPlugin"] = "Hilfe/KalenderPlugin";
+$locale["Help/CommentPlugin"] = "Hilfe/KommentarPlugin";
+$locale["Help/CreateTocPlugin"] = "Hilfe/InhaltsVerzeichnisPlugin";
+$locale["Help/EditMetaDataPlugin"] = "Hilfe/MetaDatenBearbeitenPlugin";
+$locale["Help/ExternalSearchPlugin"] = "Hilfe/FremdSuchePlugin";
+$locale["Help/FoafViewerPlugin"] = "Hilfe/FoafViewerPlugin";
+$locale["Help/FrameIncludePlugin"] = "Hilfe/FrameEinbettenPlugin";
+$locale["Help/GoodStyle"] = "Hilfe/GuterStil";
+$locale["Help/HelloWorldPlugin"] = "Hilfe/HalloWeltPlugin";
+$locale["Help/IncludePagePlugin"] = "Hilfe/SeiteEinfügenPlugin";
+$locale["Help/LinkIcons"] = "Hilfe/LinksIcons";
+$locale["Help/OldStyleTablePlugin"] = "Hilfe/TraditionellerTabellenStilPlugin";
+$locale["Help/OldTextFormattingRules"] = "Hilfe/AlteTextFormatierungsRegeln";
+$locale["Help/PhotoAlbumPlugin"] = "Hilfe/BilderAlbumPlugin";
+$locale["Help/PhpHighlightPlugin"] = "Hilfe/PhpHighlightPlugin";
+$locale["Help/PhpWeatherPlugin"] = "Hilfe/PhpWetterPlugin";
+$locale["Help/PhpWiki"] = "Hilfe/PhpWiki";
+$locale["Help/PloticusPlugin"] = "Hilfe/PloticusPlugin";
+$locale["Help/RawHtmlPlugin"] = "Hilfe/RawHtmlPlugin";
+$locale["Help/RedirectToPlugin"] = "Hilfe/WeiterLeitenPlugin";
+$locale["Help/RichTablePlugin"] = "Hilfe/ErweiterteTabellenPlugin";
+$locale["Help/TextFormattingRules"] = "Hilfe/TextFormatierungsRegeln";
+$locale["Help/TranscludePlugin"] = "Hilfe/EinbettenPlugin";
+$locale["Help/UnfoldSubpagesPlugin"] = "Hilfe/UnterseitenEntfaltenPlugin";
+$locale["Help/UpLoadPlugin"] = "Hilfe/HochLadenPlugin";
+$locale["Help/WikiBlogPlugin"] = "Hilfe/WikiBlogPlugin";
+$locale["Help/WikiPlugin"] = "Hilfe/WikiPlugin";
+$locale["Help/WikiWikiWeb"] = "Hilfe/WikiWikiWeb";
+$locale["Help:SemanticRelations"] = "Hilfe:SemantischeBeziehungen";
+$locale["Here you can override site-specific default values."] = "Hier können Sie einige Voreinstellungen ändern.";
+$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 der Voraussetzung, dass es durch die ausgewählte Darstellung unterstützt wird). Dies ist sinnvoll für Text-Browser und langsame Verbindungen.";
+$locale["Hilight referred search terms."] = "Hebe externe Suchwörter hervor.";
+$locale["History of all major and minor edits by %s to page %s."] = "Verlaufsprotokoll aller großen und kleinen Änderungen von %s der Seite %s.";
+$locale["History of all major and minor modifications for any page edited by %s."] = "Verlaufsprotokoll aller großen und kleinen Änderungen aller Seiten, die von %s bearbeitet wurden.";
+$locale["History of changes."] = "Änderungsprotokoll.";
+$locale["Hit statistics"] = "Treffer Statistiken";
+$locale["Hits"] = "Treffer";
+$locale["Hits:"] = "Treffer:";
+$locale["Home"] = "Start";
+$locale["Home Page"] = "Start Seite";
+$locale["HomePage"] = "StartSeite";
+$locale["HomePageAlias"] = "HomePageAlias";
+$locale["Horizontal line"] = "Horizontale Trennlinie";
+$locale["HowToUseWiki"] = "WieManWikiBenutzt";
+$locale["I'm just doing minor edits. Please divert the usual logging to %s instead."] = "Ich mache nur kleinere Änderungen. Protokolliere stattdessen in %s.";
+$locale["I'm sorry, there is no such page as %s."] = "Leider gibt es keine solche Seite %s.";
+$locale["I'm sorry.  Version %d of %s is not in the database."] = "Leider ist keine Version %d von %s in der Datenbank.";
+$locale["Ignore wiki formatting"] = "Keine Wiki Formatierung";
+$locale["Illegal character '"] = "Ungültiges Zeichen";
+$locale["Illegal chars %s removed"] = "Ungültiges Zeichen %s entfernt";
+$locale["Image loaded from cache file: %s"] = "Bild geladen von Cachedatei: %s";
+$locale["Image saved to cache file: %s"] = "Bild gespeichert als Cachedatei: %s";
+$locale["In the time since you started editing this page, another user has saved a new version of it."] = "Während der Zeit, seit Sie mit der Bearbeitung dieser Seite begonnen haben, hat ein anderer Benutzer bereits eine neuere Version gespeichert.";
+$locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] = "Insgesamt sind %d Benutzersessions online. :: %d verschiedene Registrierte und %d Gäste";
+$locale["Include an external web page within the body of a wiki page."] = "Einbetten einer externen Webseite im Body dieser Wiki Seite.";
+$locale["Include multiple pages."] = "Füge mehrere Seiten ein.";
+$locale["Include recursively all linked pages starting at %s"] = "Bette rekursiv alle verlinkten Seiten ein, angefangen mit %s";
+$locale["Include text from another wiki page."] = "Text von einer andere Seite einfügen.";
+$locale["IncludePage"] = "SeiteEinfügen";
+$locale["IncludePages"] = "SeitenEinfügen";
+$locale["IncludeSiteMap"] = "SeitenBaumEingefügt";
+$locale["Included from %s"] = "Eingefügter Text von %s";
+$locale["Included from %s:"] = "Eingefügter Text von %s:";
+$locale["Includes the content of all SubPages of the current page."] = "Enthält den Inhalt alle UnterSeiten der aktuellen Seite.";
+$locale["Info"] = "Info";
+$locale["Inline images"] = "Eingebundene Bilder";
+$locale["Insert"] = "Einfügen";
+$locale["Insert Categories"] = "Neue Kategorie";
+$locale["Insert Image or Video"] = "Bild oder Video einfügen";
+$locale["Insert PageLink"] = "SeitenLink einfügen";
+$locale["Insert Plugin"] = "Zusatzprogramme einfügen";
+$locale["Insert Template"] = "Vorlage einfügen";
+$locale["Insert non-formatted text here"] = "Füge unformatierten Text hier ein";
+$locale["Insufficient permissions."] = "Keine ausreichenden Zugangsrechte.";
+$locale["InterWiki"] = "InterWiki";
+$locale["InterWiki Address"] = "InterWiki-Adresse";
+$locale["InterWikiMap"] = "InterWikiListe";
+$locale["InterWikiSearch"] = "InterWikiSuche";
+$locale["Invalid ACL"] = "Ungültige ACL";
+$locale["Invalid [] syntax ignored"] = "Ungültige [] syntax ignoriert";
+$locale["Invalid argument %s"] = "Ungültiger Parameter %s";
+$locale["Invalid argument: %s=%s"] = "Ungültiger Parameter: %s=%s";
+$locale["Invalid chmod string"] = "Ungültiger CHMOD Befehl";
+$locale["Invalid color: %s"] = "Ungültige Farbe: %s";
+$locale["Invalid image attribute \"%s\" %s=%s"] = "Ungültiger Parameter: \"%s\" %s=%s";
+$locale["Invalid image size"] = "Ungültige Bildgröße";
+$locale["Invalid pagename!"] = "Ungültiger Seitenname!";
+$locale["Invalid password or userid."] = "Ungültiges Passwort oder falscher Benutzername.";
+$locale["Invalid password."] = "Ungültiges Passwort.";
+$locale["Invalid username '%s' for LDAP Auth"] = "Ungültiger Benutzername »%s« für LDAP Auth";
+$locale["Invalid username."] = "Ungültiger Benutzername.";
+$locale["Italic text"] = "Kursiver Text";
+$locale["Italic text [alt-i]"] = "Kursiver Text [alt-k]";
+$locale["JabberPresence"] = "JabberAnwesend";
+$locale["Keep up to %d major edits, but keep them no longer than %d days."] = "Aufbewahrung größerer Änderungen für %d, aber nicht länger als %d Tage.";
+$locale["Language"] = "Sprache";
+$locale["Last"] = "Letzte";
+$locale["Last Author"] = "Letzter Autor";
+$locale["Last Modified"] = "Zuletzt geändert";
+$locale["Last Summary"] = "Letzte Zusammenfassung";
+$locale["Last edited %s"] = "Zuletzt geändert %s";
+$locale["Last edited on %s"] = "Zuletzt bearbeitet am %s";
+$locale["LatestSnapshot"] = "LetzeSicherung";
+$locale["Layout tables using a Mediawiki-like markup style."] = "Tabellen mit Mediawiki Syntax.";
+$locale["Layout tables using a very rich markup style."] = "Tabellen mit erweiterter HTML Syntax.";
+$locale["Layout tables using the Wikicreole syntax."] = "Tabellen unter Wikicreole Formatierung.";
+$locale["Layout tables using the old markup style."] = "Tabellen unter Verwendung traditioneller (alter) Wikitext Formatierung.";
+$locale["LdapSearch"] = "LdapSuche";
+$locale["Leading %s not allowed"] = "Führende %s nicht erlaubt";
+$locale["Legend"] = "Legende";
+$locale["Level 1 headline"] = "H1 Überschrift";
+$locale["Like Pages"] = "Ähnliche Seiten";
+$locale["LikePages"] = "ÄhnlicheSeiten";
+$locale["Line %s does not begin with a '|'."] = "Zeile %s beginnt nicht mit '|'.";
+$locale["Link"] = "Verweis";
+$locale["Link to page"] = "Link auf Seite";
+$locale["LinkDatabase"] = "LinkDatenbank";
+$locale["LinkSearch"] = "LinkSuche";
+$locale["Links"] = "Links";
+$locale["List"] = "Liste";
+$locale["List PageHistory for %s"] = "Das Änderungsprotokoll für %s auflisten";
+$locale["List all new pages per month per user"] = "Liste aller neuen Seiten pro Monat und Benutzer";
+$locale["List all once authenticated users."] = "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 für einen Autor.";
+$locale["List all pages in this wiki."] = "Alle Seiten in diesem Wiki auflisten.";
+$locale["List all pages which link to %s."] = "Alle Seiten, die mit %s verlinkt sind.";
+$locale["List of pages created by [%s] (%d total):"] = "Liste der Seiten erzeugt von [%s] (%d insgesamt):";
+$locale["List of pages last edited by [%s] (%d total):"] = "Liste der Seiten last edited by [%s] (%d insgesamt):";
+$locale["List of pages owned by [%s] (%d total):"] = "Liste der Seiten owned by [%s] (%d insgesamt):";
+$locale["List of user-created pages (%d total):"] = "Liste der Benutzer erzeugten Seiten (%d insgesamt):";
+$locale["List page names which share an initial or final title word with '%s'."] = "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«.";
+$locale["List pages which are not linked to by any other page."] = "Liste aller Seiten, die von keiner anderen Seite verlinkt sind.";
+$locale["List the most popular pages nearby."] = "Liste die meistbesuchten Seiten in der Nähe.";
+$locale["List the most popular pages."] = "Die meistbesucht Seiten werden aufgelistet.";
+$locale["List the user's ratings."] = "Zeige die Benutzer Bewertungen.";
+$locale["List this page and all subpages"] = "Auflistung aller Seiten und Unterseiten";
+$locale["ListPages"] = "ListeSeiten";
+$locale["ListRelations"] = "ListeRelationen";
+$locale["ListSubpages"] = "ListeUnterseiten";
+$locale["Lists referenced page names which do not exist yet."] = "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden.";
+$locale["Lists the names of all SubPages of the current page."] = "Listet die Namen aller Unterseiten der aktuellen Seite.";
+$locale["LiveSearch"] = "LiveSuche";
+$locale["Load File"] = "Datei Laden";
+$locale["LoadDump"] = "SeiteLaden";
+$locale["Loading '%s'"] = "»%s« wird geladen";
+$locale["Loading InterWikiMap from external file %s."] = "Die InterWikiListe wird von der externen Datei %s geladen.";
+$locale["Loading files"] = "Dateien hinaufladen";
+$locale["Loading up virgin wiki"] = "Lade neue Seiten in das frische Wiki";
+$locale["Lock"] = "Sperren";
+$locale["Lock Page"] = "Seite Sperren";
+$locale["Lock page to enable link"] = "Seite sperren, um den Link zu aktivieren";
+$locale["Locked"] = "Gesperrt";
+$locale["Locking pages"] = "Seiten sperren";
+$locale["Login"] = "Anmelden";
+$locale["MIME file %s"] = "MIME-Datei %s";
+$locale["MISSING"] = "FEHLEND";
+$locale["Make use of the Google API"] = "Benutze die Google API";
+$locale["Markup"] = "Quelltext";
+$locale["Markup cache purged!"] = "HTML-Cachedaten entfernt!";
+$locale["Markup:"] = "Quelltextformat:";
+$locale["Members:"] = "Mitglieder:";
+$locale["Merge Edit"] = "Zusammenfügen Bearbeiten";
+$locale["Merge and Edit: %s"] = "Zusammenfügen und Bearbeiten: %s";
+$locale["Message"] = "Nachricht";
+$locale["Method '%s' not implemented in this GROUP_METHOD %s"] = "Methode »%s« in GROUP_METHOD %s nicht implementiert";
+$locale["Minor"] = "kleinere";
+$locale["Minor Edit"] = "Kleinere Änderung";
+$locale["Miscellaneous utility functions for the Administrator."] = "Verschiedene Dienstfunktionen für den Administrator.";
+$locale["Missing %s for %s"] = "Fehlender %s für %s";
+$locale["Missing PagePermission:"] = "Fehlende Zugriffsberechtigung:";
+$locale["Missing ldap extension"] = "Fehlende php LDAP extension";
+$locale["ModeratedPage"] = "ModerierteSeite";
+$locale["ModeratedPage Notification Error: Couldn't send email"] = "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden";
+$locale["ModeratedPage: No emails for the moderators defined"] = "ModerierteSeite: Keine E-Mails für Moderatoren definiert";
+$locale["Modern"] = "Modern";
+$locale["Modified"] = "Geändert";
+$locale["Modified on %s by %s"] = "Kommentare am %s geändert von %s";
+$locale["Moniker"] = "Kurzname";
+$locale["Most users ever online was %d at %s."] = "Die meisten Besucher online waren %d am %s.";
+$locale["MostPopular"] = "MeistBesucht";
+$locale["Name"] = "Seitenname";
+$locale["Never edited"] = "Noch nie bearbeitet.";
+$locale["New Topic"] = "Neues Thema";
+$locale["New comment."] = "Neuer Kommentar.";
+$locale["New entry"] = "Neuer Eintrag";
+$locale["New page"] = "Neue Seite";
+$locale["New password"] = "Neues Passwort";
+$locale["New users may use an empty password."] = "Neue Benutzer können auch ohne Passwort einloggen.";
+$locale["Newer page:"] = "Neuere Seite:";
+$locale["Next"] = "Nächste";
+$locale["Next Month"] = "Nächster Monat";
+$locale["No"] = "Nein";
+$locale["No Blog Entries"] = "Keine Blog-Einträge";
+$locale["No LDAP in this PHP version"] = "Kein LDAP in dieser PHP Version";
+$locale["No changes found"] = "Keine Änderungen gefunden.";
+$locale["No changes."] = "Keine Änderungen.";
+$locale["No comments found"] = "Keine Kommentare gefunden.";
+$locale["No empty, unreferenced pages were found."] = "Keine leeren, unverlinkten Seiten gefunden.";
+$locale["No metadata for %s"] = "Keine Meta-Daten für %s";
+$locale["No or not enough GROUP_DB SQL statements defined"] = "Keine oder zu wenige GROUP_DB SQL Statements definiert";
+$locale["No or unsupported GROUP_METHOD defined"] = "Keine oder ungültige GROUP_METHOD definiert";
+$locale["No other page links to %s yet."] = "Noch keine Seiten sind mit %s verlinkt.";
+$locale["No page links to %s."] = "Keine Seiten sind mit %s verlinkt.";
+$locale["No page specified."] = "Keine Seite angegeben.";
+$locale["No pagedata for %s"] = "Keine Daten für Seite %s";
+$locale["No pagename specified"] = "Keine Seite angegeben";
+$locale["No pages changed."] = "Keine Änderungen.";
+$locale["No pages purged."] = "Keine Änderungen.";
+$locale["No pages removed."] = "Keine Seiten gelöscht.";
+$locale["No pages renamed."] = "Keine Seiten umbenannt.";
+$locale["No pages with bad names had to be deleted."] = "Keine Seiten mit ungültigen Namen mußten gelöscht werden.";
+$locale["No revisions found"] = "Keine Versionen gefunden";
+$locale["No uploaded file to upload?"] = "Keine Datei zum Hochladen?";
+$locale["NoCache"] = "OhneCache";
+$locale["None"] = "Keine";
+$locale["Not enough questions answered!"] = "Nicht genügend Fragen beantwortet!";
+$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, dass Benutzer mit ungültigen E-Mail-Addressen gelöscht 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."] = "Beachte: Nur wenn Sie Ihre persönliche HomePage mit dem selben Seitennamen wie Ihre Benutzernamen erzeugen, werden Sie Ihre BenutzerEinstellungen speichern können.";
+$locale["Nothing found"] = "Nichts gefunden";
+$locale["OK"] = "OK";
+$locale["Okay"] = "OK";
+$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] = "Ihre alte persönliche HomePage %s ohne gespeichertem Passwort wurde mit einem leeren Password gespeichert. Setzen Sie ein Passwort in Ihren BenutzerEinstellungen.";
+$locale["OldStyleTable"] = "TraditionellerTabellenStil";
+$locale["Older page:"] = "Ältere Seite:";
+$locale["One page has been changed:"] = "Eine Seite wird geändert.";
+$locale["One page has been permanently purged:"] = "Eine Seite wird unwiderruflich gelöscht.";
+$locale["One page has been removed:"] = "Eine Seite wird gelöscht:";
+$locale["One page has been renamed:"] = "Eine Seite wird geändert.";
+$locale["One page links to %s:"] = "Eine Seite ist mit %s verlinkt:";
+$locale["One page would link to %s:"] = "Eine Seite würde mit %s verlinkt sein:";
+$locale["Only files with extension HTML are allowed"] = "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 gelöscht!";
+$locale["Operation undone"] = "Aktion rückgängig gemacht";
+$locale["Optimizing database"] = "Datenbank wird optimiert";
+$locale["Original (1.2 or 1.0)"] = "Original (1,2 oder 1,0)";
+$locale["Orphaned Pages in this wiki (%d total):"] = "Verwaiste Seiten in diesem Wiki (%d gesamt):";
+$locale["OrphanedPages"] = "VerwaisteSeiten";
+$locale["Other diffs:"] = "Andere Vergleiche:";
+$locale["Other version"] = "Andere Version";
+$locale["Our users created a total of %d pages."] = "Unsere Benutzer erzeugten insgesamt %d Seiten.";
+$locale["Owner"] = "Besitzer";
+$locale["Owner: %s"] = "Besitzer: %s";
+$locale["PHP syntax highlighting"] = "Hervorhebung der PHP-Syntax (Syntax highlighting)";
+$locale["PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."] = "PHP konnte keinen neues GD Bild erzeugen. Lesen Sie 'lib/plugin/text2png.php' für Details.";
+$locale["Page"] = "Seite";
+$locale["Page %s not found."] = "Seite %s nicht gefunden.";
+$locale["Page '%s' already exists. Ignored."] = "Seite %s existiert bereits. Ignoriert.";
+$locale["Page '%s' does not exist."] = "Seite »%s« existiert nicht";
+$locale["Page Content: "] = "Inhalt: ";
+$locale["Page Execution took %s seconds"] = "Ausführung dieser Seite dauerte %s Sekunden";
+$locale["Page Info"] = "Seiten Info";
+$locale["Page Locked"] = "Seite Gesperrt";
+$locale["Page Name"] = "Seitenname";
+$locale["Page Trail"] = "Spur";
+$locale["Page Type:"] = "Seitentyp:";
+$locale["Page Version:"] = "Seiten Version:";
+$locale["Page change"] = "Seiten Änderung";
+$locale["Page could not be updated. %s doesn't exist!\n"] = "Seite konnte nicht geändert werden. %s existiert nicht!\n";
+$locale["Page names with prefix '%s'"] = "Seitennamen mit dem Anfangswort »%s«";
+$locale["Page names with suffix '%s'"] = "Seitennamen mit Endwort »%s«";
+$locale["Page now locked."] = "Seite jetzt gesperrt.";
+$locale["Page now not-public."] = "Seite jetzt nicht mehr öffentlich freigegeben.";
+$locale["Page now public."] = "Seite jetzt öffentlich freigegeben.";
+$locale["Page now unlocked."] = "Seite jetzt freigegeben.";
+$locale["Page rename %s to %s"] = "Seite »%s« nach umbenennen »%s«";
+$locale["Page statistics"] = "Seiten Statistiken";
+$locale["Page successfully updated."] = "Datei erfolgreich geändert.";
+$locale["PageChange Notification Error: Couldn't send %s to %s"] = "SeitenÄnderung Benachrichtigung Fehler: Konnte %s nicht an %s senden";
+$locale["PageChange Notification of %s"] = "SeitenÄnderung Benachrichtigung von %s";
+$locale["PageChange Notification of %s sent to %s"] = "SeitenÄnderung Benachrichtigung von %s an %s gesendet";
+$locale["PageDump"] = "SeiteSpeichern";
+$locale["PageGroup"] = "SeitenGruppe";
+$locale["PageGroup for %s"] = "SeitenGruppe für »%s«";
+$locale["PageHistory"] = "SeitenProtokoll";
+$locale["PageHistory for %s"] = "Verlaufsprotokoll für Seite %s";
+$locale["PageInfo"] = "SeitenInfo";
+$locale["PageName|optional label"] = "SeitenName|optionaler Name";
+$locale["PageTrail Plugin"] = "PageTrail Plugin";
+$locale["Pages which have been deleted at least %s days are already checked."] = "Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt";
+$locale["Password cannot be changed."] = "Passwort konnte nicht geändert werden.";
+$locale["Password updated."] = "Passwort geändert.";
+$locale["Password was not changed."] = "Passwort wurde nicht geändert.";
+$locale["Password:"] = "Passwort:";
+$locale["PasswordReset"] = "PasswortZurücksetzen";
+$locale["Perform searches on InterWiki sites listed in InterWikiMap."] = "Durchsuchen im InterWiki sites die im InterWikiMap verzeichnet sind.";
+$locale["Permanently purge all selected pages."] = "Endgültige Löschung aller ausgewählten Seiten.";
+$locale["Permanently purge selected pages"] = "Endgültige Löschung aller ausgewählten Seiten.";
+$locale["Permanently remove all selected pages."] = "Endgültige Löschung aller ausgewählten Seiten.";
+$locale["Permission"] = "Zugriffsrecht";
+$locale["Personal Auth Settings for '%s'"] = "Spezielle Authentifizierungs-Einstellungen %s";
+$locale["Personal language:"] = "Ihre Sprache:";
+$locale["Personal theme:"] = "Ihre Benutzeroberfläche:";
+$locale["PersonalPage login method:"] = "PersonalPage Login Methode:";
+$locale["PgsrcTranslation"] = "PgsrcTranslation";
+$locale["PhotoAlbum"] = "BilderAlbum";
+$locale["PhpHighlight"] = "PhpHighlight";
+$locale["PhpWeather"] = "PhpWetter";
+$locale["PhpWiki engine version"] = "PhpWikitriebwerksversion";
+$locale["PhpWikiAdministration"] = "PhpWikiSystemverwalten";
+$locale["PhpWikiAdministration/Chmod"] = "PhpWikiSystemverwalten/Chmod";
+$locale["PhpWikiAdministration/Chown"] = "PhpWikiSystemverwalten/Chown";
+$locale["PhpWikiAdministration/Markup"] = "PhpWikiSystemverwalten/Formatierung";
+$locale["PhpWikiAdministration/Purge"] = "PhpWikiSystemverwalten/Purge";
+$locale["PhpWikiAdministration/Remove"] = "PhpWikiSystemverwalten/Löschen";
+$locale["PhpWikiAdministration/Rename"] = "PhpWikiSystemverwalten/Umbenennen";
+$locale["PhpWikiAdministration/Replace"] = "PhpWikiSystemverwalten/SuchenErsetzen";
+$locale["PhpWikiAdministration/SetAcl"] = "PhpWikiSystemverwalten/AclSetzen";
+$locale["PhpWikiDocumentation"] = "PhpWikiDokumentation";
+$locale["PhpWikiPoll"] = "PhpWikiUmfrage";
+$locale["Please check it through before saving."] = "Bitte überprüfen Sie erst alles, bevor Sie es abspeichern.";
+$locale["Please contact your PhpWiki administrator for assistance."] = "Bitte bitten Sie Ihren PhpWiki Administrator um Unterstützung.";
+$locale["Please ensure that %s is writable, or redefine %s in config/config.ini."] = "Bitte überprüfen 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 überprüfen sie auch ADMIN_PASSWD.";
+$locale["Please set ENCRYPTED_PASSWD to true in config/config.ini."] = "Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen.";
+$locale["Please set a password in UserPreferences."] = "Bitte setzen Sie ein Passwort in Ihren BenutzerEinstellungen.";
+$locale["Please use one of the downloadable versions rather than copying and pasting from the above preview."] = "Verwenden Sie bitte eine der herunterladbaren Versionen als von der obigen Vorschau zu Kopieren und Einzufügen.";
+$locale["Ploticus"] = "Ploticus";
+$locale["Plugin"] = "Zusatzprogramm";
+$locale["Plugin %s disabled."] = "Zusatzprogramm %s deaktiviert.";
+$locale["Plugin %s failed."] = "Zusatzprogramm %s fehlgeschlagen.";
+$locale["Plugin %s: undefined"] = "Zusatzprogramm %s: undefiniert";
+$locale["Plugin '%s' does not exist."] = "Zusatzprogramm »%s« existiert nicht";
+$locale["PluginManager"] = "ZusatzprogrammManager";
+$locale["Plugins"] = "Zusatzprogramme";
+$locale["PopularNearby"] = "MeistBesuchtNahe";
+$locale["Post new"] = "Neuer Eintrag";
+$locale["Posted: %s"] = "Gepostet: %s";
+$locale["Preferences"] = "Voreinstellungen";
+$locale["PreferencesInfo"] = "EinstellungenInfo";
+$locale["PrevNext"] = "VorigeNächste";
+$locale["Preview"] = "Vorschau";
+$locale["Preview as backup format"] = "Vorschau als Backupformat";
+$locale["Preview as developer format"] = "Vorschau im Entwickler Format";
+$locale["Preview as normal format"] = "Vorschau als normales Format";
+$locale["Preview only!  Changes not saved."] = "Dies ist nur eine Vorschau! Die Änderungen sind noch nicht gespeichert.";
+$locale["Preview: Page dump of %s"] = "Vorschau: Seitendump von %s";
+$locale["Previous"] = "Vorherige";
+$locale["Previous Author"] = "Voriger Autor";
+$locale["Previous Major Revision"] = "Vorige größere Neubearbeitung";
+$locale["Previous Month"] = "Voriger Monat";
+$locale["Previous Revision"] = "Vorige Neubearbeitung";
+$locale["Printer"] = "Drucker";
+$locale["Propagate new permissions to all subpages?"] = "Aktiviere Vererbung dieser Zugriffsrechte auf alle Unterseiten?";
+$locale["Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."] = "Gespeicherten HTML Cache dieser Seite löschen und beim nächsten Aufruf neu generieren.";
+$locale["Purge Markup Cache"] = "HTML-Cachedatei Säubern";
+$locale["Purge Page"] = "Seiten endgültig löschen";
+$locale["Purge all Pages With Invalid Names"] = "Alle Seiten mit ungültigen Namen endgültig entfernen";
+$locale["Purge all empty, unreferenced Pages"] = "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind.";
+$locale["Purge this page"] = "Lösche diese Seite endgültig";
+$locale["PurgeHtmlCache"] = "HtmlCacheSäubern";
+$locale["Purged page '%s' successfully."] = "Seite »%s« erfolgreich gelöscht.";
+$locale["Purging pages"] = "Das Durchblättern der Seiten dieses Wikis";
+$locale["Querying backend directly for '%s'"] = "DB Debug Informationen von der Seite »%s«";
+$locale["Quick Search"] = "SchnellSuche";
+$locale["Random Page"] = "ZufallsSeite";
+$locale["RandomPage"] = "ZufallsSeite";
+$locale["Rate"] = "Bewerte";
+$locale["Rate It"] = "Bewerte es";
+$locale["RateIt"] = "BewerteEs";
+$locale["Rating"] = "BenutzerBewertungen";
+$locale["Rating system. Store user ratings per page"] = "Bewertungssystem. Speichere Benutzerbewertungen pro Seite";
+$locale["Raw HTML"] = "Reine HTML-Befehle";
+$locale["Raw HTML is disabled in this wiki."] = "HTML-Befehle sind in diesem Wiki außer Kraft gesetzt.";
+$locale["Reason: "] = "Grund: ";
+$locale["Recent Changes"] = "Neueste Änderungen";
+$locale["Recent Comments"] = "Neueste Kommentare";
+$locale["Recent Edits"] = "Geringfügige Änderungen";
+$locale["RecentChanges"] = "NeuesteÄnderungen";
+$locale["RecentComments"] = "NeuesteKommentare";
+$locale["RecentEdits"] = "GeringfügigeÄnderungen";
+$locale["RecentVisitors"] = "LetzteBesucher";
+$locale["Recursive redirect to self: '%s'"] = "Eigenbezogene Selbstrückleitung: »%s«";
+$locale["Recursively get BackLinks or links"] = "Alle BackLinks für %s (rekursiv)";
+$locale["Redirect"] = "Weiterleiten";
+$locale["RedirectTo"] = "WeiterLeiten";
+$locale["Redirects to an external web site based on form input"] = "Weiterleitung der Suche zu einer externen Webseite aufgrund einer Formulareingabe";
+$locale["References"] = "Fußnoten";
+$locale["Regex?"] = "Regulärer Ausdruck?";
+$locale["Registered Users"] = "Angemeldete Benutzer";
+$locale["Registered Users Online: "] = "Registrierte Benutzer Online: ";
+$locale["Reject"] = "Ablehnen";
+$locale["Related Changes"] = "Verlinkte Änderungen";
+$locale["Related Links"] = "Verwandte Links";
+$locale["RelatedChanges"] = "VerlinkteÄnderungen";
+$locale["Relation %s to page %s"] = "Relation %s zu Seite %s";
+$locale["Relations"] = "Relationen";
+$locale["Remove"] = "Löschen";
+$locale["Remove Comment"] = "Kommentare Löschen";
+$locale["Remove Page"] = "Seite Löschen";
+$locale["Remove selected pages"] = "Ausgewählte Seiten löschen";
+$locale["Remove this page"] = "Löschen der Seite";
+$locale["Removed page '%s' successfully."] = "Seite »%s« erfolgreich gelöscht.";
+$locale["Removing pages"] = "Die Seitenlöschung in diesem Wiki";
+$locale["Rename"] = "Umbenennen";
+$locale["Rename Page"] = "Seite Umbenennen";
+$locale["Rename page"] = "Seite umbenennen";
+$locale["Rename selected pages"] = "Ausgewählte Seiten umbenennen";
+$locale["Rename to"] = "Umbennen zu";
+$locale["Renamed page '%s' to '%s'."] = "Seite '%s' auf '%s' umbenannt.";
+$locale["Renamed page from '%s' to '%s'"] = "Seite '%s' auf '%s' umbenannt.";
+$locale["Replace"] = "Ersetze";
+$locale["Replace all occurences of the given string in the content of all pages."] = "Ersetze alle Wörter in den angegebenen Seiten.";
+$locale["Replace with"] = "Ersetze mit";
+$locale["Replaced '%s' with '%s' in page '%s'."] = "'%s' mit '%s' in Seite '%s' ersetzt.";
+$locale["Reply"] = "Antwort";
+$locale["Required argument %s missing"] = "Erforderliches Argument »%s« fehlt";
+$locale["Requires WikiAdmin privileges to edit."] = "Verlangt Administratorenrechte zur Bearbeitung.";
+$locale["Reset"] = "Zurücksetzen";
+$locale["Reset Preferences"] = "Lösche Voreinstellungen";
+$locale["Reset password of user: "] = "Setze Passwort für Benutzer zurück: ";
+$locale["Restore Anyway"] = "Ungeprüft überschreiben";
+$locale["Return to %s"] = "Zurück zu %s";
+$locale["Revert"] = "Zurückspeichern";
+$locale["Revert: %s"] = "Zurückspeichern: %s";
+$locale["Reverting to a previous version of pages"] = "Zurückspeichern einer älteren Version";
+$locale["Revision Not Found"] = "Version nicht gefunden";
+$locale["RichTable"] = "ErweiterteTabellen";
+$locale["SOAP access"] = "SOAP-Zugriff";
+$locale["Sample table"] = "Beispieltabelle";
+$locale["SandBox"] = "SandKasten";
+$locale["Save"] = "Speichern";
+$locale["Saved on:"] = "Gespeichert am:";
+$locale["Saved: %s"] = "Gespeichert: %s";
+$locale["Saving this page will overwrite the current version."] = "Wenn Sie diese Seite jetzt speichern, wird die aktuelle Version überschrieben.";
+$locale["Score"] = "Gewichtung";
+$locale["Search"] = "Suche";
+$locale["Search & Replace"] = "Suchen & Ersetzen";
+$locale["Search an LDAP directory"] = "Durchsuche ein LDAP Verzeichnis";
+$locale["Search and replace text in selected wiki pages."] = "Suche und ersetze Text in den gewählten Seiten.";
+$locale["Search for"] = "Suche nach";
+$locale["Search for page titles similar to %s."] = "Suche nach Seitentitel die ähnlich klingen wie %s.";
+$locale["Search the content of all pages in this wiki."] = "Den Text aller Seiten dieses Wikis durchsuchen.";
+$locale["Search the titles of all pages in this wiki."] = "Die Titeln aller Seiten dieses Wikis durchsuchen.";
+$locale["SearchHighlight"] = "SucheHervorheben";
+$locale["SearchReplace"] = "Suchen & Ersetzen";
+$locale["See %s"] = "Siehe %s";
+$locale["See %s tips for editing."] = "Siehe %s Tips fürs Edieren.";
+$locale["See: %s"] = "Siehe: %s";
+$locale["Select pages"] = "Seiten auswählen";
+$locale["Select the files to purge"] = "Wählen Sie die Seiten zum Löschen:";
+$locale["Select the files to remove"] = "Wähle Seiten zum Umbenennen aus:";
+$locale["Select the pages to change the markup type"] = "Wählen Sie die Seiten zum Ändern:";
+$locale["Select the pages to change the owner"] = "Wählen Sie die Seiten zum Ändern:";
+$locale["Select the pages to change:"] = "Wählen Sie die Seiten zum Ändern:";
+$locale["Select the pages to rename:"] = "Wähle Seiten zum Umbenennen aus:";
+$locale["Select the pages to search and replace"] = "Seiten auswählen:";
+$locale["Select the pages where to change access rights"] = "Wählen Sie die Seiten zum Ändern:";
+$locale["Select: "] = "Auswahl: ";
+$locale["Selected Grant checkboxes allow access, unselected checkboxes deny access."] = "Gesetzte Erlaube Kästchen erlauben Zugriff, ungesetzte Kästchen sperren Zugriff.";
+$locale["Selected Pages: "] = "Ausgewählte Seiten: ";
+$locale["Selected page '%s' passed to '%s'."] = "Ausgewählte Seite »%s« an »%s« übergeben.";
+$locale["Semantic relations for %s"] = "Semantische Beziehungen für %s";
+$locale["SemanticRelations"] = "SemantischeBeziehungen";
+$locale["SemanticSearch"] = "SemantischeSuche";
+$locale["Send email"] = "Versende E-Mail";
+$locale["Serialized file %s"] = "Serialisierte Datei %s";
+$locale["Set Password"] = "Setze Passwort";
+$locale["Set USE_DB_SESSION to false."] = "Setzen Sie USE_DB_SESSION auf false.";
+$locale["Set individual page permissions."] = "Setze individuelle Zugangsrechte.";
+$locale["SetAcl"] = "AclSetzen";
+$locale["Show and add blogs for %s"] = "Blogs für %s zeigen und hinzufügen";
+$locale["Show and add comments for %s"] = "Kommentare für %s zeigen und hinzufügen";
+$locale["Show changes for:"] = "Zeige Änderungen innerhalb von:";
+$locale["Show extra page Info and statistics for %s."] = "Zusätzliche Seiten-Info und Statistiken über %s zeigen.";
+$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.";
+$locale["Show summary information of the current user sessions."] = "Zeige Überblick über alle aktuellen Benutzersessions.";
+$locale["Show translations of various words or pages"] = "Zeige Übersetzungen für verschiedene Wörter oder Seiten";
+$locale["Sidebar"] = "Sidebar";
+$locale["Sign In"] = "Anmelden";
+$locale["Sign Out"] = "Abmelden";
+$locale["Sign in as:"] = "Anmelden als:";
+$locale["SignIn"] = "AnMelden";
+$locale["SignOut"] = "Abmelden";
+$locale["Signed Users"] = "Angemeldete Benutzer";
+$locale["Simple RSS Feed aggregator Plugin"] = "Einfaches RSS Feed Plugin";
+$locale["Simple Sample Plugin"] = "Zusatzprogramm Minimalbeispiel";
+$locale["Simple jabber presence plugin"] = "Einfaches Jabber-Anwesenheits Zusatzprogramm";
+$locale["Since you started the deletion process, someone has saved a new version of %s.  Please check to make sure you still want to permanently remove the page from the database."] = "Während Sie den Löschungsprozess begonnen haben, hat jemand anderer eine neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch von der Datenbank permanent löschen wollen.";
+$locale["Since you started the purge process, someone has saved a new version of %s.  Please check to make sure you still want to permanently purge the page from the database."] = "Während Sie den Löschungsprozess begonnen haben, hat jemand anderer eine neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch von der Datenbank permanent löschen wollen.";
+$locale["SiteMap"] = "SeitenÜbersicht";
+$locale["Size"] = "Größe";
+$locale["Size:"] = "Größe:";
+$locale["Skipped."] = "Ausgelassen.";
+$locale["Skipping"] = "Übersprungen";
+$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."] = "Einige der Änderungen konnten nicht automatisch miteinander verbunden werden. Bitte suchen Sie nach den Teilen, die mit »%s« anfangen und mit »%s« enden. Sie müssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern klicken.";
+$locale["Someone has edited the page!"] = "Jemand hat die Seite bereits bearbeitet!";
+$locale["Sorry but this file is too big."] = "Leider ist diese Datei zu groß.";
+$locale["Sorry for the inconvenience."] = "Entschuldigen Sie bitte die hiermit für Sie verbundenen Unannehmlichkeiten.";
+$locale["Sorry! You must wait at least 20 minutes until you can vote again!"] = "Leider! Du kannst erst wieder in 20 Minuten wählen!";
+$locale["Sorry, no dynamic DB Session support."] = "Leider! Dynamische DB Session Unterstützung nicht vorhanden.";
+$locale["Sorry, this page does not exist."] = "Leider, diese Seite ist nicht in der Datenbank.";
+$locale["Sorry, this version of PHP cannot create PNG image files."] = "Das geht leider nicht. Diese PHP Version kann keine PNG Bilder erzeugen.";
+$locale["Sort by %s"] = "Sortiere nach %s";
+$locale["Sound Score"] = "Aussprachliche";
+$locale["Spam Prevention"] = "AntiSpam";
+$locale["SpamAssassin reports: "] = "SpamAssassin sagt: ";
+$locale["Special Pages"] = "Spezialseiten";
+$locale["SpecialPages"] = "Spezialseiten";
+$locale["Spelling Score"] = "Buchstabierende";
+$locale["SqlResult"] = "SqlErgebnis";
+$locale["Statistics about %s."] = "Statistik über %s.";
+$locale["Status:"] = "Gültigkeit:";
+$locale["Strike"] = "Durchstreichen";
+$locale["Strike-through text"] = "Durchgestrichen";
+$locale["String \"%s\" not found."] = "Zeichenkette \"%s\" nicht gefunden.";
+$locale["SubPages of %s:"] = "Unterseiten von %s:";
+$locale["Submit"] = "Eingeben";
+$locale["Submit country"] = "Land eingeben";
+$locale["Submit location"] = "Land eingeben";
+$locale["Subpage"] = "Unterseite";
+$locale["Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"] = "Substring \"\\1\" \\2 mal gefunden. Ersetze mit \"\\3\"?";
+$locale["Summary"] = "Zusammenfassung";
+$locale["Summary: %s"] = "Zusammenfassung: %s";
+$locale["Supplanted on:"] = "Ersetzt am:";
+$locale["Support moderated pages"] = "Unterstütze moderierte Seiten";
+$locale["Supported handlers are: %s"] = "Unterstützte DBA Methoden sind: %s";
+$locale["Supported languages"] = "Unterstützte Sprachen";
+$locale["Supported themes"] = "Unterstützte Benutzeroberfläche";
+$locale["Switch to detailed list"] = "Wechsle zu detallierter Liste";
+$locale["Switch to summary"] = "Zur Übersicht wechseln";
+$locale["Synopsis"] = "Übersicht";
+$locale["Syntax language not specified."] = "Keine Syntax angegeben.";
+$locale["SyntaxHighlighter"] = "SyntaxHervorhebung";
+$locale["Table of Contents"] = "Inhaltsverzeichnis";
+$locale["Table of content"] = "Inhaltsverzeichnis";
+$locale["Template"] = "Vorlage";
+$locale["Template Name"] = "Vorlagenname";
+$locale["TermsOfUse"] = "BenutzungsBedingungen";
+$locale["TextFormattingRules"] = "TextFormatierungsRegeln";
+$locale["Thank you for editing %s."] = "Danke für das Bearbeiten von %s.";
+$locale["Thanks for adding this translation!"] = "Danke für diese Übersetzung!";
+$locale["Thanks for participating!"] = "Danke für die Teilnahme!";
+$locale["The %d least popular pages of this wiki:"] = "Die %d selten besuchten Seiten dieses Wikis:";
+$locale["The %d most popular pages of this wiki:"] = "Die %d meistbesuchten Seiten dieses Wikis:";
+$locale["The %d most recent %s are listed below."] = "Die %d jüngste %s sind unten aufgelistet.";
+$locale["The %d most recent %s during the past %s days are listed below."] = "Die %d jüngste %s innerhalb der letzten %s Tage sind unten aufgelistet.";
+$locale["The %d most recent %s during the past day are listed below."] = "Die %d jüngste %s innerhalb des letzten Tages sind unten aufgelistet.";
+$locale["The %d oldest %s are listed below."] = "Die %d älteste %s sind unten aufgelistet.";
+$locale["The %d oldest %s during the past %s days are listed below."] = "Die %d älteste %s innerhalb der letzten %s Tage sind unten aufgelistet.";
+$locale["The %d oldest %s during the past day are listed below."] = "Die %d älteste %s innerhalb des letzten Tages sind unten aufgelistet.";
+$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!"] = "Die %s Dateien liegen im Verzeichnis %s. Bitte lesen Sie jetzt zuerst die INSTALL Anleitung und verschieben Sie danach die DB Datei an einen anderen endgültigen Speicherplatz, Sie laufen sonst Gefahr, alle Seiten zu verlieren.";
+$locale["The %s subpage enables simple weblogging."] = "Die %s UnterSeite ermöglicht ein einfaches Weblog.";
+$locale["The DBA handler %s is unsupported!"] = "Die DBA Methode %s wird nicht unterstützt!";
+$locale["The ICAO '%s' wasn't recognized."] = "Die angegebene ICAO »%s« war nicht bekannt.";
+$locale["The PhpWeather plugin provides weather reports from the Internet."] = "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet.";
+$locale["The PhpWiki access log file"] = "Die PhpWiki Zugriffslog Datei";
+$locale["The SQL_ACCESS_LOG is not enabled."] = "SQL_ACCESS_LOG ist nicht aktiviert.";
+$locale["The current page has no subpages defined."] = "Diese Seite hat keine zugewiesenen Unterseiten.";
+$locale["The current time at the server is %s."] = "Die Uhrzeit am Server ist gerade %s.";
+$locale["The length of the password is shorter than the system policy allows."] = "Die Länge des Passwortes ist kürzer als vom System gefordert.";
+$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."] = "Die Länge des gespeicherten Passwortes ist kürzer als vom System gefordert.Sie können sich leider nicht anmelden.\n Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen.";
+$locale["The most recent %s during the past %s days are listed below."] = "Die jüngste %s innerhalb der letzten %s Tage sind unten aufgelistet.";
+$locale["The most recent %s during the past day are listed below."] = "Die jüngste %s innerhalb des letzten Tages sind unten aufgelistet.";
+$locale["The newest registered user is %s."] = "Wir haben insgesamt %d registrierte Benutzer.";
+$locale["The page %s is already watched!"] = "Diese Seite %s is schon beobachtet";
+$locale["The requested information is available only to Administrators."] = "Diese Information ist nur für Administratoren zugänglich.";
+$locale["The result of this poll so far:"] = "Aktuelle Ergebnisse der Umfrage:";
+$locale["The session.save_path directory"] = "Das session.save_path Verzeichnis";
+$locale["Theme"] = "Benutzeroberfläche";
+$locale["There is already a file with name %s uploaded."] = "Es existiert schon eine gleichnamige, hochgeladene Datei %s.";
+$locale["There is no image creation data available to id '%s'. Please reload referring page."] = "Es sind keine Bilddaten vorhanden für '%'. Bitte laden Sie die Seite neu.";
+$locale["These page titles match fuzzy with '%s'"] = "Diese Seitentitel sind das Ergebnis der FuzzySuche nach »%s«.";
+$locale["These pages share an initial or final title word with '%s'"] = "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«";
+$locale["This data is based on users active over the past %s."] = "Diese Daten basieren auf den Benutzern für die letzten %s.";
+$locale["This is a minor change."] = "Kleinere Änderung.";
+$locale["This page edit seems to contain spam and was therefore not saved."] = "Diese Bearbeitung scheint Spam beinzuhalten und wurde ignoriert.";
+$locale["This page has been locked and cannot be edited."] = "Diese Seite wurde gesperrt und kann nicht bearbeitet werden.";
+$locale["This page has been locked by the administrator so your changes can not be saved."] = "Diese Seite wurde vom Administrator für die allgemeine Bearbeitung gesperrt. Ihre Änderungen können deshalb nicht gespeichert werden.";
+$locale["This revision of the page does not exist."] = "Leider, Version ist nicht in der Datenbank.";
+$locale["Those"] = "Diese";
+$locale["Time Zone"] = "Zeitzone";
+$locale["Title"] = "Titel";
+$locale["Title 1"] = "Titel 1";
+$locale["Title 2"] = "Titel 2";
+$locale["Title 3"] = "Titel 3";
+$locale["Title Search"] = "TitelSuche";
+$locale["Title search results for '%s'"] = "Titel-Suchresultate nach »%s«";
+$locale["Title:"] = "Titel:";
+$locale["TitleSearch"] = "TitelSuche";
+$locale["To add check 'Add' near the dropdown list."] = "Setze '+' um ACL Zeile hinzufügen.";
+$locale["To ignore delete the line."] = "Lösche Zeile mit 'X' um ACL Eintrag zu ignorieren.";
+$locale["Today"] = "Heute";
+$locale["Too many external links."] = "Zu viele externe Links.";
+$locale["Top & bottom toolbars"] = "Obere u. untere Werkzeugleisten";
+$locale["Top Recommendations"] = "Beste Bewertungungen";
+$locale["Topic"] = "Thema";
+$locale["Total %d plugins: "] = "%d Gesamte Zusatzprogramme: ";
+$locale["Total of %d languages: "] = "%d Sprache gesamt: ";
+$locale["Total of %d themes: "] = "%d Benutzeroberfläche gesamt: ";
+$locale["Transclude"] = "Einbetten";
+$locale["Transcluded from %s"] = "Eingebetteter Text von %s";
+$locale["Transcluded page"] = "Eingebettete Seite";
+$locale["Translate"] = "Übersetzen";
+$locale["Translate %s to %s in %s"] = "Übersetze '%s' nach '%s' in %s";
+$locale["Translate '%s' to '%s' in *%s*"] = "Übersetze '%s' nach '%s' in *%s*";
+$locale["TranslateText"] = "ÜbersetzeText";
+$locale["Translation Error!"] = "Übersetzungsfehler!";
+$locale["Type"] = "Typ";
+$locale["Type it again"] = "Bitte hier wiederholen";
+$locale["UNOBTAINABLE"] = "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 open directory '%s' for reading"] = "Konnte Verzeichnis »%s« nicht zum Lesen öffnen";
+$locale["Unable to read src='%s'"] = "Konnte src='%s' nicht lesen";
+$locale["Undefined method %s for special group %s"] = "Undefinierte Methode %s für Spezialgruppe %s";
+$locale["Undo"] = "Rückgängig";
+$locale["Undo Search & Replace"] = "Suchen & Ersetzen rückgängig machen";
+$locale["Undo disabled"] = "Undo deaktiviert";
+$locale["Unexpected EOF in zip file"] = "Unerwartetes Dateiende (EOF-Fehler) in ZIP-Datei";
+$locale["UnfoldSubpages"] = "UnterseitenEntfalten";
+$locale["Unknown special group '%s'"] = "Unbekannte Spezialgruppe »%s«";
+$locale["Unlock"] = "Entsperren";
+$locale["Unlock Page"] = "Seite Freigeben";
+$locale["Unlocking pages"] = "Die Seitenfreigabe in diesem Wiki";
+$locale["Unrecognised parameter 'mode=%s'"] = "Ungültiges Argument 'mode=%s'";
+$locale["Unsupported ACL access type %s ignored."] = "Nicht unterstützter ACL Zugiffsmodus %s ignoriert.";
+$locale["Unsupported argument: %s=%s"] = "Nicht unterstütztes Argument: %s=%s";
+$locale["Unsupported format argument %s"] = "Nicht unterstützter format Parameter %s";
+$locale["Up"] = "Oben";
+$locale["UpLoad"] = "HochLaden";
+$locale["Update Preferences"] = "Einstellungen Speichern";
+$locale["Upgrade"] = "Updaten";
+$locale["Upload"] = "Hochladen";
+$locale["Upload File"] = "Datei Hochladen";
+$locale["Uploading %s"] = "%s wird hochgeladen";
+$locale["Uploading failed."] = "Hochladen fehlgeschlagen.";
+$locale["Uploading zip dumps"] = "Das Hochladen von ZIP-Dumps in diesem Wiki";
+$locale["Use old markup"] = "Alte Formatierungssyntax verwenden";
+$locale["User %s removed page %s"] = "Seite gelöscht %s von Benutzer %s";
+$locale["User not found in LDAP"] = "Benutzer in LDAP nicht gefunden";
+$locale["User page"] = "Benutzer Seite";
+$locale["User preferences for user %s"] = "Einstellungen für Benutzer '%s'";
+$locale["User statistics"] = "Benutzer Statistiken";
+$locale["UserContribs"] = "BenutzerBewertungen";
+$locale["UserId"] = "Benutzername";
+$locale["UserId:"] = "Benutzername:";
+$locale["UserPreferences"] = "BenutzerEinstellungen";
+$locale["UserRatings"] = "BenutzerBewertungen";
+$locale["Users will not be able to sign in."] = "Benutzer werden sich nicht anmelden können.";
+$locale["Using directory '%s'"] = "Das Verzeichnis »%s« wird verwendet";
+$locale["Verification Status"] = "Bestätigungs-Status";
+$locale["Verify the current action"] = "Bestätigen Sie die gegenwärtige Aktion";
+$locale["Version"] = "Version";
+$locale["Version "] = "Version ";
+$locale["Version %d"] = "Version %d.";
+$locale["Version %s"] = "Version %s.";
+$locale["Version %s, saved on %s"] = "Version %s. gespeichert am %s";
+$locale["Versions are identical"] = "Versionen sind identisch";
+$locale["View Source"] = "QuellTextAnsicht";
+$locale["View Source: %s"] = "Quelltext Ansicht: %s";
+$locale["View a single page dump online."] = "Betrachte das interne Speicherformat einer einzelnen Seite.";
+$locale["View the current version"] = "Die aktuelle Version ansehen";
+$locale["View the current version."] = "Die aktuelle Version ansehen";
+$locale["View this page and all subpages"] = "Anzeige aller Seiten und Unterseiten";
+$locale["Viewing redirecting page."] = "Zeige Redirekt-Seite.";
+$locale["Viewing the source of pages"] = "Die Quelltextansicht der Seiten in diesem Wiki";
+$locale["Visited pages on this wiki, ordered by popularity:"] = "Die besuchten Seiten dieses Wikis, nach Popularität geordnet:";
+$locale["W"] = "Br.";
+$locale["WARNING: InterWikiMap page is unlocked, so not using those links."] = "ACHTUNG: Die InterWikiListe Seite ist ungesperrt. Ignoriert.";
+$locale["Wanted From"] = "Benötigt von";
+$locale["Wanted Pages for %s (%d total):"] = "WunschZettelSeiten für %s (%d gesamt):";
+$locale["Wanted Pages for %s:"] = "WunschZettelSeiten für %s:";
+$locale["Wanted Pages in this wiki (%d total):"] = "WunschZettelSeiten in diesem Wiki (%d gesamt):";
+$locale["Wanted Pages in this wiki:"] = "WunschZettelSeiten in diesem Wiki:";
+$locale["WantedPages"] = "WunschZettelSeiten";
+$locale["Warning:"] = "Achtung:";
+$locale["Warning: The search string cannot be empty!"] = "Achtung! Das Suchwort darf nicht leer sein!";
+$locale["Warning: You are editing an old revision."] = "Achtung: Sie bearbeiten eine alte Version.";
+$locale["Watch Page"] = "Seite beobarchten";
+$locale["WatchPage"] = "SeiteBeobarten";
+$locale["We have a total of %d registered users."] = "Wir haben insgesamt %d registrierte Benutzer.";
+$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Willkommen bei %s!\nIhr E-Mail Konto ist bestätigt und\nwird benutzt, um SeitenÄnderungs Benachrichtigungen per E-Mail zu versenden.\nSiehe %s";
+$locale["What links here"] = "Was verlinkt hierher";
+$locale["Who Is Online"] = "Wer ist Online";
+$locale["Who is online"] = "Wer ist Online";
+$locale["WhoIsOnline"] = "WerIstOnline";
+$locale["Width"] = "Breite";
+$locale["Wiki Name"] = "Name des Wikis";
+$locale["WikiAdminChmod"] = "WikiAdminChmod";
+$locale["WikiAdminChown"] = "WikiAdminChown";
+$locale["WikiAdminMarkup"] = "WikiAdminFormatierung";
+$locale["WikiAdminRemove"] = "WikiAdminLöschen";
+$locale["WikiAdminRename"] = "WikiAdminUmbenennen";
+$locale["WikiAdminSearchReplace"] = "WikiAdminSuchenErsetzen";
+$locale["WikiAdminSelect"] = "WikiAdminAuswahl";
+$locale["WikiAdminSetAcl"] = "WikiAdminAclSetzen";
+$locale["WikiAdminUtils"] = "WikiAdminUtils";
+$locale["WikiAdminUtils %s returned:"] = "WikiAdminUtils %s gibt zurück:";
+$locale["WikiBlog"] = "WikiBlog";
+$locale["WikiDB::renamePage() not yet implemented for this backend"] = "WikiDB::renamePage() für dieses Backend noch nicht implementiert";
+$locale["WikiForm"] = "WikiFormular";
+$locale["WikiForm: %s: unknown action"] = "WikiForm: %s: unbekannte Aktion";
+$locale["WikiForum"] = "WikiForum";
+$locale["WikiPoll"] = "WikiUmfrage";
+$locale["WikiWikiWeb"] = "WikiWikiWeb";
+$locale["Wikiname regexp"] = "Wikiname regexp";
+$locale["With the current offset, this would be reported as %s."] = "Mit dem eingegebenen Zeit-Unterschied, würde die Zeit %s angezeigt.";
+$locale["Wk"] = "Cw";
+$locale["Wrong password. Try again."] = "Falsches Password. Noch einmal eingeben.";
+$locale["Wrong password: "] = "Falsches Password: ";
+$locale["XML-RPC access"] = "XML-RPC Zugriff";
+$locale["Yes"] = "Ja";
+$locale["You are about to purge '%s'!"] = "Sie sind im Begriff »%s« zu löschen!";
+$locale["You are about to remove '%s'!"] = "Sie sind im Begriff »%s« zu löschen!";
+$locale["You are signed but not authenticated as %s. "] = "Angemeldet aber nicht authentifiziert als %s.";
+$locale["You are signed in as %s"] = "Sie sind angemeldet als %s";
+$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 können 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 können sich mit jedem gewünschten [WikiWort|SeitenErzeugen] als Benutzernamen ins Wiki eintragen. (Auch %s u. deutsche Umlaute sind zulässig). Der Benutzername wird in NeuesteÄnderungen als Link auf Ihre Homepage verwendet.";
+$locale["You must be an administrator to %s."] = "Sie müssen Administratorrechte haben %s.";
+$locale["You must be an administrator to use this plugin."] = "Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen.";
+$locale["You must be logged in to view ratings."] = "Sie müssen sich anmelden um die Bewertungen zu sehen.";
+$locale["You must sign in to %s."] = "Sie müssen sich anmelden %s.";
+$locale["You must sign in to watch pages."] = "Sie müssen sich anmelden um Seiten zu beobarchten.";
+$locale["You must specify a directory to dump to"] = "Sie müssen zum Sichern ein Verzeichnis angeben.";
+$locale["You must wait for moderator approval."] = "Sie müssen auf die Zustimmung des Moderators warten.";
+$locale["You need to specify the userid!"] = "Sie müssen den Benutzernamen angeben!";
+$locale["You stored an empty password in your '%s' page."] = "Sie haben ein leeres Passwort in Ihrer HomePage »%s« gespeichert.";
+$locale["Your E-Mail:"] = "Ihre E-Mail-Adresse:";
+$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Ihr WikiDB DB backend '%s' wird von DbSession nicht unterstützt.";
+$locale["Your access permissions are only for a BogoUser."] = "Ihre Zugriffsberechtigung entspricht lediglich einem BogoUser.";
+$locale["Your are probably trying to edit/create an invalid version of this page."] = "Sie versuchen offenbar eine ungültige Version dieser Seite zu bearbeiten.";
+$locale["Your careful attention to detail is much appreciated."] = "Die besondere Aufmerksamkeit, die Sie soeben der Bearbeitung dieser Seite gewidmet haben, wird von allen Benutzern dieses Wikis gern gesehen und hoch geschätzt.";
+$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."] = "Ihre Änderungen können so, wie sie sind, nicht gespeichert werden. Das hätte unzulässigerweise die bereits gesicherten Änderungen des anderen Autors überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors miteinander kombiniert worden. Das Ergebnis sehen Sie unten.";
+$locale["Your home page has not been created yet so your preferences cannot not be saved."] = "Sie haben Ihre persönliche HomePage Seite noch nicht erstellt, deshalb können Ihre Einstellungen nicht gespeichert werden.";
+$locale["Your home page is locked so your preferences cannot not be saved."] = "Ihre persönliche HomePage Seite ist gesperrt, deshalb können Ihre Änderungen nicht gespeichert werden.";
+$locale["Your rating was %.1f"] = "Deine Bewertung war %.1f";
+$locale["Your signature"] = "Deine Signatur";
+$locale["Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation."] = "Dein übersetzter Text erscheint noch nicht in %s, aber ein Administrator wird sich darum kümmern.";
+$locale["Your translation is stored in %s"] = "Deine Übersetzung ist in %s abgespeichert";
+$locale["Your version"] = "Ihre Version";
+$locale["ZIP files of database"] = "Speichern und Archivieren";
+$locale["[%d] See [%s]"] = "[%d] Siehe [%s]";
+$locale["[not purgable]"] = "[nicht entfernbar]";
+$locale["[purged]"] = "[entfernt]";
+$locale["_WikiTranslation"] = "_WikiÜbersetzung";
+$locale["access this wiki via SOAP"] = "um via SOAP auf dieses Wiki zuzugreifen";
+$locale["access this wiki via XML-RPC"] = "um via XML-RPC auf dieses Wiki zuzugreifen";
+$locale["add "] = "hinzufügen ";
+$locale["argument '%s' not declared by plugin"] = "Argument »%s« nicht im Zusatzprogramm deklariert";
+$locale["authenticated"] = "authentifizierten";
+$locale["blog"] = "Blog";
+$locale["by"] = "mit";
+$locale["by %s"] = "von %s";
+$locale["cached pagedata:"] = "Seitendaten in den Cachespeicher aufgenommen:";
+$locale["cached versiondata:"] = "Versionendaten in den Cachespeicher aufgenommen:";
+$locale["change page '%s' to markup type '%s'."] = "Formatierung der Seite '%s' auf '%s' geändert.";
+$locale["chmod page '%s' to '%s'."] = "Berechtigung der Seite '%s' auf '%s' geändert.";
+$locale["comments"] = "Kommentare";
+$locale["compare revisions"] = "Versionen vergleichen";
+$locale["content is identical to current version %d - no new revision created"] = "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version erzeugt";
+$locale["couldn't move %s to %s"] = "Kann »%s« nicht nach »%s« verschieben";
+$locale["couldn't open file '%s' for writing"] = "Datei »%s« konnte nicht zum Schreiben geöffnet werden";
+$locale["create this page"] = "um diese Seite zu erzeugen";
+$locale["current version"] = "aktuelle Version";
+$locale["database"] = "Datenbank";
+$locale["days"] = "Tage";
+$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["dump html pages"] = "um von diesem Wiki HTML-Dateien lokal abzuspeichern";
+$locale["dump serial pages"] = "um von diesem Wiki die Seiten lokal abzuspeichern";
+$locale["edit area"] = "Texteingabe Fenster";
+$locale["edit this page"] = "um diese Seite zu bearbeiten";
+$locale["edits"] = "Änderungen";
+$locale["empty source"] = "fehlender Quelltext";
+$locale["external"] = "externe";
+$locale["file %s is not writable"] = "%s ist nicht änderbar";
+$locale["file %s not found"] = "%s nicht gefunden";
+$locale["fixed"] = "geändert";
+$locale["fixed with"] = "Geändert mit";
+$locale["from"] = "von";
+$locale["from %s"] = "von %s";
+$locale["from '%s'"] = "von %s";
+$locale["has edit conflicts - overwriting anyway"] = "hat unauflösbare Konflikte beim Speichern - wird ungeprüft überschrieben";
+$locale["has edit conflicts - skipped"] = "hat unauflösbare Konflikte beim Speichern - übersprungen";
+$locale["home page"] = "Start Seite";
+$locale["hours"] = "Stunden";
+$locale["http://www.example.com|optional label"] = "http://www.example.com|optionaler Name";
+$locale["incoming"] = "eingehend";
+$locale["individual page permission"] = "individuelles Zugriffsrecht";
+$locale["invalid %s ignored"] = "ungültiges %s ignoriert";
+$locale["invalid argument %s"] = "Ungültiger Parameter %s";
+$locale["latest comment by "] = "Letzter Kommentar von ";
+$locale["load files into this wiki"] = "um Seiten in dieses Wiki zu laden";
+$locale["lock this page"] = "um diese Seite zu sperren";
+$locale["locked"] = "gesperrt";
+$locale["major edits"] = "Größere Änderungen";
+$locale["max: %d"] = "Max: %d";
+$locale["mean: %2.3f"] = "Mittel: %2.3f";
+$locale["median: %d"] = "Median: %d";
+$locale["minor"] = "kleinere";
+$locale["minor edit"] = "geringfügige";
+$locale["minor edits"] = "Kleinere Änderungen";
+$locale["minutes"] = "Minuten";
+$locale["missing required version argument"] = "Parameter version muß angegeben werden";
+$locale["new window"] = "neues Fenster";
+$locale["newer than the existing page."] = "neuer als die bestehende Seite.";
+$locale["no RSS items"] = "keine RSS Einträge";
+$locale["no cache used"] = "kein Cache verwendet";
+$locale["no page content"] = "leerer Seiteninalt";
+$locale["no page specified"] = "Keine Seite angegeben";
+$locale["not affected"] = "nicht betroffen";
+$locale["not authenticated"] = "nicht authentifizierten";
+$locale["not yet"] = "noch nicht";
+$locale["older than the existing page."] = "älter als die bestehende Seite.";
+$locale["only %d pages displayed"] = "nur %d Seiten angezeigt";
+$locale["outgoing"] = "ausgehend";
+$locale["page not locked"] = "Seite nicht gesperrt";
+$locale["page permission inherited from %s"] = "Zugriffsrecht geerbt von %s";
+$locale["plain file %s"] = "Nur-Text-Datei %s";
+$locale["predecessor to the previous major change"] = "Vorgänger zur vorherigen größeren Änderung";
+$locale["previous revision"] = "vorige Neubearbeitung";
+$locale["purge this page"] = "um diese Seite endgültig zu löschen";
+$locale["remove this page"] = "um diese Seite zu löschen";
+$locale["rename %s to %s"] = "Seite »%s« nach umbenennen »%s«";
+$locale["rename this page"] = "um diese Seite umzubennen";
+$locale["renamed from %s"] = "umbenannt von %s";
+$locale["reverse"] = "umdrehen";
+$locale["revert to a previous version of this page"] = "Zurückspeichern einer älteren Version dieser Seite.";
+$locale["revert to version %d"] = "Speichere Version %d zurück.";
+$locale["revision by previous author"] = "Revidierte Ausgabe des vorigen Autors";
+$locale["same version page"] = "selbe Version der Seite";
+$locale["saved as "] = "gespeichert als ";
+$locale["saved as %s"] = "gespeichert als %s";
+$locale["sent to %s"] = "an %s gesendet";
+$locale["stddev: %2.3f"] = "Standardabweichung: %2.3f";
+$locale["the file '%s'"] = "die Datei %s";
+$locale["the session.save_path directory '%s'"] = "das session.save_path Verzeichnis »%s«";
+$locale["to"] = "nach";
+$locale["to '%s'."] = "Gehe zu %s.";
+$locale["today"] = "heute";
+$locale["too long"] = "zu lang";
+$locale["total hits: %d"] = "Anzahl aller Seitenaufrufe %d";
+$locale["trailing cruft in plugin args: '%s'"] = "Überflüssiger Müll in den Zusatzprogramm Argumenten: »%s«";
+$locale["unknown color %s ignored"] = "unbekannte Farbe %s ignoriert";
+$locale["unlock this page"] = "um diese Seite zu entsperren";
+$locale["upload a zip dump"] = "um einen ZIP-Speicherauszug in dieses Wiki zu laden";
+$locale["uploaded %s"] = "%s wurde hochgeladen";
+$locale["use"] = "benutze";
+$locale["use this plugin"] = "um diese Zusatzprogramme zu verwenden";
+$locale["users"] = "Benutzer";
+$locale["verify the current action"] = "um die gegenwärtige Aktion durchzuführen";
+$locale["version %d"] = "Version %d.";
+$locale["version %s"] = "Version %s";
+$locale["version <em>%s</em>"] = "version <em>%s</em>";
+$locale["version <em>%s</em> not affected"] = "version <em>%s</em> nicht betroffen";
+$locale["view the source of this page"] = "um den Quelltext dieser Seiten anzusehen";
+$locale["view this page"] = "um diese Seite anzuzeigen";
+$locale["weeks"] = "Wochen";
 $locale["yesterday"] =
    "gestern";
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleBenutzer
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleBenutzer	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleBenutzer	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 17:33:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AlleBenutzer 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AlleBenutzer 7938 2011-02-04 16:35:28Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AlleBenutzer;
   flags=PAGE_LOCKED;
@@ -14,5 +14,6 @@
 in einer Datenbank.
 ----
 <<AllUsers>>
+
 ----
-WikiPlugin PluginManager
+[[KategorieAktionSeite]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeiten
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeiten	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeiten	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 17:33:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AlleSeiten 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AlleSeiten 7938 2011-02-04 16:35:28Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AlleSeiten;
   flags=PAGE_LOCKED;
@@ -12,3 +12,6 @@
 (OrphanedPages) die ansonsten nicht erreichbar sind.
 
 <<AllPages>>
+
+----
+[[KategorieAktionSeite]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenEditiertVonMir
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenEditiertVonMir	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenEditiertVonMir	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 17:33:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AlleSeitenEditiertVonMir 7682 2010-09-10 12:03:36Z vargenau $ 
+X-Rcs-Id: $Id: AlleSeitenEditiertVonMir 7938 2011-02-04 16:35:28Z vargenau $ 
 Content-Type: application/x-phpwiki;
   pagename=AlleSeitenEditiertVonMir;
   flags=PAGE_LOCKED;
@@ -11,3 +11,6 @@
 Die Liste aller Seiten, die von Ihnen zuletzt editiert wurden. (Wenn Sie sich authentifiziert haben)
 
 <<AllPages author=[] >>
+
+----
+[[KategorieAktionSeite]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenErzeugtVonMir
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenErzeugtVonMir	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenErzeugtVonMir	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 17:33:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AlleSeitenErzeugtVonMir 7682 2010-09-10 12:03:36Z vargenau $ 
+X-Rcs-Id: $Id: AlleSeitenErzeugtVonMir 7938 2011-02-04 16:35:28Z vargenau $ 
 Content-Type: application/x-phpwiki;
   pagename=AlleSeitenErzeugtVonMir;
   flags=PAGE_LOCKED;
@@ -11,3 +11,6 @@
 Die Liste aller Seiten, die von Ihnen erzeugt wurden. (Wenn Sie sich authentifiziert haben)
 
 <<AllPages creator=[] >>
+
+----
+[[KategorieAktionSeite]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenImBesitzVonMir
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenImBesitzVonMir	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/AlleSeitenImBesitzVonMir	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 17:33:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AlleSeitenImBesitzVonMir 7682 2010-09-10 12:03:36Z vargenau $ 
+X-Rcs-Id: $Id: AlleSeitenImBesitzVonMir 7938 2011-02-04 16:35:28Z vargenau $ 
 Content-Type: application/x-phpwiki;
   pagename=AlleSeitenImBesitzVonMir;
   flags=PAGE_LOCKED;
@@ -11,3 +11,6 @@
 Die Liste aller Seiten, die Ihnen gehören. (Wenn Sie sich authentifiziert haben)
 
 <<AllPages owner=[] >>
+
+----
+[[KategorieAktionSeite]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/BenutzerEinstellungen
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/BenutzerEinstellungen	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/BenutzerEinstellungen	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: BenutzerEinstellungen 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: BenutzerEinstellungen 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=BenutzerEinstellungen;
   flags=PAGE_LOCKED;
@@ -9,7 +9,7 @@
 Content-Transfer-Encoding: binary
 
 Sie können einige Einstellungen jetzt bestimmen. Die Werte werden in
-einer __Cookie__ Ihres Browsers gespeichert, daher müssen Cookies in
+einer **Cookie** Ihres Browsers gespeichert, daher müssen Cookies in
 Ihrem Browser aktiviert sein.
 
 <<UserPreferences>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/EditiereText
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/EditiereText	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/EditiereText	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 17:14:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: EditiereText 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: EditiereText 7933 2011-02-04 16:15:28Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=EditiereText;
   flags="";
@@ -9,5 +9,3 @@
 Content-Transfer-Encoding: binary
 
 <<RedirectTo page=TextBearbeiten>>
-----
-KategorieVeralteteSeiten

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Einstellungen
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Einstellungen	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Einstellungen	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 17:33:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Einstellungen 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Einstellungen 7936 2011-02-04 16:33:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Einstellungen;
   flags=PAGE_LOCKED;
@@ -10,5 +10,3 @@
 Content-Transfer-Encoding: binary
 
 <<RedirectTo page=BenutzerEinstellungen>>
-----
-WikiPlugin PluginManager

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Hilfe%2FAutorenProtokollPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Hilfe%2FAutorenProtokollPlugin 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FAutorenProtokollPlugin;
   flags="";
@@ -34,21 +34,21 @@
 
 === Argumente
 
-__author__ |
+**author** |
   Benutzername. Vorgabe: aktueller Benutzername
-__page__ |
+**page** |
   Seitenname.  Vorgabe: aktuelle Seite. 
   Besondere Werte: page=username: page=author, page=all: Liste aller Seiten mit Änderungen dieses Benutzers.
-__info__|
+**info**|
   Liste der Spaltentypen. Vorgabe: version,minor,author,summary,mtime
   Beispiel: info=mtime,hits,summary,version,author,locked,minor
-__exclude__ |
+**exclude** |
   Komma-getrennte Liste von Seiten, die nicht angezeigt werden sollen. Vorgabe: ''
-__noheader__ |
+**noheader** |
   boolean. Vorgabe: false
-__includeminor__ |
+**includeminor** |
   boolean. Vorgabe: false
-__includedeleted__ |
+**includedeleted** |
   boolean. Vorgabe: false
 
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FHochLadenPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FHochLadenPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Hilfe%2FHochLadenPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Hilfe%2FHochLadenPlugin 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FHochLadenPlugin;
   flags="";
@@ -24,14 +24,14 @@
 }}}
 
 === Argumente:
-__logfile__:
+**logfile**:
   Lokaler Pfad. Vorgabe: "phpwiki-upload.log"
   Das Format ist momentan HTML - eine neue <tr> Zeile per Datei - und nicht die sonst übliche 
   Log Datei Syntax.
-__autolink__:
+**autolink**:
   Füge den hochgeladene Dateinamen zur Liste der hochgeladenen Dateien auf der Seite 'page' dazu.
   Vorgabe: true
-__page__:
+**page**:
   Die Seite auf der hochgeladene Dateien aufgelistet werden, wenn 'autolink' 
   auf true gesetzt ist. 
   Vorgabe: current page.

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Hilfe%2FInhaltsVerzeichnisPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Hilfe%2FInhaltsVerzeichnisPlugin 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FInhaltsVerzeichnisPlugin;
   flags="";
@@ -21,21 +21,21 @@
 
 === Argumente
 
-__jshide__: |
+**jshide**: |
   Bool'sche Variable, ob das Inhaltsverzeichnis (TOC) zuerst versteckt sein soll, und erst auf Klick erscheint. Vorgabe: 0
-__with_toclink__:  |
+**with_toclink**:  |
   Bool'sche Variable, ob die Überschriften zum TOC zurück linken sollen. Vorgabe: 0
-__with_counter__:  |
+**with_counter**:  |
   Bool'sche Variable, ob hierarchische Prefixes verwendet sollen. Vorgabe: nein
-__headers__:  |
+**headers**:  |
   Welche Überschriften?  Vorgabe: ==,===,!    1,2,3 auch erlaubt
-__noheader__:  |
+**noheader**:  |
   Bool'sche Variable, ob die "Inhaltsverzeichnis" h2 Überschrift weggelassen soll. Vorgabe: 0
-__liststyle__:  |
+**liststyle**:  |
   dl oder ol oder ul. Vorgabe: dl
-__indentstr__:  |
+**indentstr**:  |
   Vorgabe:   
-__pagename__:  |
+**pagename**:  |
   TOC welcher Seite? Vorgabe: Aktueller Seitenname
 
 === Beispiele

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Hilfe%2FNeueSeitePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Hilfe%2FNeueSeitePlugin 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FNeueSeitePlugin;
   flags=PAGE_LOCKED;
@@ -23,11 +23,11 @@
 }}}
 
 === Argumente
-__s__: |
+**s**: |
   Der Name für die neue Seite. Vorgabe: ""
-__initial_content__:  |
+**initial_content**:  |
   Die neue Seite wird mit diesem Inhalt erzeugt. Vorgabe: ""
-__template__:  |
+**template**:  |
   Die neue Seite wird mit dem Inhalt dieser Seite erzeugt. Vorgabe: ""
 
 === Bekannte Probleme

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Hilfe%2FNeuerKommentarPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Hilfe%2FNeuerKommentarPlugin 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Hilfe%2FNeuerKommentarPlugin;
   flags="";
@@ -22,15 +22,15 @@
 
 === Argumente
 
-__jshide__: |
+**jshide**: |
   Bool'sche Variable, ob die Kommentare oder Eingabe-Textbox zuerst versteckt sein soll, und erst auf Klick erscheint. Vorgabe: 0
-__order__:  |
+**order**:  |
   Liste Kommentare in chronologischer (order=normal) oder umgekehrter Reihenfolge (order=reverse)
-__mode__:  |
+**mode**:  |
   Liste von "add" und/oder "show".  Vorgabe: "add,show"
-__noheader__:  |
+**noheader**:  |
   Bool'sche Variable, ob die "Kommentare" h2 Überschrift weggelassen soll. Vorgabe: 0
-__pagename__:  |
+**pagename**:  |
   Hänge Kommentare an welche Seite an? Vorgabe: Aktueller Seitenname
 
 === Beispiele

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/PhpWikiSystemverwalten	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/PhpWikiSystemverwalten	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 16:36:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PhpWikiSystemverwalten 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PhpWikiSystemverwalten 7927 2011-02-04 15:37:59Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiSystemverwalten;
   flags=PAGE_LOCKED;
@@ -22,17 +22,10 @@
 
 oder rufe die möglichen ~WikiAdmin Aktionen direkt auf:
 
-[/Löschen] | 
-  [/Umbenennen] |
-    [/SuchenErsetzen] |
-      [/AclSetzen] |
-        [/Chown] |
-          [/Chmod]
+| [[/Löschen]] | [[/Umbenennen]] | [[/SuchenErsetzen]] | [[/AclSetzen]] | [[/Chown]] | [[/Chmod]]
 
-----
 == Benutzerverwaltung
 
-
 Setze ein Benutzer Passwort zurück:
 
   <?plugin-form PasswordReset textinput=user method=post ?>
@@ -77,9 +70,9 @@
 deinem Wiki. Die ZIP Datei wird auf deinen lokalen Computer
 heruntergeladen, und muß dort gespeichert werden.
 
-Diese __[ kleine ZIP Datei | phpwiki:?action=zip]__ enthält nur die
-aktuellste Versionen aller Seiten, und diese __[ große ZIP Datei |
-phpwiki:?action=zip&include=all]__ enthält zusätzlich alle
+Diese **[ kleine ZIP Datei | phpwiki:?action=zip]** enthält nur die
+aktuellste Versionen aller Seiten, und diese **[ große ZIP Datei |
+phpwiki:?action=zip&include=all]** enthält zusätzlich alle
 archivierten, vorigen Versionen.%%%
 (Wenn dein PhpWiki insoweit konfiguriert ist, darf jeder die ZIP Datei herunterladen.)
 
@@ -150,13 +143,13 @@
 
 ==== Alte Daten-Formate
 
-__Serialisierte Dateien__
+**Serialisierte Dateien**
 
   Der alte Dump-To-Directory Befehl schrieb alle Seiten als PHP
   _serialized()_ Zeichenketten hinaus, die erstens unleserlich sind,
   und zweitens schwer bis gar nicht zu editieren sind.
 
-__Textdateien__
+**Textdateien**
 
   Davor wurde der Seiteninhalt als einfache Textdatei gespeichert,
   d.h. alle zusätzlichen Daten (Meta-Daten) gingen verloren. (Datum,
@@ -177,7 +170,7 @@
 auch ohne Webserver und Datenbank betrachtbar sind.
 
   Das XHTML-Verzeichnis kann auch heruntergeladen werden als eine
-  __[XHTML ZIP Datei | phpwiki:?action=ziphtml]__.
+  **[XHTML ZIP Datei | phpwiki:?action=ziphtml]**.
 
 ----
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeiteFinden
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeiteFinden	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeiteFinden	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: SeiteFinden 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: SeiteFinden 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SeiteFinden;
   flags=PAGE_LOCKED;
@@ -41,4 +41,4 @@
 %%%Um Seiten zu finden, in denen ein Wort nicht vorkommt, ein '-'
 davor hängen.
 %%%Beispiel: 'wiki text -php' sucht nach Seiten mit dem Wörtern
-'wiki' __und__ 'text', die das Wort 'php' __nicht__ enthalten.
+'wiki' **und** 'text', die das Wort 'php' **nicht** enthalten.

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeiteSpeichern
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeiteSpeichern	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeiteSpeichern	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri,  4 Feb 2011 17:33:12 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: SeiteSpeichern 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: SeiteSpeichern 7937 2011-02-04 16:34:36Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SeiteSpeichern;
   flags=PAGE_LOCKED;
@@ -19,4 +19,4 @@
 <?plugin-form TitleSearch?>
 
 ----
-Siehe auch: [QuellTextAnsicht|phpwiki:?action=viewsource], PluginManager.
+Siehe auch: [QuellTextAnsicht|phpwiki:?action=viewsource].

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeitenErzeugen
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeitenErzeugen	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/SeitenErzeugen	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,13 +1,13 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: SeitenErzeugen 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: SeitenErzeugen 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SeitenErzeugen;
   flags="";
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-Um dem Wiki eine neue Seite hinzuzufügen mußt du dir nur einen sinnvollen Titel einfallen lassen, alle Wörter im Titel großschreiben und sie AufDieseArtZusammenfuegen. Wiki erkennt dies automatisch als einen Hyperlink. __Umlaute kannst du in Titeln auch verwenden: [[den Namen in eckige Klammern so einschließen].__
+Um dem Wiki eine neue Seite hinzuzufügen mußt du dir nur einen sinnvollen Titel einfallen lassen, alle Wörter im Titel großschreiben und sie AufDieseArtZusammenfuegen. Wiki erkennt dies automatisch als einen Hyperlink. **Umlaute kannst du in Titeln auch verwenden: [[den Namen in eckige Klammern so einschließen].**
 
 Dann kannst du das Fragezeichen am Ende des neuen Hyperlinks anklicken, und Wiki öffnet einen Editor zum Erstellen der neuen Seite.
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/StartSeite
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/StartSeite	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/StartSeite	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Wed, 26 Jan 2011 17:26:56 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: StartSeite 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: StartSeite 7908 2011-01-26 16:28:16Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=StartSeite;
   flags="";
@@ -13,5 +13,5 @@
 * Bitte trage dich im GästeBuch ein.
 * Die letzten Änderungen und neue Seiten findet man unter NeuesteÄnderungen.
 * Eine Liste der [MeistBesucht]en Seiten.
-* ReleaseNotes (in Englisch)
+* [[ReleaseNotes]] (in Englisch)
 * Dieses Wiki wird verwaltet unter PhpWikiSystemverwalten.

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/UpLoad
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/UpLoad	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/de/pgsrc/UpLoad	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Tue,  4 Jan 2011 11:59:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: UpLoad 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: UpLoad 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=UpLoad;
   flags="";
@@ -8,7 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-__Uploade eine Datei, die dann mit dem "Upload~:" Prefix zugänglich sein sein wird.__
+**Uploade eine Datei, die dann mit dem "Upload~:" Prefix zugänglich sein sein wird.**
 ----
 <<UpLoad >>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/es/LC_MESSAGES/phpwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,1007 +1,517 @@
 <?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: "] =
-   "%d mejores enlaces de entrada: ";
-$locale["%d best outgoing links: "] =
-   "%d mejores enlaces de salida: ";
-$locale["%d minutes"] =
-   "%d minutas";
-$locale["%d most popular nearby: "] =
-   "%d las más populares: ";
-$locale["%d not-empty pages"] =
-   "%d not-empty páginas";
-$locale["%d pages"] =
-   "%d páginas";
-$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"] =
-   "%s por %s";
-$locale["%s bytes"] =
-   "%s octetos";
-$locale["%s bytes written"] =
-   "%s octetos";
-$locale["%s days"] =
-   "%s dias";
-$locale["%s has no subpages defined."] =
-   "%s: no hace ninguna página secundaria definir.";
-$locale["%s is disallowed on this wiki."] =
-   "%s se rechaza en este wiki.";
-$locale["%s is empty"] =
-   "%s es vacío";
-$locale["%s is missing"] =
-   "%s falta";
-$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 acción";
-$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 revisión es %s";
-$locale["%s: action forwarded to a moderator."] =
-   "%s: acción 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: no definido";
-$locale["&version=-1 might help."] =
-   "&version=-1 pudo ayudar.";
-$locale["'%s': Bad page name"] =
-   "'%s': Mal nombre de la página";
-$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 versión %d";
-$locale["- version %d saved to database as version %d"] =
-   "- versión %d ahorrada a la base de datos como versión %d";
-$locale["... copied to %s"] =
-   "... copia de [%s]";
-$locale["... not copied to %s"] =
-   "... non copia de [%s]";
-$locale["... not found"] =
-   "... no encontrado";
-$locale["1 day"] =
-   "1 día";
-$locale["<empty>"] =
-   "<vacío>";
-$locale["<no matches>"] =
-   "<ningunos fósforos>";
-$locale["<none>"] =
-   "<Ninguna>";
-$locale["<unknown>"] =
-   "<desconocido>";
-$locale["ADMIN"] =
-   "ADMIN";
-$locale["ANON"] =
-   "ANÓN";
-$locale["Access"] =
-   "Acceso";
-$locale["Access for you is forbidden to %s."] =
-   "Tenga acceso para usted se prohíbe %s.";
-$locale["Add Comment"] =
-   "Agregue El Comentario";
-$locale["Add this ACL"] =
-   "Agregue este ACL";
-$locale["AddCategory"] =
-   "AgregueCategoría";
-$locale["AddPageLink"] =
-   "AgregueElAcoplamientoDeLaPágina";
-$locale["AddPlugin"] =
-   "AgreguePlugin";
-$locale["AddTemplate"] =
-   "AgregueLaPlantilla";
-$locale["Administrators"] =
-   "Administradores";
-$locale["All %s are listed below."] =
-   "Todos los %s se enumeran abajo.";
-$locale["AllPages"] =
-   "TodasLasPáginas";
-$locale["AllUsers"] =
-   "TodasLasUsuarios";
-$locale["Allow / Deny"] =
-   "Permita/Niegue";
-$locale["An unnamed PhpWiki"] =
-   "Un PhpWiki sin un nombre";
-$locale["Anonymous Users"] =
-   "Usuarios Anónimos";
-$locale["Argument '%s' not declared by plugin."] =
-   "Parámetro '%s' no declarada por plugin.";
-$locale["Article"] =
-   "Artículo";
-$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."] =
-   "Registrarán al autor como %s.";
-$locale["BOGO"] =
-   "BOGO";
-$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"] =
-   "Páginas el hojear";
-$locale["Calendar"] =
-   "Calendario";
-$locale["CalendarList"] =
-   "CalendarioLista";
-$locale["CalendarListPlugin"] =
-   "CalendarioListaPlugin";
-$locale["CalendarPlugin"] =
-   "CalendarioPlugin";
-$locale["Cancel"] =
-   "Cancelar";
-$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["Category"] =
-   "Categoría";
-$locale["CategoryCategory"] =
-   "CategoriaCategoria";
-$locale["CategoryGroup"] =
-   "GrupoCategoría";
-$locale["CategoryHomepage"] =
-   "CategoríaHomepage";
-$locale["CategoryPage"] =
-   "CategoríaPágina";
-$locale["Change Password"] =
-   "Change Contraseña";
-$locale["Change page attributes"] =
-   "Cambie las cualidades de la página";
-$locale["Check to add this ACL"] =
-   "Compruebe para agregar este ACL";
-$locale["Chown"] =
-   "Cambie a dueño";
-$locale["Click a button to get an example text"] =
-   "Chasque un botón para conseguir un texto del ejemplo";
-$locale["Click to de-/select all pages"] =
-   "Tecleo para de-/seleccionar todas las páginas";
-$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 podía conectar con %s";
-$locale["Create a Wiki page."] =
-   "Cree una página de Wiki.";
-$locale["Create a new (sub)page"] =
-   "Cree una página (secundaria) nueva";
-$locale["Create: %s"] =
-   "Cree: %s";
-$locale["CreatePage"] =
-   "CreeLaPágina";
-$locale["CreateToc"] =
-   "CreeToc";
-$locale["Created by CreatePage"] =
-   "Cree par CreeLaPágina";
-$locale["Created directory '%s' for the page dump..."] =
-   "Directorio creado '%s' para la descarga de la página...";
-$locale["Creator"] =
-   "Creador";
-$locale["DB admin password:"] =
-   "DB admin contraseña:";
-$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 serán utilizadas.";
-$locale["Del/+"] =
-   "-/+";
-$locale["Delete this ACL"] =
-   "Suprima este ACL";
-$locale["Describe %s here."] =
-   "Describe %s aquí.";
-$locale["Description"] =
-   "Descripción";
-$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"] =
-   "Discusión";
-$locale["Dump pages as XHTML"] =
-   "Páginas de la descarga como XHTML";
-$locale["Dump to directory"] =
-   "Descarga al directorio";
-$locale["Dumping Pages"] =
-   "Descargar Las Páginas";
-$locale["E-Mail address '%s' is not properly formatted"] =
-   "La dirección ' %s' del email no se ajusta a formato correctamente";
-$locale["E-Mail address '%s' is properly formatted"] =
-   "La dirección ' %s' del email se ajusta a formato correctamente";
-$locale["Edit"] =
-   "Editar";
-$locale["Edit %s"] =
-   "Editar %s";
-$locale["Edit old revision"] =
-   "Corrija versión archivada";
-$locale["Edit this page"] =
-   "Corrija esta página";
-$locale["Edit this page and all subpages"] =
-   "Corrija esta página y todas las páginas 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"] =
-   "Verificación Del Email";
-$locale["Empty Preferences or format of UserPreferences cookie not recognised."] =
-   "Preferencias o formato vacías de la galleta de UsuarioPreferencias no reconocido.";
-$locale["Empty link to: %s"] =
-   "Acoplamiento vacío a: %s";
-$locale["Empty pagename!"] =
-   "¡Escriba un nombre de página!";
-$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"] =
-   "BuscarPágina";
-$locale["First"] =
-   "Primera";
-$locale["Full text search results for '%s'"] =
-   "Resultados de la búsqueda en el texto completo para '%s'";
-$locale["FullDump"] =
-   "DescargaCompleta";
-$locale["FullTextSearch"] =
-   "BúsquedaDelTexto";
-$locale["Given password ignored."] =
-   "Contraseña no hecho caso.";
-$locale["Go"] =
-   "Aceptar";
-$locale["Grant"] =
-   "Concesión";
-$locale["Group %s does not exist"] =
-   "El grupo %s no existe";
-$locale["Group page '%s' does not exist"] =
-   "La página '%s' del grupo no existe";
-$locale["Group/User"] =
-   "Grupo/Usuario";
-$locale["H"] =
-   "Al";
-$locale["Headline text"] =
-   "Texto del título";
-$locale["Height"] =
-   "Altura";
-$locale["Hits"] =
-   "Número de hits";
-$locale["Hits:"] =
-   "Número de hits:";
-$locale["HomePage"] =
-   "PáginaPrincipal";
-$locale["HomePageAlias"] =
-   "PáginaPrincipalAlias";
-$locale["Horizontal line"] =
-   "Linea horizontal";
-$locale["I'm sorry, there is no such page as %s."] =
-   "Estoy apesadumbrado, allí no soy ninguna página tal como %s.";
-$locale["I'm sorry.  Version %d of %s is not in the database."] =
-   "Estoy apesadumbrado.  La versión %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 página 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 página, otro usuario ha ahorrado una nueva versión de ella.";
-$locale["Included from %s"] =
-   "Inserción de '%s'";
-$locale["Included from %s:"] =
-   "Inserción de '%s':";
-$locale["Info"] =
-   "Informacion";
-$locale["Insert"] =
-   "Relleno";
-$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"] =
-   "InterWikiBúsqueda";
-$locale["Invalid [] syntax ignored"] =
-   "[] el sintaxis inválido no hizo caso";
-$locale["Invalid password or userid."] =
-   "Contraseña o userid inválida.";
-$locale["Invalid password."] =
-   "Contraseña inválido.";
-$locale["Invalid username '%s' for LDAP Auth"] =
-   "Username inválido ' %s' para LDAP Auth";
-$locale["Invalid username."] =
-   "Username inválido.";
-$locale["Italic text"] =
-   "Texto del itálico";
-$locale["Last"] =
-   "Final";
-$locale["Last Author"] =
-   "Autor Pasado";
-$locale["Last Modified"] =
-   "modificado por última vez";
-$locale["Last Summary"] =
-   "Comentarios";
-$locale["Last edited %s"] =
-   "Editada por última vez %s.";
-$locale["Last edited on %s"] =
-   "Editada por última vez %s.";
-$locale["LatestSnapshot"] =
-   "La Foto Más última";
-$locale["Level 1 headline"] =
-   "Título del nivel 1";
-$locale["Link to page"] =
-   "Acoplamiento a la página";
-$locale["List all pages which link to %s."] =
-   "Enumere todas las páginas que se liguen a %s.";
-$locale["List the most popular pages."] =
-   "Las páginas más populares.";
-$locale["List the user's ratings."] =
-   "Enumere los grados del usuario.";
-$locale["List this page and all subpages"] =
-   "Enumere esta página y todas las páginas secundaria";
-$locale["ListPages"] =
-   "ListaPáginas";
-$locale["ListSubpages"] =
-   "ListaPáginasSecundaria";
-$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"] =
-   "Bloquear Página";
-$locale["Locked"] =
-   "Bloqueada";
-$locale["Locking pages"] =
-   "Bloquear páginas";
-$locale["MIME file %s"] =
-   "Archivo %s del MIME";
-$locale["Members:"] =
-   "Miembros:";
-$locale["Merge Edit"] =
-   "Fusión Editar";
-$locale["Merge and Edit: %s"] =
-   "Fusión y Editar: %s";
-$locale["Message"] =
-   "Mensaje";
-$locale["Method '%s' not implemented in this GROUP_METHOD %s"] =
-   "Método ' %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 página:";
-$locale["ModeratedPage"] =
-   "PáginaModerada";
-$locale["Modern"] =
-   "Moderno";
-$locale["Modified"] =
-   "modificado";
-$locale["MostPopular"] =
-   "MasPopulares";
-$locale["Name"] =
-   "Nombre de la Página";
-$locale["Never edited"] =
-   "Nunca corregido";
-$locale["New page"] =
-   "Página nueva";
-$locale["New password"] =
-   "Nueva Contraseña";
-$locale["Newer page:"] =
-   "Página más nueva:";
-$locale["Next"] =
-   "Siguiente";
-$locale["Next Month"] =
-   "El Mes Próximo";
-$locale["No LDAP in this PHP version"] =
-   "Ningún LDAP en esta versión 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?"] =
-   "¿Ningún 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 contraseña almacenada puesta al día con contraseña vacía. Fije una contraseña en su UsuarioPreferencias.";
-$locale["Older page:"] =
-   "Página más viejo:";
-$locale["Oops! Revision %s of %s seems to have been deleted!"] =
-   "¡Oops! ¡La revisión %s de %s se parece haber sido suprimida!";
-$locale["Operation undone"] =
-   "Operación deshecha";
-$locale["Optimizing database"] =
-   "Base de datos óptima";
-$locale["OrphanedPages"] =
-   "BuscarPágina";
-$locale["Other diffs:"] =
-   "Otros diffs:";
-$locale["Other version"] =
-   "Altro versión";
-$locale["Overwrite All"] =
-   "Sobreescriba Todos";
-$locale["Owner"] =
-   "Dueño";
-$locale["Owner: %s"] =
-   "Dueño: %s";
-$locale["Page %s not found."] =
-   "%s: Página no encontrado.";
-$locale["Page Content: "] =
-   "Contenido De la Página: ";
-$locale["Page Locked"] =
-   "Página Bloqueada";
-$locale["Page Name"] =
-   "Nombre de la Página";
-$locale["Page Version:"] =
-   "Versión:";
-$locale["Page change"] =
-   "Cambio de la página";
-$locale["Page now locked."] =
-   "Página bloqueada.";
-$locale["Page now unlocked."] =
-   "Página desbloquear.";
-$locale["Page rename %s to %s"] =
-   "La página retitula %s a %s";
-$locale["Page successfully updated."] =
-   "Página actualizada con éxito.";
-$locale["PageChange Notification Error: Couldn't send %s to %s"] =
-   "Error De la Notificación Del Cambio De la Página: No podía enviar %s a %s";
-$locale["PageChange Notification of %s sent to %s"] =
-   "Pagine la notificación del cambio de %s enviado a %s";
-$locale["PageDump"] =
-   "DescargeDeLaPágina";
-$locale["PageInfo"] =
-   "InformacionDeLaPagina";
-$locale["Password cannot be changed."] =
-   "La contraseña no puede ser cambiada.";
-$locale["Password updated."] =
-   "Contraseña actualizado.";
-$locale["Password was not changed."] =
-   "Contraseña non actualizado.";
-$locale["Password:"] =
-   "Contraseña:";
-$locale["PersonalPage login method:"] =
-   "Método de la conexión de PersonalPage:";
-$locale["PhpWikiAdministration"] =
-   "AdministraciónDePhpWiki";
-$locale["Please check it through before saving."] =
-   "Compruébelo por favor a través 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."] =
-   "Asegúrese 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 contraseña en UsuarioPreferencias.";
-$locale["Plugin %s disabled."] =
-   "Plugin '%s' lisiado.";
-$locale["Plugin %s failed."] =
-   "Plugin '%s' falló.";
-$locale["Plugin %s: undefined"] =
-   "Plugin %s: indefinido";
-$locale["Preferences"] =
-   "Preferencias";
-$locale["Preview"] =
-   "Previsualizar";
-$locale["Previous"] =
-   "Anterior";
-$locale["Previous Author"] =
-   "Autor Anterior";
-$locale["Previous Major Revision"] =
-   "Revisión Importante Anterior";
-$locale["Previous Month"] =
-   "Mes Anterior";
-$locale["Previous Revision"] =
-   "Versión archivada";
-$locale["Printer"] =
-   "Impresora";
-$locale["Quick Search"] =
-   "Busqueda rápida";
-$locale["RandomPage"] =
-   "PáginaAlAzar";
-$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"] =
-   "Quite";
-$locale["Remove Page"] =
-   "Borrar Página";
-$locale["Remove this page"] =
-   "Quite esta página";
-$locale["Removed page '%s' successfully."] =
-   "Página '%s' borrada satisfactoriamente.";
-$locale["Removing pages"] =
-   "Borrar páginas";
-$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"] =
-   "Revisión No encontrada";
-$locale["SandBox"] =
-   "CajaDeArena";
-$locale["Save"] =
-   "Guardar";
-$locale["Saved: %s"] =
-   "Guardar: %s";
-$locale["Saving this page will overwrite the current version."] =
-   "Ahorrando esta página sobreescribirá la versión actual.";
-$locale["Search"] =
-   "Buscar";
-$locale["Search & Replace"] =
-   "Busque Y Substituya";
-$locale["See %s tips for editing."] =
-   "%s tips para editar.";
-$locale["Serialized file %s"] =
-   "Archivo serializado %s";
-$locale["Set Password"] =
-   "Set Contraseña";
-$locale["Set USE_DB_SESSION to false."] =
-   "Fije USE_DB_SESSION a falso.";
-$locale["SetAcl"] =
-   "Fije El Acl";
-$locale["Show changes for:"] =
-   "Demuestre los cambios para:";
-$locale["Sign In"] =
-   "Muestra Adentro";
-$locale["Sign Out"] =
-   "Registro Hacia fuera";
-$locale["Signed Users"] =
-   "Usuarios Firmados";
-$locale["Size"] =
-   "Tamaño";
-$locale["Size:"] =
-   "Tamaño:";
-$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 podían ser combinados automáticamente. 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 página!";
-$locale["Sorry for the inconvenience."] =
-   "Disculpe la inconveniencia.";
-$locale["Sort by %s"] =
-   "Clase por %s";
-$locale["Spam Prevention"] =
-   "Prevención Del Spam";
-$locale["SpamAssassin reports: "] =
-   "Informes de SpamAssassin: ";
-$locale["String \"%s\" not found."] =
-   "Secuencia \"%s\" no encontrado.";
-$locale["SubPages of %s:"] =
-   "PáginasSecundaria de %s:";
-$locale["Summary"] =
-   "Comentarios";
-$locale["Supported handlers are: %s"] =
-   "Los tratantes apoyados son: %s";
-$locale["Synopsis"] =
-   "Sinopsis";
-$locale["TextFormattingRules"] =
-   "ReglasDeFormatoDeTexto";
-$locale["Thank you for editing %s."] =
-   "Gracias por editar %s.";
-$locale["Thanks for participating!"] =
-   "Gracias!";
-$locale["The %d most popular pages of this wiki:"] =
-   "Las %d páginas más populares de este wiki:";
-$locale["The %d most recent %s are listed below."] =
-   "Los %d la mayoría del %s reciente se enumeran abajo.";
-$locale["The %d most recent %s during the past %s days are listed below."] =
-   "Los %d la mayoría del %s reciente durante los últimos días de %s se enumeran abajo.";
-$locale["The %d most recent %s during the past day are listed below."] =
-   "Los %d la mayoría del %s reciente durante el último día se enumeran abajo.";
-$locale["The %d oldest %s are listed below."] =
-   "Los %d el %s más viejo se enumeran abajo.";
-$locale["The %d oldest %s during the past %s days are listed below."] =
-   "Los %d el %s más viejo durante los últimos días de %s se enumeran abajo.";
-$locale["The %d oldest %s during the past day are listed below."] =
-   "Los %d el %s más viejo durante el último día 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 están en el directorio de %s. ¡Lea por favor el archivo de la INSTALACIÓN y mueva la base de datos a una localización permanente o arriesgúela el perder de todas las páginas!";
-$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 crypt function is not available in this version of PHP."] =
-   "La función de la cripta no está disponible en esta versión de PHP.";
-$locale["The length of the password is shorter than the system policy allows."] =
-   "La longitud de la contraseña es más corta que la política 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 contraseña almacenada es más corta que la política del sistema permite. Apesadumbrado, usted no puede conexión.\n Usted tiene que pedir que el administrador de sistema reajuste su contraseña.";
-$locale["The most recent %s during the past %s days are listed below."] =
-   "Los %s más recientes durante los últimos días de %s se enumeran abajo.";
-$locale["The most recent %s during the past day are listed below."] =
-   "Los %s más recientes durante el último día 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 creación de la imagen disponibles para la identificación '%s '. Por favor recarga que refiere la página.";
-$locale["This action requires moderator approval. Please be patient."] =
-   "Esta acción requiere la aprobación del asesor.  Sea por favor paciente.";
-$locale["This is a minor change."] =
-   "Esto es un cambio pequeño.";
-$locale["This page edit seems to contain spam and was therefore not saved."] =
-   "Esta página corrige se parece contener el Spam y por lo tanto no fue ahorrada.";
-$locale["This page has been locked by the administrator so your changes can not be saved."] =
-   "Esta página ha sido bloqueada por el administrador y no puede ser editada.";
-$locale["Time Zone"] =
-   "Zona Horaria";
-$locale["Title Search"] =
-   "Una búsqueda de títulos";
-$locale["Title search results for '%s'"] =
-   "Resultados de la búsqueda en el títulos '%s'";
-$locale["TitleSearch"] =
-   "BúsquedaDeTítulos";
-$locale["Today"] =
-   "Hoy";
-$locale["Too many external links."] =
-   "También muchos acoplamientos externos.";
-$locale["Top & bottom toolbars"] =
-   "Toolbars superiores y inferiores";
-$locale["Topic"] =
-   "Asunto";
-$locale["Type word above:"] =
-   "Mecanografíe la palabra arriba:";
-$locale["Typed in verification word mismatch ... are you a bot?"] =
-   "¿Mecanografían en la unión mal hecha de la palabra de la verificación... 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["Undefined method %s for special group %s"] =
-   "Método indefinido %s para el grupo especial %s";
-$locale["Undo"] =
-   "Deshaga";
-$locale["Undo Search & Replace"] =
-   "Deshaga La Búsqueda Y Substitúyala";
-$locale["Undo disabled"] =
-   "Deshaga lisiado";
-$locale["Unexpected EOF in zip file"] =
-   "EOF inesperado en archivo del zip";
-$locale["UnfoldSubpages"] =
-   "IncluyaPáginasSecundaria";
-$locale["UnfoldSubpagesPlugin"] =
-   "IncluyaPáginasSecundariaPlugin";
-$locale["Unknown special group '%s'"] =
-   "Grupo especial desconocido '%s'";
-$locale["Unlock"] =
-   "Desbloquear";
-$locale["Unlock Page"] =
-   "Desbloquear Página";
-$locale["Unlocking pages"] =
-   "Desbloquear páginas";
-$locale["Unsupported ACL access type %s ignored."] =
-   "Tipo sin apoyo %s del acceso del ACL no hecho caso.";
-$locale["Unsupported argument: %s=%s"] =
-   "Discusión sin apoyo: %s=%s";
-$locale["UpLoad"] =
-   "UpLoad";
-$locale["UpLoadPlugin"] =
-   "UpLoadPlugin";
-$locale["Upgrade"] =
-   "Mejora";
-$locale["Upload File"] =
-   "Archivo Del Upload";
-$locale["Upload error: file too big"] =
-   "Error del upload: archivo demasiado grande";
-$locale["Upload error: no file selected"] =
-   "Error del upload: ningún archivo seleccionado";
-$locale["Upload error: unknown error #"] =
-   "Error del upload: error desconocido #";
-$locale["Uploading %s"] =
-   "%s uploading";
-$locale["UserPreferences"] =
-   "UsuarioPreferencias";
-$locale["UserRatings"] =
-   "GradosUsuario.";
-$locale["Users will not be able to sign in."] =
-   "Los usuarios no podrán firmar adentro.";
-$locale["Using directory '%s'"] =
-   "Usando el directorio '%s'";
-$locale["Version"] =
-   "Versión";
-$locale["Version %d"] =
-   "Versión %d";
-$locale["Version %s"] =
-   "Versión %s";
-$locale["Version %s, saved %s"] =
-   "versión %s, %s ahorrado";
-$locale["Version %s, saved on %s"] =
-   "versión %s de %s";
-$locale["Versions are identical"] =
-   "Las versiones son idénticas";
-$locale["View Source"] =
-   "Vea la fuente";
-$locale["View Source: %s"] =
-   "Fuente De la Visión: %s";
-$locale["View the current version"] =
-   "Vea la versión actual";
-$locale["View this page and all subpages"] =
-   "Opinión esta página y todas las páginas secundaria";
-$locale["W"] =
-   "An";
-$locale["WARNING: InterWikiMap page is unlocked, so not using those links."] =
-   "ADVERTENCIA: Se abre la página 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"] =
-   "¡Recepción a %s!\nSe verifica y será utilizada su cuenta del email\npara enviar notificaciones del cambio de la página.\nVea %s";
-$locale["Width"] =
-   "Anchura";
-$locale["Wiki Name"] =
-   "Nombre de la Wiki";
-$locale["WikiDB::renamePage() not yet implemented for this backend"] =
-   "WikiDB::renamePage() no todavía 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 día por favor su config/config.ini";
-$locale["You must be an administrator to %s."] =
-   "Usted debe ser administrador %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 aprobación del asesor.";
-$locale["You stored an empty password in your '%s' page."] =
-   "Usted almacenó una contraseña vacía en su página 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 están solamente para un BogoUser.";
-$locale["Your are probably trying to edit/create an invalid version of this page."] =
-   "Su están intentando corregir/crean probablemente una versión inválida de esta página.";
-$locale["Your careful attention to detail is much appreciated."] =
-   "Se agradece una cuidadosa atención 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 sobreescribirían 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 todavía 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"] =
-   "Versión 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 vía SOAP";
-$locale["access this wiki via XML-RPC"] =
-   "para tener acceso a este wiki vía Xml-RPC";
-$locale["add "] =
-   "agregue ";
-$locale["authenticated"] =
-   "authenticado";
-$locale["by %s"] =
-   "por %s";
-$locale["cached pagedata:"] =
-   "Página archivada:";
-$locale["content is identical to current version %d - no new revision created"] =
-   "el contenido es idéntico a la versión actual %d - ninguna nueva revisión creada";
-$locale["couldn't move %s to %s"] =
-   "no podía mover %s a %s";
-$locale["couldn't open file '%s' for writing"] =
-   "Error al escribir la página '%s'";
-$locale["create this page"] =
-   "para crear esta página";
-$locale["current version"] =
-   "versión actual";
-$locale["days"] =
-   "dias";
-$locale["diff this page"] =
-   "para diff esta página";
-$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 relámpago descargue de este wiki";
-$locale["dump html pages"] =
-   "para las páginas del HTML de la descarga";
-$locale["dump serial pages"] =
-   "para las páginas del cuento por entregas de la descarga";
-$locale["edit this page"] =
-   "para corregir esta página";
-$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 más último cerca ";
-$locale["load files into this wiki"] =
-   "para cargue los archivos en este wiki";
-$locale["lock this page"] =
-   "para trabar esta página";
-$locale["locked"] =
-   "bloqueada";
-$locale["minor"] =
-   "de menor importancia";
-$locale["minutes"] =
-   "minutas";
-$locale["missing required version argument"] =
-   "parámetro requerido de la versión que falta";
-$locale["no page content"] =
-   "ningún contenido de la página";
-$locale["not authenticated"] =
-   "non authenticado";
-$locale["plain file %s"] =
-   "archivo llano %s";
-$locale["predecessor to the previous major change"] =
-   "precursor al cambio principal anterior";
-$locale["previous revision"] =
-   "versión archivada";
-$locale["remove this page"] =
-   "para quitar esta página";
-$locale["renamed from %s"] =
-   "retitulado de %s";
-$locale["revert to a previous version of this page"] =
-   "para invertir a una versión anterior de esta página";
-$locale["revert to version %d"] =
-   "invierta a la versión %d";
-$locale["revision by previous author"] =
-   "revisión del autor anterior";
-$locale["same version page"] =
-   "la misma página de la versión";
-$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 parámetros plugin: '%s'";
-$locale["unknown color %s ignored"] =
-   "el color desconocido %s no hizo caso";
-$locale["unlock this page"] =
-   "para desbloquear página";
-$locale["upload a zip dump"] =
-   "para upload una descarga del cierre relámpago";
-$locale["users"] =
-   "usuarios";
-$locale["verify the current action"] =
-   "para verificar la acción actual";
-$locale["version %d"] =
-   "versión %d";
-$locale["version %s"] =
-   "versión %s";
-$locale["view the source of this page"] =
-   "para visión la fuente de esta página";
-$locale["view this page"] =
-   "para visión esta página";
-$locale["weeks"] =
-   "semanas";
+$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: "] = "%d mejores enlaces de entrada: ";
+$locale["%d best outgoing links: "] = "%d mejores enlaces de salida: ";
+$locale["%d minutes"] = "%d minutas";
+$locale["%d most popular nearby: "] = "%d las más populares: ";
+$locale["%d not-empty pages"] = "%d not-empty páginas";
+$locale["%d pages"] = "%d páginas";
+$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 at %s"] = "%s en %s";
+$locale["%s by %s"] = "%s por %s";
+$locale["%s bytes"] = "%s octetos";
+$locale["%s bytes written"] = "%s octetos";
+$locale["%s days"] = "%s dias";
+$locale["%s has no subpages defined."] = "%s: no hace ninguna página secundaria definir.";
+$locale["%s is disallowed on this wiki."] = "%s se rechaza en este wiki.";
+$locale["%s is empty"] = "%s es vacío";
+$locale["%s is missing"] = "%s falta";
+$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 acción";
+$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 revisión es %s";
+$locale["%s: action forwarded to a moderator."] = "%s: acción 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: no definido";
+$locale["&version=-1 might help."] = "&version=-1 pudo ayudar.";
+$locale["'%s': Bad page name"] = "'%s': Mal nombre de la página";
+$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 versión %d";
+$locale["- version %d saved to database as version %d"] = "- versión %d ahorrada a la base de datos como versión %d";
+$locale["... copied to %s"] = "... copia de [%s]";
+$locale["... not copied to %s"] = "... non copia de [%s]";
+$locale["... not found"] = "... no encontrado";
+$locale["1 day"] = "1 día";
+$locale[": "] = ": ";
+$locale["<empty>"] = "<vacío>";
+$locale["<no matches>"] = "<ningunos fósforos>";
+$locale["<none>"] = "<Ninguna>";
+$locale["<unknown>"] = "<desconocido>";
+$locale["ADMIN"] = "ADMIN";
+$locale["ANON"] = "ANÓN";
+$locale["Access"] = "Acceso";
+$locale["Access for you is forbidden to %s."] = "Tenga acceso para usted se prohíbe %s.";
+$locale["Add Comment"] = "Agregue El Comentario";
+$locale["Add this ACL"] = "Agregue este ACL";
+$locale["AddCategory"] = "AgregueCategoría";
+$locale["AddPageLink"] = "AgregueElAcoplamientoDeLaPágina";
+$locale["AddPlugin"] = "AgreguePlugin";
+$locale["AddTemplate"] = "AgregueLaPlantilla";
+$locale["Administrators"] = "Administradores";
+$locale["All %s are listed below."] = "Todos los %s se enumeran abajo.";
+$locale["AllPages"] = "TodasLasPáginas";
+$locale["AllUsers"] = "TodasLasUsuarios";
+$locale["Allow / Deny"] = "Permita/Niegue";
+$locale["An unnamed PhpWiki"] = "Un PhpWiki sin un nombre";
+$locale["Anonymous Users"] = "Usuarios Anónimos";
+$locale["Argument '%s' not declared by plugin."] = "Parámetro '%s' no declarada por plugin.";
+$locale["Article"] = "Artículo";
+$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."] = "Registrarán al autor como %s.";
+$locale["BOGO"] = "BOGO";
+$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["Bold text [alt-b]"] = "Texto en negrilla [alt-b]";
+$locale["Browsing pages"] = "Páginas el hojear";
+$locale["Calendar"] = "Calendario";
+$locale["CalendarList"] = "CalendarioLista";
+$locale["Cancel"] = "Cancelar";
+$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["Category"] = "Categoría";
+$locale["CategoryCategory"] = "CategoriaCategoria";
+$locale["CategoryGroup"] = "GrupoCategoría";
+$locale["CategoryHomepage"] = "CategoríaHomepage";
+$locale["CategoryPage"] = "CategoríaPágina";
+$locale["Change Password"] = "Change Contraseña";
+$locale["Change page attributes"] = "Cambie las cualidades de la página";
+$locale["Changes"] = "Cambios";
+$locale["Check to add this ACL"] = "Compruebe para agregar este ACL";
+$locale["Chown"] = "Cambie a dueño";
+$locale["Click a button to get an example text"] = "Chasque un botón para conseguir un texto del ejemplo";
+$locale["Click to de-/select all pages"] = "Tecleo para de-/seleccionar todas las páginas";
+$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 podía conectar con %s";
+$locale["Create a Wiki page."] = "Cree una página de Wiki.";
+$locale["Create a new (sub)page"] = "Cree una página (secundaria) nueva";
+$locale["Create: %s"] = "Cree: %s";
+$locale["CreatePage"] = "CreeLaPágina";
+$locale["CreateToc"] = "CreeToc";
+$locale["Created by CreatePage"] = "Cree par CreeLaPágina";
+$locale["Created directory '%s' for the page dump..."] = "Directorio creado '%s' para la descarga de la página...";
+$locale["Creator"] = "Creador";
+$locale["DB admin password:"] = "DB admin contraseña:";
+$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 serán utilizadas.";
+$locale["Del/+"] = "-/+";
+$locale["Delete this ACL"] = "Suprima este ACL";
+$locale["Describe %s here."] = "Describe %s aquí.";
+$locale["Description"] = "Descripción";
+$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"] = "Discusión";
+$locale["Dump pages as XHTML"] = "Páginas de la descarga como XHTML";
+$locale["Dump to directory"] = "Descarga al directorio";
+$locale["Dumping Pages"] = "Descargar Las Páginas";
+$locale["Edit"] = "Editar";
+$locale["Edit %s"] = "Editar %s";
+$locale["Edit old revision"] = "Corrija versión archivada";
+$locale["Edit this page"] = "Corrija esta página";
+$locale["Edit this page and all subpages"] = "Corrija esta página y todas las páginas 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"] = "Verificación Del Email";
+$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "Preferencias o formato vacías de la galleta de UsuarioPreferencias no reconocido.";
+$locale["Empty link to: %s"] = "Acoplamiento vacío a: %s";
+$locale["Empty pagename!"] = "¡Escriba un nombre de página!";
+$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"] = "BuscarPágina";
+$locale["First"] = "Primera";
+$locale["Full text search results for '%s'"] = "Resultados de la búsqueda en el texto completo para '%s'";
+$locale["FullDump"] = "DescargaCompleta";
+$locale["FullTextSearch"] = "BúsquedaDelTexto";
+$locale["Given password ignored."] = "Contraseña no hecho caso.";
+$locale["Go"] = "Aceptar";
+$locale["Grant"] = "Concesión";
+$locale["Group %s does not exist"] = "El grupo %s no existe";
+$locale["Group page '%s' does not exist"] = "La página '%s' del grupo no existe";
+$locale["Group/User"] = "Grupo/Usuario";
+$locale["H"] = "Al";
+$locale["Headline text"] = "Texto del título";
+$locale["Height"] = "Altura";
+$locale["Help"] = "Ayuda";
+$locale["Help/CalendarListPlugin"] = "Ayuda/CalendarioListaPlugin";
+$locale["Help/CalendarPlugin"] = "Ayuda/CalendarioPlugin";
+$locale["Help/CreateTocPlugin"] = "Ayuda/CreeToc";
+$locale["Help/GoodStyle"] = "Ayuda/BuenEstilo";
+$locale["Help/IncludePagePlugin"] = "Ayuda/BuscarPágina";
+$locale["Help/OldTextFormattingRules"] = "Ayuda/ViejoReglasDeFormatoDeTexto";
+$locale["Help/TextFormattingRules"] = "Ayuda/ReglasDeFormatoDeTexto";
+$locale["Help/UnfoldSubpagesPlugin"] = "Ayuda/IncluyaPáginasSecundariaPlugin";
+$locale["Help/UpLoadPlugin"] = "Ayuda/UpLoadPlugin";
+$locale["Hits"] = "Número de hits";
+$locale["Hits:"] = "Número de hits:";
+$locale["HomePage"] = "PáginaPrincipal";
+$locale["HomePageAlias"] = "PáginaPrincipalAlias";
+$locale["Horizontal line"] = "Linea horizontal";
+$locale["I'm sorry, there is no such page as %s."] = "Estoy apesadumbrado, allí no soy ninguna página tal como %s.";
+$locale["I'm sorry.  Version %d of %s is not in the database."] = "Estoy apesadumbrado.  La versión %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 página 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 página, otro usuario ha ahorrado una nueva versión de ella.";
+$locale["Included from %s"] = "Inserción de '%s'";
+$locale["Included from %s:"] = "Inserción de '%s':";
+$locale["Info"] = "Informacion";
+$locale["Insert"] = "Relleno";
+$locale["Insert PageLink"] = "Inserte el AcoplamientoDeLaPágina";
+$locale["Insert Plugin"] = "Relleno Plugin";
+$locale["Insert Template"] = "Inserte la plantilla";
+$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"] = "InterWikiBúsqueda";
+$locale["Invalid [] syntax ignored"] = "[] el sintaxis inválido no hizo caso";
+$locale["Invalid password or userid."] = "Contraseña o userid inválida.";
+$locale["Invalid password."] = "Contraseña inválido.";
+$locale["Invalid username '%s' for LDAP Auth"] = "Username inválido ' %s' para LDAP Auth";
+$locale["Invalid username."] = "Username inválido.";
+$locale["Italic text"] = "Texto del itálico";
+$locale["Italic text [alt-i]"] = "Texto del itálico [alt-i]";
+$locale["Last"] = "Final";
+$locale["Last Author"] = "Autor Pasado";
+$locale["Last Modified"] = "modificado por última vez";
+$locale["Last Summary"] = "Comentarios";
+$locale["Last edited %s"] = "Editada por última vez %s.";
+$locale["Last edited on %s"] = "Editada por última vez %s.";
+$locale["LatestSnapshot"] = "La Foto Más última";
+$locale["Level 1 headline"] = "Título del nivel 1";
+$locale["Link to page"] = "Acoplamiento a la página";
+$locale["List all pages which link to %s."] = "Enumere todas las páginas que se liguen a %s.";
+$locale["List the most popular pages."] = "Las páginas más populares.";
+$locale["List the user's ratings."] = "Enumere los grados del usuario.";
+$locale["List this page and all subpages"] = "Enumere esta página y todas las páginas secundaria";
+$locale["ListPages"] = "ListaPáginas";
+$locale["ListSubpages"] = "ListaPáginasSecundaria";
+$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"] = "Bloquear Página";
+$locale["Locked"] = "Bloqueada";
+$locale["Locking pages"] = "Bloquear páginas";
+$locale["MIME file %s"] = "Archivo %s del MIME";
+$locale["Members:"] = "Miembros:";
+$locale["Merge Edit"] = "Fusión Editar";
+$locale["Merge and Edit: %s"] = "Fusión y Editar: %s";
+$locale["Message"] = "Mensaje";
+$locale["Method '%s' not implemented in this GROUP_METHOD %s"] = "Método ' %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 página:";
+$locale["ModeratedPage"] = "PáginaModerada";
+$locale["Modern"] = "Moderno";
+$locale["Modified"] = "modificado";
+$locale["MostPopular"] = "MasPopulares";
+$locale["Name"] = "Nombre de la Página";
+$locale["Never edited"] = "Nunca corregido";
+$locale["New page"] = "Página nueva";
+$locale["New password"] = "Nueva Contraseña";
+$locale["Newer page:"] = "Página más nueva:";
+$locale["Next"] = "Siguiente";
+$locale["Next Month"] = "El Mes Próximo";
+$locale["No LDAP in this PHP version"] = "Ningún LDAP en esta versión 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?"] = "¿Ningún 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 contraseña almacenada puesta al día con contraseña vacía. Fije una contraseña en su UsuarioPreferencias.";
+$locale["Older page:"] = "Página más viejo:";
+$locale["Oops! Revision %s of %s seems to have been deleted!"] = "¡Oops! ¡La revisión %s de %s se parece haber sido suprimida!";
+$locale["Operation undone"] = "Operación deshecha";
+$locale["Optimizing database"] = "Base de datos óptima";
+$locale["OrphanedPages"] = "BuscarPágina";
+$locale["Other diffs:"] = "Otros diffs:";
+$locale["Other version"] = "Altro versión";
+$locale["Overwrite All"] = "Sobreescriba Todos";
+$locale["Owner"] = "Dueño";
+$locale["Owner: %s"] = "Dueño: %s";
+$locale["Page %s not found."] = "%s: Página no encontrado.";
+$locale["Page Content: "] = "Contenido De la Página: ";
+$locale["Page Locked"] = "Página Bloqueada";
+$locale["Page Name"] = "Nombre de la Página";
+$locale["Page Version:"] = "Versión:";
+$locale["Page change"] = "Cambio de la página";
+$locale["Page now locked."] = "Página bloqueada.";
+$locale["Page now unlocked."] = "Página desbloquear.";
+$locale["Page rename %s to %s"] = "La página retitula %s a %s";
+$locale["Page successfully updated."] = "Página actualizada con éxito.";
+$locale["PageChange Notification Error: Couldn't send %s to %s"] = "Error De la Notificación Del Cambio De la Página: No podía enviar %s a %s";
+$locale["PageChange Notification of %s sent to %s"] = "Pagine la notificación del cambio de %s enviado a %s";
+$locale["PageDump"] = "DescargeDeLaPágina";
+$locale["PageInfo"] = "InformacionDeLaPagina";
+$locale["Password cannot be changed."] = "La contraseña no puede ser cambiada.";
+$locale["Password updated."] = "Contraseña actualizado.";
+$locale["Password was not changed."] = "Contraseña non actualizado.";
+$locale["Password:"] = "Contraseña:";
+$locale["PersonalPage login method:"] = "Método de la conexión de PersonalPage:";
+$locale["PhpWikiAdministration"] = "AdministraciónDePhpWiki";
+$locale["Please check it through before saving."] = "Compruébelo por favor a través 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."] = "Asegúrese 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 contraseña en UsuarioPreferencias.";
+$locale["Plugin %s disabled."] = "Plugin '%s' lisiado.";
+$locale["Plugin %s failed."] = "Plugin '%s' falló.";
+$locale["Plugin %s: undefined"] = "Plugin %s: indefinido";
+$locale["Preferences"] = "Preferencias";
+$locale["Preview"] = "Previsualizar";
+$locale["Previous"] = "Anterior";
+$locale["Previous Author"] = "Autor Anterior";
+$locale["Previous Major Revision"] = "Revisión Importante Anterior";
+$locale["Previous Month"] = "Mes Anterior";
+$locale["Previous Revision"] = "Versión archivada";
+$locale["Printer"] = "Impresora";
+$locale["Quick Search"] = "Busqueda rápida";
+$locale["RandomPage"] = "PáginaAlAzar";
+$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"] = "Quite";
+$locale["Remove Page"] = "Borrar Página";
+$locale["Remove this page"] = "Quite esta página";
+$locale["Removed page '%s' successfully."] = "Página '%s' borrada satisfactoriamente.";
+$locale["Removing pages"] = "Borrar páginas";
+$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"] = "Revisión No encontrada";
+$locale["SandBox"] = "CajaDeArena";
+$locale["Save"] = "Guardar";
+$locale["Saved: %s"] = "Guardar: %s";
+$locale["Saving this page will overwrite the current version."] = "Ahorrando esta página sobreescribirá la versión actual.";
+$locale["Search"] = "Buscar";
+$locale["Search & Replace"] = "Busque Y Substituya";
+$locale["Search for"] = "Buscar";
+$locale["SearchReplace"] = "Busque Y Substituya";
+$locale["See %s tips for editing."] = "%s tips para editar.";
+$locale["Serialized file %s"] = "Archivo serializado %s";
+$locale["Set Password"] = "Set Contraseña";
+$locale["Set USE_DB_SESSION to false."] = "Fije USE_DB_SESSION a falso.";
+$locale["SetAcl"] = "Fije El Acl";
+$locale["Show changes for:"] = "Demuestre los cambios para:";
+$locale["Sign In"] = "Muestra Adentro";
+$locale["Sign Out"] = "Registro Hacia fuera";
+$locale["Signed Users"] = "Usuarios Firmados";
+$locale["Size"] = "Tamaño";
+$locale["Size:"] = "Tamaño:";
+$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 podían ser combinados automáticamente. 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 página!";
+$locale["Sorry for the inconvenience."] = "Disculpe la inconveniencia.";
+$locale["Sort by %s"] = "Clase por %s";
+$locale["Spam Prevention"] = "Prevención Del Spam";
+$locale["SpamAssassin reports: "] = "Informes de SpamAssassin: ";
+$locale["String \"%s\" not found."] = "Secuencia \"%s\" no encontrado.";
+$locale["SubPages of %s:"] = "PáginasSecundaria de %s:";
+$locale["Summary"] = "Comentarios";
+$locale["Supported handlers are: %s"] = "Los tratantes apoyados son: %s";
+$locale["Synopsis"] = "Sinopsis";
+$locale["Template"] = "Plantilla";
+$locale["TextFormattingRules"] = "ReglasDeFormatoDeTexto";
+$locale["Thank you for editing %s."] = "Gracias por editar %s.";
+$locale["Thanks for participating!"] = "Gracias!";
+$locale["The %d most popular pages of this wiki:"] = "Las %d páginas más populares de este wiki:";
+$locale["The %d most recent %s are listed below."] = "Los %d la mayoría del %s reciente se enumeran abajo.";
+$locale["The %d most recent %s during the past %s days are listed below."] = "Los %d la mayoría del %s reciente durante los últimos días de %s se enumeran abajo.";
+$locale["The %d most recent %s during the past day are listed below."] = "Los %d la mayoría del %s reciente durante el último día se enumeran abajo.";
+$locale["The %d oldest %s are listed below."] = "Los %d el %s más viejo se enumeran abajo.";
+$locale["The %d oldest %s during the past %s days are listed below."] = "Los %d el %s más viejo durante los últimos días de %s se enumeran abajo.";
+$locale["The %d oldest %s during the past day are listed below."] = "Los %d el %s más viejo durante el último día 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 están en el directorio de %s. ¡Lea por favor el archivo de la INSTALACIÓN y mueva la base de datos a una localización permanente o arriesgúela el perder de todas las páginas!";
+$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 crypt function is not available in this version of PHP."] = "La función de la cripta no está disponible en esta versión de PHP.";
+$locale["The length of the password is shorter than the system policy allows."] = "La longitud de la contraseña es más corta que la política 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 contraseña almacenada es más corta que la política del sistema permite. Apesadumbrado, usted no puede conexión.\n Usted tiene que pedir que el administrador de sistema reajuste su contraseña.";
+$locale["The most recent %s during the past %s days are listed below."] = "Los %s más recientes durante los últimos días de %s se enumeran abajo.";
+$locale["The most recent %s during the past day are listed below."] = "Los %s más recientes durante el último día 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 creación de la imagen disponibles para la identificación '%s '. Por favor recarga que refiere la página.";
+$locale["This action requires moderator approval. Please be patient."] = "Esta acción requiere la aprobación del asesor.  Sea por favor paciente.";
+$locale["This is a minor change."] = "Esto es un cambio pequeño.";
+$locale["This page edit seems to contain spam and was therefore not saved."] = "Esta página corrige se parece contener el Spam y por lo tanto no fue ahorrada.";
+$locale["This page has been locked by the administrator so your changes can not be saved."] = "Esta página ha sido bloqueada por el administrador y no puede ser editada.";
+$locale["Time Zone"] = "Zona Horaria";
+$locale["Title Search"] = "Una búsqueda de títulos";
+$locale["Title search results for '%s'"] = "Resultados de la búsqueda en el títulos '%s'";
+$locale["TitleSearch"] = "BúsquedaDeTítulos";
+$locale["Today"] = "Hoy";
+$locale["Too many external links."] = "También muchos acoplamientos externos.";
+$locale["Top & bottom toolbars"] = "Toolbars superiores y inferiores";
+$locale["Topic"] = "Asunto";
+$locale["Type word above:"] = "Mecanografíe la palabra arriba:";
+$locale["Typed in verification word mismatch ... are you a bot?"] = "¿Mecanografían en la unión mal hecha de la palabra de la verificación... 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["Undefined method %s for special group %s"] = "Método indefinido %s para el grupo especial %s";
+$locale["Undo"] = "Deshaga";
+$locale["Undo Search & Replace"] = "Deshaga La Búsqueda Y Substitúyala";
+$locale["Undo disabled"] = "Deshaga lisiado";
+$locale["Unexpected EOF in zip file"] = "EOF inesperado en archivo del zip";
+$locale["UnfoldSubpages"] = "IncluyaPáginasSecundaria";
+$locale["Unknown special group '%s'"] = "Grupo especial desconocido '%s'";
+$locale["Unlock"] = "Desbloquear";
+$locale["Unlock Page"] = "Desbloquear Página";
+$locale["Unlocking pages"] = "Desbloquear páginas";
+$locale["Unsupported ACL access type %s ignored."] = "Tipo sin apoyo %s del acceso del ACL no hecho caso.";
+$locale["Unsupported argument: %s=%s"] = "Discusión sin apoyo: %s=%s";
+$locale["UpLoad"] = "UpLoad";
+$locale["Upgrade"] = "Mejora";
+$locale["Upload File"] = "Archivo Del Upload";
+$locale["Upload error: file too big"] = "Error del upload: archivo demasiado grande";
+$locale["Upload error: no file selected"] = "Error del upload: ningún archivo seleccionado";
+$locale["Upload error: unknown error #"] = "Error del upload: error desconocido #";
+$locale["Uploading %s"] = "%s uploading";
+$locale["UserPreferences"] = "UsuarioPreferencias";
+$locale["UserRatings"] = "GradosUsuario.";
+$locale["Users will not be able to sign in."] = "Los usuarios no podrán firmar adentro.";
+$locale["Using directory '%s'"] = "Usando el directorio '%s'";
+$locale["Version"] = "Versión";
+$locale["Version %d"] = "Versión %d";
+$locale["Version %s"] = "Versión %s";
+$locale["Version %s, saved on %s"] = "versión %s de %s";
+$locale["Versions are identical"] = "Las versiones son idénticas";
+$locale["View Source"] = "Vea la fuente";
+$locale["View Source: %s"] = "Fuente De la Visión: %s";
+$locale["View the current version"] = "Vea la versión actual";
+$locale["View this page and all subpages"] = "Opinión esta página y todas las páginas secundaria";
+$locale["W"] = "An";
+$locale["WARNING: InterWikiMap page is unlocked, so not using those links."] = "ADVERTENCIA: Se abre la página 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"] = "¡Recepción a %s!\nSe verifica y será utilizada su cuenta del email\npara enviar notificaciones del cambio de la página.\nVea %s";
+$locale["Width"] = "Anchura";
+$locale["Wiki Name"] = "Nombre de la Wiki";
+$locale["WikiDB::renamePage() not yet implemented for this backend"] = "WikiDB::renamePage() no todavía 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 día por favor su config/config.ini";
+$locale["You must be an administrator to %s."] = "Usted debe ser administrador %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 aprobación del asesor.";
+$locale["You stored an empty password in your '%s' page."] = "Usted almacenó una contraseña vacía en su página 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 están solamente para un BogoUser.";
+$locale["Your are probably trying to edit/create an invalid version of this page."] = "Su están intentando corregir/crean probablemente una versión inválida de esta página.";
+$locale["Your careful attention to detail is much appreciated."] = "Se agradece una cuidadosa atención 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 sobreescribirían 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 todavía 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"] = "Versión 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 vía SOAP";
+$locale["access this wiki via XML-RPC"] = "para tener acceso a este wiki vía Xml-RPC";
+$locale["add "] = "agregue ";
+$locale["authenticated"] = "authenticado";
+$locale["by %s"] = "por %s";
+$locale["cached pagedata:"] = "Página archivada:";
+$locale["content is identical to current version %d - no new revision created"] = "el contenido es idéntico a la versión actual %d - ninguna nueva revisión creada";
+$locale["couldn't move %s to %s"] = "no podía mover %s a %s";
+$locale["couldn't open file '%s' for writing"] = "Error al escribir la página '%s'";
+$locale["create this page"] = "para crear esta página";
+$locale["current version"] = "versión actual";
+$locale["days"] = "dias";
+$locale["diff this page"] = "para diff esta página";
+$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 relámpago descargue de este wiki";
+$locale["dump html pages"] = "para las páginas del HTML de la descarga";
+$locale["dump serial pages"] = "para las páginas del cuento por entregas de la descarga";
+$locale["edit this page"] = "para corregir esta página";
+$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 más último cerca ";
+$locale["load files into this wiki"] = "para cargue los archivos en este wiki";
+$locale["lock this page"] = "para trabar esta página";
+$locale["locked"] = "bloqueada";
+$locale["minor"] = "de menor importancia";
+$locale["minutes"] = "minutas";
+$locale["missing required version argument"] = "parámetro requerido de la versión que falta";
+$locale["no page content"] = "ningún contenido de la página";
+$locale["not authenticated"] = "non authenticado";
+$locale["plain file %s"] = "archivo llano %s";
+$locale["predecessor to the previous major change"] = "precursor al cambio principal anterior";
+$locale["previous revision"] = "versión archivada";
+$locale["remove this page"] = "para quitar esta página";
+$locale["renamed from %s"] = "retitulado de %s";
+$locale["revert to a previous version of this page"] = "para invertir a una versión anterior de esta página";
+$locale["revert to version %d"] = "invierta a la versión %d";
+$locale["revision by previous author"] = "revisión del autor anterior";
+$locale["same version page"] = "la misma página de la versión";
+$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 parámetros plugin: '%s'";
+$locale["unknown color %s ignored"] = "el color desconocido %s no hizo caso";
+$locale["unlock this page"] = "para desbloquear página";
+$locale["upload a zip dump"] = "para upload una descarga del cierre relámpago";
+$locale["users"] = "usuarios";
+$locale["verify the current action"] = "para verificar la acción actual";
+$locale["version %d"] = "versión %d";
+$locale["version %s"] = "versión %s";
+$locale["view the source of this page"] = "para visión la fuente de esta página";
+$locale["view this page"] = "para visión esta página";
+$locale["weeks"] = "semanas";
 $locale["yesterday"] =
    "ayer";
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/LC_MESSAGES/phpwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,2470 +1,1413 @@
 <?php
 
-$locale["  %d%% (%d/%d)"] =
-   "  %d%% (%d/%d)";
-$locale[" (syntax error for latex) "] =
-   " (erreur de syntaxe pour latex) ";
-$locale[" (to pages linked from \"%s\")"] =
-   " (aux pages liées à \"%s\")";
-$locale[" - %d / %d - "] =
-   " - %d / %d - ";
-$locale[" ... around %s"] =
-   "... autour de %s";
-$locale[" ... first %d bytes"] =
-   "... %d premiers octets";
-$locale[" ... first %d lines"] =
-   "... %d premières lignes";
-$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] =
-   "De plus, essayez de conserver les dernières contributions de tous les auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne conservez en aucun cas plus que %d révisions par auteur.";
-$locale[" Keep the latest contributions of the last %d authors up to %d days."] =
-   "Garder les dernières contributions des derniers %d auteurs jusqu'à %d jours.";
-$locale[" Keep up to %d minor edits, but keep them no longer than %d days."] =
-   "Garder jusqu'à %d édition mineures, mais pas plus que %d jours.";
-$locale[" Sorry, cannot merge."] =
-   " Désolé, impossible de fusionner.";
-$locale[" and "] =
-   " et ";
-$locale[" for pages owned by %s"] =
-   " pour les pages possédées par %s";
-$locale[" is identical."] =
-   " est identique.";
-$locale[" replace "] =
-   " remplace ";
-$locale[" skipped"] =
-   " ignoré";
-$locale[" was created because: "] =
-   " a été créé car : ";
-$locale["%4d  %s\n"] =
-   "%4d  %s\n";
-$locale["%d UserPreferences fields successfully updated."] =
-   "%d préférences mises à jour avec succès.";
-$locale["%d best incoming links: "] =
-   "%d meilleurs liens entrants : ";
-$locale["%d best outgoing links: "] =
-   "%d meilleurs liens sortants : ";
-$locale["%d homepages"] =
-   "%d pages d'accueil";
-$locale["%d minutes"] =
-   "%d minutes";
-$locale["%d most popular nearby: "] =
-   "%d pages les plus visitées aux alentours : ";
-$locale["%d not-empty pages"] =
-   "%d pages non vides";
-$locale["%d online users"] =
-   "%d visiteurs en ligne";
-$locale["%d page(s) with more than %d hits (>%d%%)."] =
-   "%d pages ayant eu plus de %d visiteurs (>%d%%).";
-$locale["%d pages"] =
-   "%d pages";
-$locale["%d pages with less than %d hits (<%d%%)."] =
-   "%d pages ayant eu moins de %d visiteurs (<%d%%).";
-$locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] =
-   "%s %s %s est interdite sur ce wiki pour %s l'utilisateur '%s' (niveau : %s).";
-$locale["%s Kb (%s bytes)"] =
-   "%s Ko (%s octets)";
-$locale["%s already exists"] =
-   "%s existe déjà";
-$locale["%s at %s"] =
-   "%s à %s";
-$locale["%s b"] =
-   "%s b";
-$locale["%s by %s"] =
-   "%s par %s";
-$locale["%s bytes"] =
-   "%s octets";
-$locale["%s bytes written"] =
-   "%s octets enregistrés";
-$locale["%s days"] =
-   "%s jours";
-$locale["%s does not appear to be a WikiPlugin."] =
-   "%s ne semble pas être un plugin.";
-$locale["%s does not exist"] =
-   "%s n'existe pas";
-$locale["%s does not know about the language '%s', using 'en' instead."] =
-   "%s ne connait pas le langage '%s', utilisation de 'en' a la place.";
-$locale["%s has no subpages defined."] =
-   "La page %s n'a aucune sous-page définie.";
-$locale["%s is disallowed on this wiki."] =
-   "L'action %s est interdite sur ce wiki.";
-$locale["%s is empty"] =
-   "%s est vide.";
-$locale["%s is empty."] =
-   "%s est vide.";
-$locale["%s is missing"] =
-   "%s est manquant";
-$locale["%s is not locked!"] =
-   "%s n'est pas verrouillé!";
-$locale["%s is not writable."] =
-   "%s n'est pas accessible en écriture.";
-$locale["%s is only allowed in locked pages."] =
-   "%s n'est autorisé que dans les pages verrouillées.";
-$locale["%s k"] =
-   "%s k";
-$locale["%s not defined"] =
-   "%s : non défini";
-$locale["%s not found"] =
-   "%s non trouvé";
-$locale["%s of this page"] =
-   "%s de cette page";
-$locale["%s on %s:"] =
-   "%s on %s :";
-$locale["%s or %s parameter missing"] =
-   "%s ou %s paramètre manquant";
-$locale["%s pages have been changed."] =
-   "Les pages %s ont été changées.";
-$locale["%s pages link to %s:"] =
-   "%s pages pointent vers %s :";
-$locale["%s pages would link to %s:"] =
-   "%s pages pointaient vers %s :";
-$locale["%s parameter missing"] =
-   "%s paramètre manquant";
-$locale["%s words"] =
-   "%s mots";
-$locale["%s(%d): no such revision"] =
-   "%s(%d) : révision inexistante";
-$locale["%s: %s"] =
-   "%s : %s";
-$locale["%s: Bad action"] =
-   "%s : Mauvaise action";
-$locale["%s: Can't open dba database"] =
-   "%s : impossible d'ouvrir la base de données dba";
-$locale["%s: Date of new revision is %s"] =
-   "%s : la date de la nouvelle révision est %s";
-$locale["%s: argument index out of range"] =
-   "%s : index d'argument hors intervalle";
-$locale["%s: error while handling error:"] =
-   "%s : erreur pendant la gestion de l'erreur :";
-$locale["%s: file not found"] =
-   "%s : fichier non trouvé";
-$locale["%s: no such class"] =
-   "<%s : pas de section de ce type>";
-$locale["%s: not a subclass of WikiPlugin."] =
-   "%s n'est pas une sous classe de WikiPlugin.";
-$locale["%s: not defined"] =
-   "%s : non défini";
-$locale["'%s': Bad page name"] =
-   "%s : Nom de page invalide";
-$locale["'%s': Bad page name: %s"] =
-   "'%s': Nom de page invalide : : %s";
-$locale["'%s': corrupt file"] =
-   "'%s' : ce fichier est abîmé";
-$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] =
-   "(Copiez vos modifications dans le presse-papier. Vous pouvez essayer d'éditer une page différente ou sauver votre texte dans un éditeur).";
-$locale["(Currently not working)"] =
-   "(Non recommandé !)";
-$locale["(Redirected from %s)"] =
-   "(Redirigé de %s)";
-$locale["(Your preferences are stored as hidden data within this page)."] =
-   "Vos préférences sont enregistrées en mode invisible sur cette page.";
-$locale["(diff)"] =
-   "(diff)";
-$locale["(disable individual page permissions, enable inheritance)?"] =
-   "(désactive les permissions individuelles par page, activer l'héritage) ?";
-$locale["(max. recursion level: %d)"] =
-   "(niveau maximum de récursivité: %d)";
-$locale["(ugo : rwx)"] =
-   "(ugo : rwx)";
-$locale[", Memory: %s"] =
-   ", RAM: %s";
-$locale["- saved to database as version %d"] =
-   "- sauvée dans la base de données sous la version %d";
-$locale["- version %d saved to database as version %d"] =
-   "- version %d sauvée dans la base de données sous la version %d";
-$locale["-???"] =
-   "-???";
-$locale["... (first %s words)"] =
-   "... (%s premiers mots)";
-$locale["... copied to %s"] =
-   "... copié à %s";
-$locale["... not copied to %s"] =
-   "... non copié à %s";
-$locale["... not found"] =
-   "... non trouvé";
-$locale["1 day"] =
-   "1 jour";
-$locale["1 word"] =
-   "1 mot";
-$locale["<%s: no such section>"] =
-   "<%s : pas de section de ce type>";
-$locale["<<"] =
-   "<<";
-$locale["<empty>"] =
-   "<vide>";
-$locale["<no matches>"] =
-   "<aucun résultat>";
-$locale["<none>"] =
-   "<aucune>";
-$locale["<not displayed>"] =
-   "<non affiché>";
-$locale["<system language>"] =
-   "< langue du système >";
-$locale["<system theme>"] =
-   "<thème système>";
-$locale["<unknown>"] =
-   "<inconnue>";
-$locale[">>"] =
-   ">>";
-$locale[">>|"] =
-   ">>|";
-$locale["A plugin to provide for raw HTML within wiki pages."] =
-   "Un Plugin pour intégrer du code HTML dans les WikiPages.";
-$locale["A required argument '%s' is missing."] =
-   "Un argument requis '%s' est manquant.";
-$locale["ACCESS DENIED: You must log in to upload files."] =
-   "ACCES REFUSE: Vous devez être connecté pour uploader.";
-$locale["ACL"] =
-   "ACL";
-$locale["ACL not changed for page '%s'."] =
-   "ACL inchangé pour la page %s.";
-$locale["ADDING"] =
-   "AJOUT";
-$locale["ADMIN"] =
-   "ADMIN";
-$locale["ANON"] =
-   "ANONYME";
-$locale["About"] =
-   "À propos de";
-$locale["Access"] =
-   "Accès";
-$locale["Access Rights"] =
-   "Droits d'acces";
-$locale["Access denied to change page '%s'."] =
-   "Accès refusé pour changer la page '%s'.";
-$locale["Access for you is forbidden to %s."] =
-   "L'accès à %s vous est interdit.";
-$locale["Action Page"] =
-   "Page d'action";
-$locale["Action page"] =
-   "Page d'action";
-$locale["ActionPage"] =
-   "Page d'action";
-$locale["Add %s hours to the server's local time when reporting times."] =
-   "Ajouter %s heures à l'heure locale du serveur pour afficher les horodatages.";
-$locale["Add %s:"] =
-   "Ajouter %s :";
-$locale["Add Comment"] =
-   "Ajouter un commentaire";
-$locale["Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s."] =
-   "Ajouter un liens vers Google pour les pages inconnues derrière le '?', et l'action de création. voir %s.";
-$locale["Add Message"] =
-   "Ajouter un message";
-$locale["Add or change a page-level metadata 'key=>value' pair. Note that you can remove a key by leaving the value-box empty."] =
-   "Ajouter ou changer le niveau de page 'key=>value'. Notez que vous pouvez supprimer une clé en lui attribuant une valeur nulle.";
-$locale["Add this ACL"] =
-   "Ajouer cette ACL";
-$locale["AddCategory"] =
-   "AjoutezCatégorie";
-$locale["AddComment"] =
-   "AjouterDesCommentaires";
-$locale["AddCommentPlugin"] =
-   "AjoutDesCommentaires";
-$locale["AddPageLink"] =
-   "AjouterDesPagesLien";
-$locale["AddPlugin"] =
-   "AjoutezPlugin";
-$locale["AddingPages"] =
-   "AjouterDesPages";
-$locale["Adjust"] =
-   "Ajuster";
-$locale["Admin"] =
-   "Administrateur";
-$locale["Admin is also online."] =
-   "L'administrateur est aussi en ligne.";
-$locale["Administration"] =
-   "Administration";
-$locale["Administrators"] =
-   "Administrateures";
-$locale["All %s are listed below."] =
-   "Toutes les %s sont énumérées ci-dessous.";
-$locale["All modifications"] =
-   "Toutes les modifications";
-$locale["All pages"] =
-   "Toutes les pages";
-$locale["All pages with all links in this wiki (%d total):"] =
-   "Tout pages avec tous les liens dans ce wiki (%d au total) :";
-$locale["All time"] =
-   "Depuis le début";
-$locale["All users"] =
-   "Tous les utilisateurs";
-$locale["AllPages"] =
-   "ToutesLesPages";
-$locale["AllPagesOwnedByMe"] =
-   "ToutesMesPages";
-$locale["AllUsers"] =
-   "TousLesUtilisateurs";
-$locale["Allow / Deny"] =
-   "Autoriser / Refuser";
-$locale["Allowed protocols"] =
-   "Protocoles autorisés";
-$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] =
-   "Permet de choisir plusieurs pages qui seront passées vers d'autre plugins WikiAdmin.";
-$locale["Also pages which have been deleted at least %s days."] =
-   "Même les pages qui ont été supprimées il y a au plus %s days.";
-$locale["An unnamed PhpWiki"] =
-   "Un PhpWiki sans titre";
-$locale["Anonymous Users"] =
-   "Utilisateur anonyme";
-$locale["Appearance"] =
-   "Apparence";
-$locale["Append text to any page in this wiki."] =
-   "Apposez le texte à n'importe quelle page de ce wiki.";
-$locale["AppendText"] =
-   "ApposezLeTexte";
-$locale["Application name"] =
-   "Nom de l'application";
-$locale["Application size: %d Kb"] =
-   "Taille de l'application : %d Kb";
-$locale["Apply changes"] =
-   "Appliquer les changements.";
-$locale["Are you sure you want to permanently change the selected files?"] =
-   "Supprimer la page maintenant";
-$locale["Are you sure you want to permanently remove the selected files?"] =
-   "Êtes-vous certain de vouloir supprimer définitivement les fichiers sélectionnés ?";
-$locale["Argument '%s' not declared by plugin."] =
-   "argument '%s' non déclaré par le plugin.";
-$locale["Arguments"] =
-   "Arguments";
-$locale["Attempting to use the directory '%s' instead."] =
-   "Tentative d'utilisation du répertoire '%s' à la place.";
-$locale["Attribute"] =
-   "Attribut";
-$locale["Auth Level"] =
-   "Niveau de l'authentification";
-$locale["Auth Method"] =
-   "Méthode d'authentification";
-$locale["AuthInfo"] =
-   "InfosAuth";
-$locale["Authenticated Users"] =
-   "Utilisateurs connectés";
-$locale["Authenticated as %s"] =
-   "Vous êtes connecté en tant que %s";
-$locale["Authenticated users on this wiki (%d total):"] =
-   "Utilisateurs connectés à ce wiki (%d au total) :";
-$locale["Author"] =
-   "Auteur";
-$locale["Author history"] =
-   "Historique de l'auteur";
-$locale["Author will be logged as %s."] =
-   "L'auteur sera enregistré sous le nom %s.";
-$locale["AuthorHistory"] =
-   "HistoriqueAuteur";
-$locale["AuthorHistoryPlugin"] =
-   "PluginHistoriqueAuteur";
-$locale["Available plugins"] =
-   "Plugins disponibles";
-$locale["Avg. Rating"] =
-   "Cote moyenne";
-$locale["BAD URL -- remove all of <, >, \""] =
-   "MAUVAIS URL -- retirez tous les <, >, \"";
-$locale["BAD phpwiki: URL"] =
-   "MAUVAIS phpwiki: URL";
-$locale["BOGO"] =
-   "BOGO";
-$locale["Back Links"] =
-   "Pages liees";
-$locale["BackLinks"] =
-   "RétroLiens";
-$locale["BackLinks for %s"] =
-   "RétroLiens pour %s";
-$locale["Bad Version"] =
-   "Mauvaise Version";
-$locale["Bad file type: %s"] =
-   "Mauvais type de fichier : %s";
-$locale["Bad url in src: remove all of <, >, \""] =
-   "Mauvaise url dans la source : retirez tous les <, >, \"";
-$locale["Blog"] =
-   "Blog";
-$locale["Blog page"] =
-   "Page de blog";
-$locale["Bogo Users"] =
-   "Utilisateurs Bogo";
-$locale["Bold text"] =
-   "Texte en gras";
-$locale["Bold text [alt-b]"] =
-   "Texte en gras";
-$locale["Browsing pages"] =
-   "Navigation en cours";
-$locale["CANCEL"] =
-   "ANNULE";
-$locale["CREATED"] =
-   "CRÉÉ";
-$locale["Cache statistics"] =
-   "Statistiques de cache";
-$locale["Calendar"] =
-   "Calendrier";
-$locale["CalendarList"] =
-   "ListeDuCalendrier";
-$locale["CalendarListPlugin"] =
-   "PluginListeDuCalendrier";
-$locale["CalendarPlugin"] =
-   "PluginCalendrier";
-$locale["Can't inflate data: zlib support not enabled in this PHP"] =
-   "Impossible de décompresser les données : le support de zlib n'a pas été validé dans ce PHP";
-$locale["Can't mix '%s' with '%s' type format strings"] =
-   "Impossible de mélanger les chaînes de type '%s' et '%s'";
-$locale["Can't open the upload logfile."] =
-   "Erreur: Impossible d'ouvrir le journal des fichiers déposés.";
-$locale["Can't open zip file '%s' for reading"] =
-   "Impossible d'ouvrir le fichier zip '%s' en lecture";
-$locale["Cancel"] =
-   "Annuler";
-$locale["Cancelled"] =
-   "Annulé";
-$locale["Cannot create directory '%s'"] =
-   "Impossible de créer le répertoire '%s'";
-$locale["Cannot open AUTH_GROUP_FILE %s"] =
-   "Impossible d'ouvrir AUTH_GROUP_FILE %s";
-$locale["Case insensitive?"] =
-   "Sensible à la casse ?";
-$locale["Category"] =
-   "Catégorie";
-$locale["CategoryCategory"] =
-   "CatégorieCatégorie";
-$locale["CategoryGroup"] =
-   "CatégorieGroupes";
-$locale["CategoryHomePages"] =
-   "CatégoriePagesAccueil";
-$locale["CategoryHomepage"] =
-   "CatégoriePagesAccueil";
-$locale["CategoryPage"] =
-   "CatégoriePages";
-$locale["Change Password"] =
-   "Changer le mot de passe";
-$locale["Change Verification Status"] =
-   "Changer la vérification du statut";
-$locale["Change country"] =
-   "Changer le pays";
-$locale["Change page attributes"] =
-   "Changer les attributs de cette page";
-$locale["Change pagename in all linked pages also?"] =
-   "Changer les noms de pages dans toutes les pages liées ?";
-$locale["Check any two boxes then %s."] =
-   "Cochez une boîte puis %s.";
-$locale["Check any two boxes to compare revisions."] =
-   "Cochez une des boîtes pour comparer les révisions.";
-$locale["Check if you do not want to be notified of minor modifications."] =
-   "Cochez la case si vous ne voulez pas recevoir les modifications mineures";
-$locale["Check if you do not want to be notified of your own modifications."] =
-   "Cochez la case si vous ne voulez pas recevoir vos propres modifications";
-$locale["Check to add this ACL"] =
-   "Vérifier pour ajouter cette ACL";
-$locale["Chmod"] =
-   "Chmod";
-$locale["Chmod to permission:"] =
-   "Changer le mode de permission à :";
-$locale["Chown"] =
-   "Chown";
-$locale["Click a button to get an example text"] =
-   "Cliquer sur un bouton pour obtenir une exemple de texte";
-$locale["Click to authenticate as %s"] =
-   "Cliquez pour vous conneter en tant que %s";
-$locale["Click to de-/select all pages"] =
-   "Cliquez pour (de)sélectionner toutes les pages";
-$locale["Click to display"] =
-   "Cliquez pour afficher";
-$locale["Click to display all comments"] =
-   "Cliquez pour afficher tout commente";
-$locale["Click to display to TOC"] =
-   "Cliquez pour afficher la table des matières";
-$locale["Click to hide/show"] =
-   "Cliquez pour masquer/afficher";
-$locale["Click to reverse sort order"] =
-   "Cliquer pour inverser l'ordre de tri";
-$locale["Click to sort by %s"] =
-   "Cliquer pour trier par %s";
-$locale["Close"] =
-   "Fermer";
-$locale["Color"] =
-   "Couleur";
-$locale["Color text"] =
-   "Texte en couleur";
-$locale["Columns: %s."] =
-   "Colonnes : %s.";
-$locale["Comment"] =
-   "Commentaire";
-$locale["Comment modified on %s by %s"] =
-   "Commentaire modifié le %s par %s";
-$locale["CommentPlugin"] =
-   "PluginCommenter";
-$locale["Comments"] =
-   "Commentaires";
-$locale["Comments on %s by %s."] =
-   "Commentaire le %s par %s.";
-$locale["Complete."] =
-   "Terminé.";
-$locale["Conflicting Edits!"] =
-   "Conflit d'éditions !";
-$locale["Content"] =
-   "Contenu";
-$locale["Contents"] =
-   "Contenu";
-$locale["ContributedTranslations"] =
-   "TraductionsContribuées";
-$locale["Control characters not allowed"] =
-   "Caractères de contrôle, non autorisés";
-$locale["Convert"] =
-   "Converti";
-$locale["Convert text into a png image using GD."] =
-   "Converti le texte en une image png utilisant GD.";
-$locale["Converted successfully %d pages"] =
-   "%d pages converties avec succès";
-$locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] =
-   "Pour convertir des formules TeX en image.";
-$locale["Copyrights"] =
-   "Copyrights";
-$locale["Could not connect to LDAP host %s"] =
-   "Impossible de se connecter à l'annuaire LDAP de l'hôte %s";
-$locale["Couldn't chmod page '%s' to '%s'."] =
-   "Impossible de changer le mode '%s' à '%s'.";
-$locale["Couldn't connect to %s"] =
-   "Impossible d'établir une connexion à la base de données : %s";
-$locale["Couldn't rename page '%s' to '%s'."] =
-   "Impossible de renommer la page '%s' en '%s'.";
-$locale["Couldn't start commandline '%s'"] =
-   "Impossible de lancer la ligne de commande '%s'";
-$locale["Count"] =
-   "Compte";
-$locale["Create Page"] =
-   "Créer une page";
-$locale["Create a Wiki page by the provided name."] =
-   "Créer une PageWiki avec le nom demandé.";
-$locale["Create a Wiki page."] =
-   "Créer cette page.";
-$locale["Create a new (sub)page"] =
-   "Créer une nouvelle (sous-)page";
-$locale["Create: %s"] =
-   "Enregistrée : %s";
-$locale["CreatePage"] =
-   "CréerUnePage";
-$locale["CreateToc"] =
-   "CréerUneTdm";
-$locale["CreateTocPlugin"] =
-   "PluginCréerUneTdm";
-$locale["Created by CreatePage"] =
-   "Créée par CréerUnePage";
-$locale["Created directory '%s' for the page dump..."] =
-   "Répertoire '%s' créé pour la sauvegarde...";
-$locale["Creating pages"] =
-   "Création des pages";
-$locale["Creator"] =
-   "Créateur";
-$locale["Current Language"] =
-   "Langage courant";
-$locale["Current Theme"] =
-   "Thème courant";
-$locale["Current language: '%s'"] =
-   "Langage actuel : %s";
-$locale["Current theme: '%s'"] =
-   "Thème actuel : '%s'";
-$locale["CurrentTime"] =
-   "Heure actuelle";
-$locale["DB admin password:"] =
-   "DB admin mot de passe :";
-$locale["DB admin user:"] =
-   "DB admin nom de user :";
-$locale["Database"] =
-   "Base de données";
-$locale["Date Format"] =
-   "Format de date";
-$locale["DeadEndPages"] =
-   "PagesSansLien";
-$locale["DebugGroupInfo"] =
-   "InfosDeDéboguageGroupe";
-$locale["DebugInfo"] =
-   "InfosDeDéboguage";
-$locale["Default InterWiki map file not loaded."] =
-   "Carte InterWiki par défaut non chargée.";
-$locale["Default language: '%s'"] =
-   "Langage par défaut : %s";
-$locale["Default preferences will be used."] =
-   "Les préférences par défaut seront utilisées.";
-$locale["Default theme: '%s'"] =
-   "Thème par défaut : '%s'";
-$locale["Define a translation for a specified text"] =
-   "Traduire du texte";
-$locale["Define the translation for %s in %s"] =
-   "Définir la traduction pour %s en %s";
-$locale["Del/+"] =
-   "Effacer/+";
-$locale["Delete this ACL"] =
-   "Effacer cette ACL";
-$locale["Deleted"] =
-   "Supprimé";
-$locale["Deleted %s pages with invalid names:"] =
-   "%s pages ont été supprimées à cause de leur nom invalide:";
-$locale["Describe %s here."] =
-   "Décrire %s ici.";
-$locale["Description"] =
-   "Description";
-$locale["Dialog"] =
-   "Dialogue";
-$locale["Diff"] =
-   "Diff";
-$locale["Diff previous Author"] =
-   "Auteur précédent";
-$locale["Diff previous Revision"] =
-   "Différence avec la révision précédente";
-$locale["Diff: %s"] =
-   "Diff : %s";
-$locale["Differences between %s and %s of %s."] =
-   "Différences entre %s et %s de %s.";
-$locale["Diffing pages"] =
-   "Comparaison des pages";
-$locale["Discussion"] =
-   "Discussion";
-$locale["Display arbitrary SQL result tables"] =
-   "Affiche le résultat de requêtes SQL simples";
-$locale["Display differences between revisions"] =
-   "Affiche les différences entre révisions";
-$locale["Display general and user specific auth information."] =
-   "Afficher les informations générales de l'utilisateur.";
-$locale["Displays a list of randomly chosen pages or redirects to a random page."] =
-   "Affiche une liste de pages prises au hasard sur ce wiki.";
-$locale["Displays a set of photos listed in a text file with optional descriptions"] =
-   "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives.";
-$locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] =
-   "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé.";
-$locale["Do not send minor modifications:"] =
-   "Ne pas envoyer les modifications mineures :";
-$locale["Do not send my own modifications:"] =
-   "Ne pas envoyer mes propres modifications :";
-$locale["Do you %s want to add this page \"%s\" to your WatchList?"] =
-   "Souhaitez-vous %s ajouter la page \"%s\" a votre liste de suivi ?";
-$locale["Do you really want to reset all your UserPreferences?"] =
-   "Voulez-vous réellement reinitialiser toutes vos préférences ?";
-$locale["Do you really want to reset the password of user %s?"] =
-   "Voulez-vous réellement reinitialiser le mot de passe de %s ?";
-$locale["Don't cache this page."] =
-   "Ne pas mettre en cache cette page.";
-$locale["Double redirect not allowed."] =
-   "La double redirection interdit.";
-$locale["Download for CVS"] =
-   "Télécharger pour CVS";
-$locale["Download for backup"] =
-   "Télécharger pour sauvegarder";
-$locale["Download page contents"] =
-   "Télécharger le contenu de la page";
-$locale["Downloading html zip dumps"] =
-   "Téléchargement des sauvegardes html compressées";
-$locale["Downloading zip dumps"] =
-   "Téléchargement des sauvegardes compressées";
-$locale["Dump Pages"] =
-   "Récupérer les pages";
-$locale["Dump Pages as XHTML"] =
-   "Sauvegarde des pages au format XHTML";
-$locale["Dump pages as XHTML"] =
-   "Sauvegarde des pages au format XHTML";
-$locale["Dump to directory"] =
-   "Récupération dans le répertoire";
-$locale["Dumping Pages"] =
-   "Récupération des pages";
-$locale["Dumping html pages"] =
-   "Récupération des pages HTML";
-$locale["Dumping serial pages"] =
-   "Récupération des pages sérialisées";
-$locale["E-Mail"] =
-   "Adresse électronique";
-$locale["E-Mail address '%s' is not properly formatted"] =
-   "L'adresse électronique '%s' ne semble pas être correcte.";
-$locale["E-Mail address '%s' is properly formatted"] =
-   "L'adresse électronique '%s' semble être correcte.";
-$locale["E-mail"] =
-   "Adresse électronique";
-$locale["E-mail Notification"] =
-   "Courriel de notification";
-$locale["ERROR: No email defined! You need to do this in your "] =
-   "ERREUR : pas d'adresse électronique definie! Vous devez le faire dans vos ";
-$locale["Easy navigation buttons for %s"] =
-   "Boutons de navigation rapide pour %s";
-$locale["Edit"] =
-   "Modifier";
-$locale["Edit %s"] =
-   "Éditer %s";
-$locale["Edit Area Size"] =
-   "Éditez la taille de la zone";
-$locale["Edit Old Revision"] =
-   "Éditer l'ancienne révision";
-$locale["Edit aborted."] =
-   "Édition annulée.";
-$locale["Edit metadata for %s"] =
-   "Éditer les métadonnées pour %s";
-$locale["Edit old revision"] =
-   "Éditer l'ancienne révision";
-$locale["Edit this page"] =
-   "Éditer cette page";
-$locale["Edit this page and all subpages"] =
-   "Modifier cette page et toutes ses sous-pages";
-$locale["Edit: %s"] =
-   "Modifier : %s";
-$locale["EditMetaData"] =
-   "EditerLesMetaDonnées";
-$locale["EditMetaDataPlugin"] =
-   "PluginÉditerMetaData";
-$locale["EditText"] =
-   "ÉditerLeContenu";
-$locale["Edited by: %s"] =
-   "Édité par : %s";
-$locale["Editing pages"] =
-   "Éditions des pages";
-$locale["Either %s is missing or DATABASE_TYPE != '%s'"] =
-   "%s est manquant ou DATABASE_TYPE != '%s'";
-$locale["Elapsed time: %s s"] =
-   "Temps écoulé : %s s";
-$locale["Email Verification"] =
-   "Vérification de l'adresse électronique";
-$locale["Email not yet verified."] =
-   "Email pas encore vérifié.";
-$locale["Email verified."] =
-   "Adresse électronique vérifiée.";
-$locale["Embed hidden comments in WikiPages."] =
-   "Cacher des commentaires dans une PageWiki.";
-$locale["Empty Preferences or format of UserPreferences cookie not recognised."] =
-   "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu.";
-$locale["Empty link to: %s"] =
-   "Aucune correspondance de lien pour %s.";
-$locale["Empty pagename!"] =
-   "La page n'a aucun titre !";
-$locale["Enable configurable polls"] =
-   "Permettre de faire des sondages configurables";
-$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] =
-   "Entrer les pages séparées par des virgules.";
-$locale["Enter your UserId to sign in"] =
-   "Entrez votre identifiant utilisateur pour vous connecter";
-$locale["Enumeration"] =
-   "Énumération";
-$locale["Error: Couldn't send %s to %s"] =
-   "Erreur : impossible d'envoyer %s à %s";
-$locale["Error: Empty search string."] =
-   "Erreur: chaîne vide invalide.";
-$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] =
-   "La page d'accueil d'un utilisateur doit être un NomWiki valide. Les préférences ne peuvent pas être enregistrées.";
-$locale["Every"] =
-   "Toutes";
-$locale["Expiry parameters"] =
-   "Expiration des paramètres";
-$locale["External"] =
-   "Externe";
-$locale["External Links"] =
-   "Liens externes";
-$locale["External link (remember http:// prefix)"] =
-   "Lien externe (http:// prefix)";
-$locale["ExternalSearch"] =
-   "RechercheExterne";
-$locale["ExternalSearchPlugin"] =
-   "PluginRechercheExterne";
-$locale["FAILED"] =
-   "ÉCHOUÉ";
-$locale["FIXED"] =
-   "CORRIGÉ";
-$locale["FORBIDDEN"] =
-   "INTERDIT";
-$locale["Fatal PhpWiki Error"] =
-   "Erreur fatale de PhpWiki";
-$locale["Favorite Categories"] =
-   "Catégories populaires";
-$locale["File successfully uploaded."] =
-   "Fichier transféré avec succès.";
-$locale["Files with extension %s are not allowed."] =
-   "%s: extension interdit.";
-$locale["Find page"] =
-   "Rechercher";
-$locale["FindPage"] =
-   "ChercherUnePage";
-$locale["First"] =
-   "Première";
-$locale["FoafViewerPlugin"] =
-   "PluginFoafViewer";
-$locale["FrameInclude"] =
-   "InclureUnCadre";
-$locale["FrameIncludePlugin"] =
-   "PluginInclureUnCadre";
-$locale["From english to %s: "] =
-   "De l'Anglais au %s: ";
-$locale["Full changes"] =
-   "Plusieurs fois la page";
-$locale["Full text search results for '%s'"] =
-   "Résultats de la recherche en texte intégral de ' %s '";
-$locale["FullDump"] =
-   "SauvegardeTotale";
-$locale["FullRecentChanges"] =
-   "DernièresModifs";
-$locale["FullTextSearch"] =
-   "RechercheEnTexteIntégral";
-$locale["FuzzyPages"] =
-   "PagesFloues";
-$locale["General Auth Settings"] =
-   "Préférences générales d'auteur";
-$locale["Get an email notification at changes of the following pages:"] =
-   "Recevoir un courriel de notification lors des changements des pages suivantes :";
-$locale["Get debugging information for %s."] =
-   "Obtenir des infos de déboguage pour %s.";
-$locale["Get preferences information for current user %s."] =
-   "Obtenir des infos de préférences pour l'utilisateur %s.";
-$locale["Given password ignored."] =
-   "Mot de passe ignoré.";
-$locale["Go"] =
-   "OK";
-$locale["Go to or create page."] =
-   "Aller à ou créer page.";
-$locale["Go?"] =
-   "Allons-y ?";
-$locale["GoTo"] =
-   "AllerVers";
-$locale["Google:%s"] =
-   "Google: %s";
-$locale["GooglePlugin"] =
-   "PluginGoogle";
-$locale["Grant"] =
-   "Accorder";
-$locale["Group %s does not exist"] =
-   "Le groupe %s n'existe pas";
-$locale["Group page '%s' does not exist"] =
-   "Le groupe de page %s n'existe pas";
-$locale["Group/User"] =
-   "Groupe/Utilisateur";
-$locale["Guest"] =
-   "Invité";
-$locale["Guests"] =
-   "Invités";
-$locale["H"] =
-   "H";
-$locale["Handles threaded topics with comments/news and provide a input form"] =
-   "Contrôler les sujets traités avec les commentaires/nouvelles et fournir une entrée de formulaire";
-$locale["Headline text"] =
-   "Titre";
-$locale["Height"] =
-   "Hauteur";
-$locale["HelloWorld"] =
-   "BonjourLeMonde";
-$locale["HelloWorldPlugin"] =
-   "PluginBonjourLeMonde";
-$locale["Help"] =
-   "Aide";
-$locale["Here you can override site-specific default values."] =
-   "Ici vous pouvez écraser les valeurs par défaut du site spécifié.";
-$locale["Hide %s:"] =
-   "Cacher %s :";
-$locale["Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections."] =
-   "Cacher ou montrer les icônes de liens (si supportées par le thème actuel). Très utile pour les navigateurs ne supportant pas les images ou pour les connexion bas débit.";
-$locale["History"] =
-   "Historique";
-$locale["History of all major and minor edits by %s to page %s."] =
-   "Historique de toutes les éditions majeures et mineures par %s sur la page %s.";
-$locale["History of all major and minor modifications for any page edited by %s."] =
-   "Historique des éditions majeures ou mineures pour n'importe quelle page éditée par %s.";
-$locale["History of changes."] =
-   "Historique des changements.";
-$locale["Hit statistics"] =
-   "Statistiques de visites";
-$locale["Hits"] =
-   "Visites";
-$locale["Hits:"] =
-   "Visites :";
-$locale["Home"] =
-   "Accueil";
-$locale["Home page"] =
-   "Page d'accueil";
-$locale["HomePage"] =
-   "PageAccueil";
-$locale["HomePageAlias"] =
-   "AliasAccueil";
-$locale["Horizontal line"] =
-   "Ligne horizontale";
-$locale["HowToUseWiki"] =
-   "CommentUtiliserWiki";
-$locale["I'm just doing minor edits. Please divert the usual logging to %s instead."] =
-   "Je ne fais que des modifications mineures. Veuillez rediriger les logs habituels vers %s.";
-$locale["I'm sorry, there is no such page as %s."] =
-   "Désolé, %s ne correspond à aucune page.";
-$locale["I'm sorry.  Version %d of %s is not in the database."] =
-   "Je suis désolé. La version %d de %s n'est pas dans la base de données.";
-$locale["Ignore wiki formatting"] =
-   "Ignorer le formatage wiki";
-$locale["Illegal chars %s removed"] =
-   "Illégal %s supprimées";
-$locale["Image loaded from cache file: %s"] =
-   "Image chargée depuis le fichier cache : %s";
-$locale["Image saved to cache file: %s"] =
-   "Image sauvée dans le fichier cache : %s";
-$locale["In the time since you started editing this page, another user has saved a new version of it."] =
-   "Depuis que vous avez commencé à éditer cette page, un autre utilisateur en a enregistré une nouvelle version.";
-$locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] =
-   "Au total: %d utilisateurs en ligne. :: %d enregistré(s) et %d invité(s)";
-$locale["Include an external web page within the body of a wiki page."] =
-   "Inclure une page externe dans le corps de la WikiPage.";
-$locale["Include recursively all linked pages starting at %s"] =
-   "Créer une carte du site commencer à %s";
-$locale["Include text from another wiki page."] =
-   "Inclure le texte d'une autre PageWiki.";
-$locale["IncludePage"] =
-   "InclureUnePage";
-$locale["IncludePagePlugin"] =
-   "PluginInclureUnePage";
-$locale["IncludePages"] =
-   "InclurePages";
-$locale["IncludeSiteMap"] =
-   "CarteDuSite";
-$locale["Included from %s"] =
-   "Inséré de %s";
-$locale["Included from %s:"] =
-   "Inséré de %s :";
-$locale["Includes the content of all SubPages of the current page."] =
-   "Pour inclure le contenu de toutes les sous pages de la page actuelle.";
-$locale["Index"] =
-   "Index";
-$locale["Info"] =
-   "Info";
-$locale["Inline images"] =
-   "Images intégrées";
-$locale["Insert"] =
-   "Insérer";
-$locale["Insert non-formatted text here"] =
-   "Insérer du texte non-formaté ici";
-$locale["Insufficient permissions."] =
-   "Permissions insuffisantes.";
-$locale["InterWiki"] =
-   "InterWiki";
-$locale["InterWiki Address"] =
-   "Adresse InterWiki";
-$locale["InterWikiMap"] =
-   "CarteInterWiki";
-$locale["InterWikiSearch"] =
-   "RechercheInterWiki";
-$locale["Invalid ACL"] =
-   "Acl invalide";
-$locale["Invalid [] syntax ignored"] =
-   "[] non valables, ignoré";
-$locale["Invalid argument: %s=%s"] =
-   "Argument non valable : %s=%s";
-$locale["Invalid chmod string"] =
-   "Chaîne de caractère invalide pour le changement de mode";
-$locale["Invalid color: %s"] =
-   "Couleur non valable : %s";
-$locale["Invalid image size"] =
-   "Taille d'image non valables";
-$locale["Invalid pagename!"] =
-   "Nom de page invalide.";
-$locale["Invalid password or userid."] =
-   "Mot de passe ou identifiant d'utilisateur invalide.";
-$locale["Invalid password."] =
-   "Mauvais mot de passe.";
-$locale["Invalid username '%s' for LDAP Auth"] =
-   "Mot de identifiant d'utilisateur '%s' pour LDAP Auth invalide.";
-$locale["Invalid username."] =
-   "Identifiant d'utilisateur invalide.";
-$locale["Italic text"] =
-   "Texte en italique";
-$locale["Italic text [alt-i]"] =
-   "Texte en italique";
-$locale["JabberPresence"] =
-   "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["Language"] =
-   "Langue";
-$locale["Last"] =
-   "Dernière";
-$locale["Last Author"] =
-   "Dernier auteur";
-$locale["Last Difference"] =
-   "Dernie¨re difference";
-$locale["Last Modified"] =
-   "Dernière modification";
-$locale["Last Summary"] =
-   "Dernier résumé";
-$locale["Last edited %s"] =
-   "Dernière modification %s";
-$locale["Last edited on %s"] =
-   "Dernière modification le %s";
-$locale["LatestSnapshot"] =
-   "DernierInstantané";
-$locale["Layout tables using a very rich markup style."] =
-   "Un système de marques pour faire des tableaux sophistiqués.";
-$locale["Layout tables using the old markup style."] =
-   "Apparences de tableaux utilisant l'ancien modèle de balisage.";
-$locale["LdapSearch"] =
-   "LdapChercher";
-$locale["Leading %s not allowed"] =
-   "Mener %s n'est pas permis";
-$locale["Legend"] =
-   "Légende";
-$locale["Level 1 headline"] =
-   "Titre de niveau 1";
-$locale["Like Pages"] =
-   "Pages semblables";
-$locale["Like pages"] =
-   "Pages semblables";
-$locale["LikePages"] =
-   "PagesSemblables";
-$locale["Line %s does not begin with a '|'."] =
-   "La ligne %s ne commence pas par un '|'.";
-$locale["Link to page"] =
-   "Lien vers la page";
-$locale["LinkDatabase"] =
-   "LiensDatabase";
-$locale["LinkIcons"] =
-   "IcônesLiens";
-$locale["Links"] =
-   "Liens";
-$locale["List"] =
-   "Liste";
-$locale["List PageHistory for %s"] =
-   "Historique de %s";
-$locale["List all once authenticated users."] =
-   "Énumérez tous les utilisateurs une fois authentifiés.";
-$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."] =
-   "Affiche la liste de toutes les révisions faites par un auteur, ou montre une liste du type HistoriquePage pour une simple page uniquement pour un auteur.";
-$locale["List all pages in this wiki."] =
-   "Afficher la liste de toutes les pages de ce wiki.";
-$locale["List all pages which link to %s."] =
-   "Affiche toutes les pages liée à %s.";
-$locale["List all recent edits in this wiki."] =
-   "Afficher les dernières modifications de ce wiki.";
-$locale["List of pages created by [%s] (%d total):"] =
-   "Liste des pages créé près [%s] (%d au total) :";
-$locale["List of pages last edited by [%s] (%d total):"] =
-   "Liste des pages modifiées en dernier par [%s] (%d au total) :";
-$locale["List of pages owned by [%s] (%d total):"] =
-   "Liste des pages possédées par [%s] (%d au total) :";
-$locale["List page names which share an initial or final title word with '%s'."] =
-   "Affiche la liste des pages qui partagent un mot initial ou final dans leur titre avec %s.";
-$locale["List pages that are explicitly given as the pages argument."] =
-   "Liste des pages qui sont explicitement données en argument.";
-$locale["List pages which are not linked to by any other page."] =
-   "Liste des pages qui ne sont liées à aucune autre.";
-$locale["List the most popular pages nearby."] =
-   "Énumère les pages proches des plus visitées.";
-$locale["List the most popular pages."] =
-   "Affiche la listes des pages les plus populaires.";
-$locale["List this page and all subpages"] =
-   "Lister cette page et ses sous-pages";
-$locale["ListPages"] =
-   "ListeDePages";
-$locale["ListSubpages"] =
-   "ListeDesSousPages";
-$locale["Lists referenced page names which do not exist yet."] =
-   "Afficher toutes les pages référencées qui n'existent pas.";
-$locale["Lists the names of all SubPages of the current page."] =
-   "Affiche la liste des noms de toutes les sous-pages de la page courante.";
-$locale["LiveSearch"] =
-   "RechercheLive";
-$locale["Load File"] =
-   "Charger le fichier";
-$locale["Loading '%s'"] =
-   "Chargement ' %s '";
-$locale["Loading InterWikiMap from external file %s."] =
-   "Chargement de la CarteInterWiki depuis le fichiers %s.";
-$locale["Loading files"] =
-   "Chargement des fichiers";
-$locale["Loading up virgin wiki"] =
-   "Chargement d'un wiki vierge";
-$locale["Lock"] =
-   "Verrouillée";
-$locale["Lock Page"] =
-   "Verrouiller la page";
-$locale["Lock page to enable link"] =
-   "Verrouillez la page pour permettre le lien";
-$locale["Locked"] =
-   "Verrouillée";
-$locale["Locking pages"] =
-   "Verrouillage des pages";
-$locale["Login"] =
-   "S'identifier";
-$locale["Logout"] =
-   "Déconnexion";
-$locale["MIME file %s"] =
-   "fichier MIME %s";
-$locale["MISSING"] =
-   "MANQUANT";
-$locale["MagicPhpWikiURLs"] =
-   "URLMagiquesPhpWiki";
-$locale["Major modifications only"] =
-   "Modifications majeures uniquement";
-$locale["Make use of the Google API"] =
-   "Faire usage de l'API Google";
-$locale["Markup"] =
-   "Marquage";
-$locale["Markup cache purged!"] =
-   "Cache de marques purgé !";
-$locale["Markup:"] =
-   "Balises :";
-$locale["Members:"] =
-   "Membres :";
-$locale["Merge Edit"] =
-   "Fusionner l'édition";
-$locale["Merge and Edit: %s"] =
-   "Fusioner et éditer : %s";
-$locale["Message"] =
-   "Message";
-$locale["Method '%s' not implemented in this GROUP_METHOD %s"] =
-   "La méthode '%s' n'est pas implémentée dans ce GROUP_METHOD (%s)";
-$locale["Minor"] =
-   "Mineure";
-$locale["Minor Edit"] =
-   "Modification mineure";
-$locale["Miscellaneous utility functions for the Administrator."] =
-   "Plusieurs fonctions pour l'administration d'un wiki.";
-$locale["Missing %s for %s"] =
-   "Il manque %s pour %s";
-$locale["Missing PagePermission:"] =
-   "Permission de page individuelle absente:";
-$locale["ModeratedPage"] =
-   "PageModérée";
-$locale["ModeratedPage Notification Error: Couldn't send email"] =
-   "Erreur lors des notifications de page: Impossible d'envoyer";
-$locale["ModeratedPage: No emails for the moderators defined"] =
-   "PageModerée: No emails for the moderators defined";
-$locale["Modern"] =
-   "Moderne";
-$locale["Modified"] =
-   "Dernière modification";
-$locale["Modified on %s by %s"] =
-   "Modifié le %s par %s";
-$locale["Moniker"] =
-   "Nom";
-$locale["MoreAboutMechanics"] =
-   "DétailsTechniques";
-$locale["Most users ever online was %d at %s."] =
-   "Record du nombre d'utilisateur: %d le %s.";
-$locale["MostPopular"] =
-   "LesPlusVisitées";
-$locale["My modifications only"] =
-   "Mes modifications uniquement";
-$locale["My pages only"] =
-   "Mes pages uniquement";
-$locale["Name"] =
-   "Nom";
-$locale["Navigation"] =
-   "Navigation";
-$locale["Never edited"] =
-   "Jamais éditée";
-$locale["New Topic"] =
-   "Nouveau sujet";
-$locale["New comment."] =
-   "Nouveau commentaire.";
-$locale["New page"] =
-   "Nouvelle page";
-$locale["New pages only"] =
-   "Nouvelles pages uniquement";
-$locale["New password"] =
-   "Nouveau mot de passe";
-$locale["New users may use an empty password."] =
-   "Les nouveaux utilisateurs devraient utiliser un mot de passe vide.";
-$locale["New watchlist: "] =
-   "Nouvelle liste de suivi : ";
-$locale["NewMarkupTestPage"] =
-   "PageTestNouvellesMarques";
-$locale["Newer page:"] =
-   "Page récente :";
-$locale["Next"] =
-   "Suivant";
-$locale["Next >>"] =
-   "Suivant >>";
-$locale["Next Month"] =
-   "Mois suivant";
-$locale["No DSN alias for SqlResult.ini specified"] =
-   "Aucun alias DSN spécifié pour SqlResult.ini";
-$locale["No DSN for alias %s in SqlResult.ini found"] =
-   "Aucun alias DSN trouvé pour %s dans SqlResult.ini";
-$locale["No LDAP in this PHP version"] =
-   "Pas de LDAP dans cette version de php";
-$locale["No changes found"] =
-   "Aucune modification trouvée";
-$locale["No changes."] =
-   "Aucun changement.";
-$locale["No comments found"] =
-   "Aucun commentaire trouvé";
-$locale["No empty, unreferenced pages were found."] =
-   "Aucune page trouvée avec un nom invalide.";
-$locale["No metadata for %s"] =
-   "Pas de métadonnées pour %s";
-$locale["No or not enough GROUP_DB SQL statements defined"] =
-   "Aucun ou pas assez de GROUP_DB définis pour SQL";
-$locale["No or unsupported GROUP_METHOD defined"] =
-   "Aucun GROUP_METHOD défini, ou GROUP_METHOD non supporté";
-$locale["No other page links to %s yet."] =
-   "Aucune page n'est ancore liée à %s.";
-$locale["No page links to %s."] =
-   "Aucune page ne pointe vers %s.";
-$locale["No pagedata for %s"] =
-   "Pas de données de page pour %s";
-$locale["No pagename specified"] =
-   "Aucun nom de page indiqué";
-$locale["No pages changed."] =
-   "Aucune page changée.";
-$locale["No pages with bad names had to be deleted."] =
-   "Aucune page supprimées avec un nom invalide.";
-$locale["No revisions found"] =
-   "Révision non trouvée";
-$locale["No uploaded file to upload?"] =
-   "Pas de fichier à déposer ?";
-$locale["No userid"] =
-   "Pas d'identifiant utilisateur";
-$locale["NoCache"] =
-   "PasDeCache";
-$locale["None"] =
-   "Aucune";
-$locale["Not enough questions answered!"] =
-   "Pas assez de réponses fournies !";
-$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."] =
-   "Notez que beaucoup de navigateurs ajusteront automatiquement la largeur de la zone d'édition de façon qu'elle remplisse la fenêtre. Le paramètre concernant la largeur sera ignoré dans ce cas.";
-$locale["Note, that user accounts with bouncing emails will be disabled."] =
-   "Notez que les comptes utilisateurs dont l'adresse électronique n'existe pas seront désactivés.";
-$locale["Note:"] =
-   "Note :";
-$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."] =
-   "Note: Vous pourrez enregistrer vos PréférencesUtilisateurs uniquement si vous créez votre propre page d'accueil portant le nom de votre identifiant.";
-$locale["Nothing found"] =
-   "Aucun résultat";
-$locale["OK"] =
-   "OK";
-$locale["Okay"] =
-   "OK";
-$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] =
-   "L'anciene page %s sans mot de passe attribué a été mise à jour avec un mot de passe vide. Définissez un mot de passe dans vos PréférencesUtilisateurs.";
-$locale["Old and new pages"] =
-   "Pages anciennes et nouvelles";
-$locale["OldMarkupTestPage"] =
-   "PageTestAnciennesMarques";
-$locale["OldStyleTable"] =
-   "TableauAncienStyle";
-$locale["OldStyleTablePlugin"] =
-   "PluginTableauAncienStyle";
-$locale["Older page:"] =
-   "Ancienne page :";
-$locale["One UserPreferences field successfully updated."] =
-   "Une préférence mise à jour avec succès.";
-$locale["One page links to %s:"] =
-   "Une page pointe vers %s :";
-$locale["One page would link to %s:"] =
-   "Une page pointait vers %s :";
-$locale["Oops! Revision %s of %s seems to have been deleted!"] =
-   "Ouille ! La révision %s de %s semble avoir été effacée !";
-$locale["Optimizing database"] =
-   "Optimisation de database";
-$locale["Original (1.2 or 1.0)"] =
-   "Original (1.2 ou 1.0)";
-$locale["Orphaned Pages in this wiki (%d total):"] =
-   "Pages Orphelines dans ce wiki (%d au total) :";
-$locale["OrphanedPages"] =
-   "PagesOrphelines";
-$locale["Other diffs:"] =
-   "Autres comparaisons :";
-$locale["Other version"] =
-   "L'autre version";
-$locale["Our users created a total of %d pages."] =
-   "Nos utilisateurs ont créés un total de %s pages.";
-$locale["Owner"] =
-   "Propriétaire";
-$locale["Owner: %s"] =
-   "Propriétaire : %s";
-$locale["PHP syntax highlighting"] =
-   "Coloration syntaxique du PHP";
-$locale["PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."] =
-   "PHP n'a pas pu créer un nouveau flux d'image GD. Lisez 'lib/plugin/text2png.php' pour plus de détails.";
-$locale["Page"] =
-   "Page";
-$locale["Page %s not found."] =
-   "Page %s non trouvée.";
-$locale["Page Content: "] =
-   "Contenu de la page : ";
-$locale["Page Execution took %s seconds"] =
-   "L'exécution de la page a pris %s seconds";
-$locale["Page Info"] =
-   "InfosSurLaPage";
-$locale["Page Locked"] =
-   "Page verrouillée";
-$locale["Page Name"] =
-   "Nom de la page";
-$locale["Page Trail"] =
-   "Trace Page";
-$locale["Page Type:"] =
-   "Type de Page :";
-$locale["Page Version:"] =
-   "Version de la page :";
-$locale["Page change"] =
-   "Modification de page";
-$locale["Page dump"] =
-   "Cliché de la page";
-$locale["Page names with prefix '%s'"] =
-   "Noms de page ayant le préfixe ' %s '";
-$locale["Page names with suffix '%s'"] =
-   "Noms de page ayant le suffixe ' %s '";
-$locale["Page now external."] =
-   "La page est maintenant externe.";
-$locale["Page now locked."] =
-   "La page est maintenant verrouillée.";
-$locale["Page now not-external."] =
-   "La page n'est maintenant plus externe.";
-$locale["Page now not-public."] =
-   "La page n'est maintenant plus publique.";
-$locale["Page now public."] =
-   "La page est maintenant publique.";
-$locale["Page now unlocked."] =
-   "La page est maintenant déverrouillée.";
-$locale["Page once only"] =
-   "Une seule fois la page";
-$locale["Page rename %s to %s"] =
-   "retitrez la page de '%s' à '%s'";
-$locale["Page statistics"] =
-   "Statistiques de page";
-$locale["Page successfully updated."] =
-   "Page changé avec succès.";
-$locale["PageChange Notification Error: Couldn't send %s to %s"] =
-   "Erreur lors des notifications de changements de page: Impossible d'envoyer %s à %s";
-$locale["PageChange Notification of %s sent to %s"] =
-   "Les notifications de changement de la page %s ont été envoyés à %s";
-$locale["PageDump"] =
-   "RécupérationDeLaPage";
-$locale["PageGroup"] =
-   "GroupeDePages";
-$locale["PageGroup for %s"] =
-   "Groupe de pages pour %s";
-$locale["PageGroupTest"] =
-   "TestGroupeDePages";
-$locale["PageGroupTest/Four"] =
-   "TestGroupeDePages/Quatre";
-$locale["PageGroupTest/One"] =
-   "TestGroupeDePages/Un";
-$locale["PageGroupTest/Three"] =
-   "TestGroupeDePages/Trois";
-$locale["PageGroupTest/Two"] =
-   "TestGroupeDePages/Deux";
-$locale["PageHistory"] =
-   "HistoriqueDeLaPage";
-$locale["PageHistory for %s"] =
-   "Historique de %s";
-$locale["PageInfo"] =
-   "InfosSurLaPage";
-$locale["PageTrail"] =
-   "TracePage";
-$locale["PageTrail Plugin"] =
-   "Pour suivre les pages à la trace";
-$locale["Pagedata size: %d Kb"] =
-   "Taille des données de la page : %d Kb";
-$locale["Password cannot be changed."] =
-   "Impossible de changer le mot de passe.";
-$locale["Password updated."] =
-   "Mot de passe mis à jour.";
-$locale["Password was not changed."] =
-   "Mot de passe inchangé.";
-$locale["Password:"] =
-   "Mot de passe :";
-$locale["Perform searches on InterWiki sites listed in InterWikiMap."] =
-   "Effectuer une recherche sur les sites InterWiki contenu dans la carte InterWiki.";
-$locale["Permanently remove all selected pages."] =
-   "Supprimer toutes les pages sélectionnées en permanence.";
-$locale["Permission"] =
-   "Permission";
-$locale["Personal Auth Settings for '%s'"] =
-   "Préférences personnelles pour '%s'";
-$locale["Personal language:"] =
-   "Langue personnelle :";
-$locale["Personal theme:"] =
-   "Thème personnel :";
-$locale["PgsrcTranslation"] =
-   "TraductionPgsrc";
-$locale["PgsrcTranslation/de"] =
-   "TraductionPgsrc/de";
-$locale["PgsrcTranslation/es"] =
-   "TraductionPgsrc/es";
-$locale["PgsrcTranslation/fr"] =
-   "TraductionPgsrc/fr";
-$locale["PgsrcTranslation/it"] =
-   "TraductionPgsrc/it";
-$locale["PgsrcTranslation/ja"] =
-   "TraductionPgsrc/ja";
-$locale["PgsrcTranslation/nl"] =
-   "TraductionPgsrc/nl";
-$locale["PgsrcTranslation/sv"] =
-   "TraductionPgsrc/sv";
-$locale["PgsrcTranslation/zh"] =
-   "TraductionPgsrc/zh";
-$locale["PhotoAlbum"] =
-   "AlbumPhotos";
-$locale["PhotoAlbumPlugin"] =
-   "PluginAlbumPhotos";
-$locale["PhpHighlight"] =
-   "ColorationPhp";
-$locale["PhpHighlightPlugin"] =
-   "PluginColorationPhp";
-$locale["PhpWeather"] =
-   "MétéoPhp";
-$locale["PhpWeatherPlugin"] =
-   "PluginMétéoPhp";
-$locale["PhpWiki"] =
-   "PhpWiki";
-$locale["PhpWiki developers should manually inspect the downloaded file for nested markup before rewrapping with emacs and checking into CVS."] =
-   "Les développeurs de PhpWiki devraient inspecter manuellement les balises des fichiers téléchargés avant de les éditer sous emacs, et vérifier les CVS.";
-$locale["PhpWiki engine version"] =
-   "Version de PhpWiki";
-$locale["PhpWikiAdministration"] =
-   "AdministrationDePhpWiki";
-$locale["PhpWikiAdministration/Chmod"] =
-   "AdministrationDePhpWiki/Chmod";
-$locale["PhpWikiAdministration/Chown"] =
-   "AdministrationDePhpWiki/Chown";
-$locale["PhpWikiAdministration/Remove"] =
-   "AdministrationDePhpWiki/Supprimer";
-$locale["PhpWikiAdministration/Rename"] =
-   "AdministrationDePhpWiki/Renommer";
-$locale["PhpWikiAdministration/Replace"] =
-   "AdministrationDePhpWiki/Remplacer";
-$locale["PhpWikiAdministration/SetAcl"] =
-   "AdministrationDePhpWiki/DéfinirAcl";
-$locale["PhpWikiDocumentation"] =
-   "DocumentationDePhpWiki";
-$locale["PhpWikiPoll"] =
-   "SondagePhpWiki";
-$locale["Please check it through before saving."] =
-   "Veuillez la vérifier avant de la sauver.";
-$locale["Please contact your PhpWiki administrator for assistance."] =
-   "Veuillez contacter l'administrateur pour l'assistance.";
-$locale["Please continue editing.  (You'll find your %s at the bottom of the page.)"] =
-   "Veuillez continuer votre édition. (Vous trouverez votre %s en bas de page).";
-$locale["Please ensure that %s is writable, or redefine %s in config/config.ini."] =
-   "Veuillez vous assurer que %s est disponible en écriture, ou redéfinissez-le dans config/config.ini.";
-$locale["Please set ENCRYPTED_PASSWD to false in config/config.ini and probably change ADMIN_PASSWD."] =
-   "Veuillez définir ENCRYPTED_PASSWD à false dans config/config.ini et probablement l'ADMIN_PASSWD.";
-$locale["Please set ENCRYPTED_PASSWD to true in config/config.ini."] =
-   "Veuillez définir ENCRYPTED_PASSWD à true dans config/config.ini.";
-$locale["Please set a password in UserPreferences."] =
-   "Veuillez définir votre mot de passe dans PréférencesUtilisateurs.";
-$locale["Please use one of the downloadable versions rather than copying and pasting from the above preview."] =
-   "Veuillez utiliser une des versions téléchargeables au lieu de copier-coller à partir de la prévisualisation.";
-$locale["PloticusPlugin"] =
-   "PluginPloticus";
-$locale["Plugin"] =
-   "Plugin";
-$locale["Plugin %s disabled."] =
-   "Plugin %s désactivé.";
-$locale["Plugin %s failed."] =
-   "Plugin %s a échoué.";
-$locale["Plugin %s: undefined"] =
-   "Plugin %s: non défini";
-$locale["PluginManager"] =
-   "GestionsDesPlugins";
-$locale["Plugins"] =
-   "Plugins";
-$locale["PopularNearby"] =
-   "PopulairesAlentour";
-$locale["Post new"] =
-   "Poster un nouveau";
-$locale["Posted: %s"] =
-   "Posté le %s";
-$locale["Preferences"] =
-   "Préférences";
-$locale["PreferencesInfo"] =
-   "PréférencesInfo";
-$locale["PrevNext"] =
-   "PrécédentSuivant";
-$locale["Preview"] =
-   "Prévisualiser";
-$locale["Preview as backup format"] =
-   "Prévisualisation au format de sauvegarde";
-$locale["Preview as developer format"] =
-   "Prévisualisation au format développeurs";
-$locale["Preview only!  Changes not saved."] =
-   "Prévisualisation uniquement ! Modifications non enregistrées.";
-$locale["Preview: Page dump of %s"] =
-   "Prévisualisation : récupération de %s";
-$locale["Previous"] =
-   "Précédent";
-$locale["Previous Author"] =
-   "Auteur Précédent";
-$locale["Previous Major Revision"] =
-   "Précédente Révision Principale";
-$locale["Previous Month"] =
-   "Mois précédent";
-$locale["Previous Revision"] =
-   "Révision Précédente";
-$locale["Printable version"] =
-   "Version imprimable";
-$locale["Printer"] =
-   "Imprimante";
-$locale["Propagate new permissions to all subpages?"] =
-   "Propager les nouvelles permissions aux sous-pages ?";
-$locale["Provides access to PhpWiki's lower level system information."] =
-   "Affiche les informations de bas niveau pour PhpWiki.";
-$locale["Purge"] =
-   "Purger";
-$locale["Purge HTML cache"] =
-   "Vider le cache HTML";
-$locale["Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."] =
-   "Purge le cache HTML pour cette page. Régénère depuis WikiMarkup lors du prochain accès.";
-$locale["Purge Markup Cache"] =
-   "Purger le cache";
-$locale["Purge Page"] =
-   "Purger la page";
-$locale["Purge all Pages With Invalid Names"] =
-   "Supprimer les pages dont le nom n'est pas valide";
-$locale["Purge this page"] =
-   "Purger cette page";
-$locale["PurgeHtmlCache"] =
-   "PurgerLeCache";
-$locale["Purging pages"] =
-   "Purge des pages";
-$locale["Querying backend directly for '%s'"] =
-   "Requête directe au backend pour '%s'";
-$locale["Quick Search"] =
-   "Recherche rapide";
-$locale["Random page"] =
-   "Une page au hasard";
-$locale["RandomPage"] =
-   "PageAléatoire";
-$locale["Rate"] =
-   "Note";
-$locale["Rate It"] =
-   "Classez la";
-$locale["RateIt"] =
-   "ClassezLa";
-$locale["Rating system. Store user ratings per page"] =
-   "Système de vote. Stocke les votes d'utilisateur par page.";
-$locale["Raw HTML"] =
-   "HTML Pur";
-$locale["Raw HTML is disabled in this wiki."] =
-   "Le HTML est interdit sur ce wiki.";
-$locale["RawHtmlPlugin"] =
-   "PluginHtmlPur";
-$locale["Recent Comments"] =
-   "Derniers commentaires";
-$locale["Recent Edits"] =
-   "Éditions récentes";
-$locale["Recent changes"] =
-   "Dernières modifications";
-$locale["Recent comments"] =
-   "Commentaires récents";
-$locale["Recent new pages"] =
-   "Dernières pages créées";
-$locale["RecentChanges"] =
-   "DernièresModifs";
-$locale["RecentComments"] =
-   "CommentairesRécents";
-$locale["RecentEdits"] =
-   "ÉditionsRécentes";
-$locale["RecentVisitors"] =
-   "VisiteursRécents";
-$locale["Recursive redirect to self: '%s'"] =
-   "Redirection récursive vers soi-même: %s";
-$locale["Recursively get BackLinks or links"] =
-   "Obtenir récursivement des RétroLiens ou liens";
-$locale["Redirect"] =
-   "Redirection";
-$locale["RedirectTo"] =
-   "RedirigerVers";
-$locale["RedirectToPlugin"] =
-   "PluginRedirection";
-$locale["Redirects to an external web site based on form input"] =
-   "Redirige vers un site externe basé sur un formulaire";
-$locale["References"] =
-   "Références";
-$locale["Regex?"] =
-   "expression régulière ?";
-$locale["Registered Users"] =
-   "Utilisateurs Enregistrés";
-$locale["Registered Users Online: "] =
-   "Utilisateurs enregistrés en ligne : ";
-$locale["Related Changes"] =
-   "Changements liés";
-$locale["Related Links"] =
-   "Liens correspondants";
-$locale["Related changes"] =
-   "Changements liés";
-$locale["RelatedChanges"] =
-   "ChangementsLiés";
-$locale["Relation"] =
-   "Relation";
-$locale["ReleaseNotes"] =
-   "NotesDeVersion";
-$locale["Remove"] =
-   "Supprimer";
-$locale["Remove Comment"] =
-   "Supprimer le commentaire";
-$locale["Remove Page"] =
-   "Supprimer la page";
-$locale["Remove selected pages"] =
-   "Supprimer les pages sélectionnées";
-$locale["Remove this page"] =
-   "Supprimer la page";
-$locale["Removed page '%s' successfully."] =
-   "Page '%s' supprimée avec succès.";
-$locale["Removing pages"] =
-   "Suppression des pages";
-$locale["Rename"] =
-   "Renommer";
-$locale["Rename Page"] =
-   "Renommer la page";
-$locale["Rename selected pages"] =
-   "Renommer les pages sélectionnées.";
-$locale["Rename to"] =
-   "Renommer en";
-$locale["Renamed page '%s' to '%s'."] =
-   "Page '%s' renommées en '%s' avec succès.";
-$locale["Replace"] =
-   "Remplacer: ";
-$locale["Replace with"] =
-   "Remplacer par";
-$locale["Replaced '%s' with '%s' in page '%s'."] =
-   "%s a bien été modifié par %s dans la page %s.";
-$locale["Reply"] =
-   "Répondre";
-$locale["Requires WikiAdmin privileges to edit."] =
-   "Nécessite les privilèges administrateur pour l'édition.";
-$locale["Reset"] =
-   "Réinitialiser";
-$locale["Reset Preferences"] =
-   "Reinitialiser les préférences";
-$locale["Restore Anyway"] =
-   "Restaurer quand même";
-$locale["Return to %s"] =
-   "Retour à la %s";
-$locale["Revert"] =
-   "Réinitialiser";
-$locale["Revision Not Found"] =
-   "Révision Non Trouvée";
-$locale["RichTable"] =
-   "BeauTableau";
-$locale["RichTablePlugin"] =
-   "PluginBeauTableau";
-$locale["RssFeed"] =
-   "RessourcesRss";
-$locale["SOAP access"] =
-   "Accès SOAP";
-$locale["Sample table"] =
-   "Exemple de table";
-$locale["SandBox"] =
-   "BacÀSable";
-$locale["Save"] =
-   "Enregistrer";
-$locale["Saved on:"] =
-   "Enregistrée le :";
-$locale["Saved: %s"] =
-   "Enregistrée : %s";
-$locale["Saving this page will overwrite the current version."] =
-   "Enregistrer cette page écrasera la version actuelle.";
-$locale["Score"] =
-   "Point";
-$locale["Search"] =
-   "Recherche";
-$locale["Search & Replace"] =
-   "Recherche & Remplace";
-$locale["Search and replace text in selected wiki pages."] =
-   "Recherche puis remplace le texte dans les pages sélectionnées.";
-$locale["Search for"] =
-   "Chercher";
-$locale["Search for page titles similar to %s."] =
-   "Rechercher le titre de page similaire à %s.";
-$locale["Search the content of all pages in this wiki."] =
-   "Rechercher le contenu de toutes les pages de ce wiki.";
-$locale["Search the titles of all pages in this wiki."] =
-   "Rechercher les titres de toutes les pages de ce wiki.";
-$locale["Search:"] =
-   "Chercher :";
-$locale["See %s"] =
-   "Voir %s";
-$locale["See %s tips for editing."] =
-   "Voir les conseils pour éditer les pages dans %s.";
-$locale["See: %s"] =
-   "Voir : %s";
-$locale["Select pages"] =
-   "Sélectionner les pages";
-$locale["Select the pages to change:"] =
-   "Sélectionnez les pages à modifier :";
-$locale["Select the pages to rename:"] =
-   "Sélectionner les pages à renommer :";
-$locale["Select: "] =
-   "Sélectionner : ";
-$locale["Selected Grant checkboxes allow access, unselected checkboxes deny access."] =
-   "Les cases sélectionnées autorisent l'accès, sinon elles l'interdisent.";
-$locale["Selected Pages: "] =
-   "Pages sélectionnées : ";
-$locale["Selected page '%s' passed to '%s'."] =
-   "%s passée à %s.";
-$locale["Serialized file %s"] =
-   "Fichier sérialisé %s";
-$locale["Set Password"] =
-   "Mot de passe";
-$locale["Set USE_DB_SESSION to false."] =
-   "Mettre USE_DB_SESSION à false.";
-$locale["Set individual page permissions."] =
-   "Régler les permissions de pages individuellement.";
-$locale["SetAcl"] =
-   "DéfinirAcl";
-$locale["Show and add blogs for %s"] =
-   "Montrer et ajouter un blog à %s ";
-$locale["Show and add comments for %s"] =
-   "Afficher et ajouter des commentaires pour %s";
-$locale["Show changes for:"] =
-   "Indiquer les modifications pour :";
-$locale["Show extra page Info and statistics for %s."] =
-   "Montrer les informations de la page %s ainsi que ses statistiques.";
-$locale["Show relative dates using 'Today' and 'Yesterday'"] =
-   "Montre les dates relatives en utilisant 'Aujourd'hui' et 'Hier'.";
-$locale["Show summary information from the access log table."] =
-   "Montre l'index de la table access log.";
-$locale["Show summary information of the current user sessions."] =
-   "Montre l'index de la table session. (utilisateurs en ligne).";
-$locale["Show translations of various words or pages"] =
-   "Affiche la traduction de quelques mots dans certaines pages.";
-$locale["Sidebar"] =
-   "Barre verticale";
-$locale["Sign In"] =
-   "Connexion";
-$locale["Sign Out"] =
-   "Déconnexion";
-$locale["Sign in as:"] =
-   "Se connecter en tant que :";
-$locale["SignIn"] =
-   "Connexion";
-$locale["SignOut"] =
-   "Déconnexion";
-$locale["Signed Users"] =
-   "Utilisateurs signés";
-$locale["Simple RSS Feed aggregator Plugin"] =
-   "Importer des ressources RSS";
-$locale["Simple Sample Plugin"] =
-   "Exemple simple de Plugin";
-$locale["Since you started the deletion process, someone has saved a new version of %s.  Please check to make sure you still want to permanently remove the page from the database."] =
-   "Depuis que vous avez entamé le processus d'effacement, quelqu'un a enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez toujours retirer de façon permanente cette page de la base de données.";
-$locale["SiteMap"] =
-   "CarteDuSite";
-$locale["Size"] =
-   "Taille";
-$locale["Size:"] =
-   "Taille :";
-$locale["Skipped."] =
-   "Ignoré.";
-$locale["Skipping"] =
-   "Ignoré";
-$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."] =
-   "Certaines modifications n'ont pas pu être combinées automatiquement. Veuillez regarder les sections commençant par '%s', et se terminant par '%s'. Vous devrez éditer ces sections à la main avant cliquer sur Enregistrer.";
-$locale["Someone has edited the page!"] =
-   "Quelqu'un a édité la page !";
-$locale["Sorry but this file is too big."] =
-   "Désolé, mais le fichier est trop gros.";
-$locale["Sorry for the inconvenience."] =
-   "Désolé pour la gène occasionnée.";
-$locale["Sorry! You must wait at least 20 minutes until you can vote again!"] =
-   "Désolé, vous devez attendre au moins 20 minutes avant de pouvoir revoter !";
-$locale["Sorry, no dynamic DB Session support."] =
-   "Désolé, Session dynamique non supportées.";
-$locale["Sorry, this version of PHP cannot create PNG image files."] =
-   "Désolé, cette version de PHP ne peut pas créer des fichiers d'image PNG.";
-$locale["Sorry. Access Restrictions not yet implemented"] =
-   "Désolé. Restriction d'accès pas encore disponible";
-$locale["Sort by %s"] =
-   "Trié par %s";
-$locale["Sound Score"] =
-   "Score de son";
-$locale["Special Actions"] =
-   "Actions spéciales";
-$locale["SpecialPages"] =
-   "Pages spéciales";
-$locale["Spelling Score"] =
-   "Score d'épellation";
-$locale["SqlResult"] =
-   "RésultatSql";
-$locale["Statistics about %s."] =
-   "Statistiques sur %s.";
-$locale["Status:"] =
-   "Statut :";
-$locale["SteveWainstead"] =
-   "SteveWainstead";
-$locale["Strike"] =
-   "Rayer";
-$locale["Strike-through text"] =
-   "Texte rayé";
-$locale["String \"%s\" not found."] =
-   "\"%s\" non trouvée.";
-$locale["SubPages of %s:"] =
-   "SousPages de %s :";
-$locale["Submit"] =
-   "Valider";
-$locale["Submit country"] =
-   "Valider le pays";
-$locale["Submit location"] =
-   "Valider la localisation";
-$locale["Subpage"] =
-   "Sous-page";
-$locale["Summary"] =
-   "Résumé";
-$locale["Supplanted on:"] =
-   "Remplacée le :";
-$locale["Support moderated pages"] =
-   "Supportés pages moderée";
-$locale["Supported handlers are: %s"] =
-   "Les gestionnaires supportés sont : %s";
-$locale["Supported languages"] =
-   "Langages supportés";
-$locale["Supported themes"] =
-   "Thèmes supportés";
-$locale["Switch to detailed list"] =
-   "Passer à la liste détaillée";
-$locale["Switch to summary"] =
-   "Passer au Sommaire";
-$locale["Synopsis"] =
-   "Vue d'ensemble";
-$locale["Syntax language not specified."] =
-   "Syntaxe du langage non spécifié.";
-$locale["SyntaxHighlighter"] =
-   "ColorationSyntaxique";
-$locale["System default:"] =
-   "Système par défaut :";
-$locale["SystemInfo"] =
-   "InfosSystème";
-$locale["SystemInfoPlugin"] =
-   "PluginInfosSystème";
-$locale["TODO: Google can only translate from english and french. Find a translation service for %s to language %s"] =
-   "A FAIRE: Google peut uniquement traduire l'anglais et le français. Trouver un service pour traduire %s en %s";
-$locale["Table of Contents"] =
-   "Table des matières";
-$locale["Table of content"] =
-   "Table des matières";
-$locale["TeX2png"] =
-   "TeX2png";
-$locale["Template"] =
-   "Modèle";
-$locale["Template Name"] =
-   "nom du modèle";
-$locale["TextFormattingRules"] =
-   "RèglesDeFormatageDesTextes";
-$locale["Thank you for editing %s."] =
-   "Merci d'avoir édité %s.";
-$locale["Thanks for adding this translation!"] =
-   "Merci d'avoir ajouté cette traduction.";
-$locale["Thanks for participating!"] =
-   "Merci d'avoir participé !";
-$locale["The %d least popular pages of this wiki:"] =
-   "Les %d pages les moins populaires de ce wiki :";
-$locale["The %d most popular pages of this wiki:"] =
-   "Les %d pages les plus populaires de ce wiki :";
-$locale["The %d most recent %s are listed below."] =
-   "Les %d %s les plus récentes sont listées ci-dessous.";
-$locale["The %d most recent %s during the past %s days are listed below."] =
-   "Les %d %s les plus récentes pendant les derniers %s jours sont listées ci-dessous.";
-$locale["The %d most recent %s during the past day are listed below."] =
-   "Les %d %s les plus récentes pendant le dernier jour sont listées ci-dessous.";
-$locale["The %d oldest %s are listed below."] =
-   "Les %d %s les plus anciennes sont listées ci-dessous.";
-$locale["The %d oldest %s during the past %s days are listed below."] =
-   "Les %d %s les plus anciennes pendant les derniers %s jours sont listées ci-dessous.";
-$locale["The %d oldest %s during the past day are listed below."] =
-   "Les %d %s les plus anciennes pendant le dernier jour sont listées ci-dessous.";
-$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!"] =
-   "Les fichiers %s sont dans le répertoire %s. Veuillez lire le fichier INSTALL et déplacez le fichier DB vers un emplacement permanent, sinon vous risquez de perdre toutes vos pages !";
-$locale["The %s subpage enables simple weblogging."] =
-   "Les sous pages de %s permettent le simple weblogging.";
-$locale["The DBA handler %s is unsupported!"] =
-   "Le gestionnaire DBA %s n'est pas supporté !";
-$locale["The ICAO '%s' wasn't recognized."] =
-   "L'ICAO '%s' n'a pas été reconnu.";
-$locale["The PhpWeather plugin provides weather reports from the Internet."] =
-   "Le plugin de météo importée d'internet.";
-$locale["The PhpWiki access log file"] =
-   "Le journal d'évènement de PhpWiki";
-$locale["The crypt function is not available in this version of PHP."] =
-   "La fonction de cryptage n'est pas disponible dans cette version de PHP.";
-$locale["The current page has no subpages defined."] =
-   "La page actuelle n'a aucune sous-page définie.";
-$locale["The current time at the server is %s."] =
-   "L'heure actuelle du serveur est %s.";
-$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 taille de votre mot de passe est trop petite, vous ne pouvez pas vous connecter. Veuillez contacter l'administrateur pour le changer.";
-$locale["The list of recent changes in the wiki."] =
-   "Liste des modifications recentes de ce wiki.";
-$locale["The most recent %s during the past %s days are listed below."] =
-   "Les %s les plus récentes pendant les %s derniers jours sont listées ci-dessous.";
-$locale["The most recent %s during the past day are listed below."] =
-   "Les %s les plus récentes pendant le dernier jour sont listées ci-dessous.";
-$locale["The newest registered user is %s."] =
-   "L'utilisateur enregistré le plus récent est %s.";
-$locale["The result of this poll so far:"] =
-   "Le résultat du sondage :";
-$locale["The session.save_path directory"] =
-   "Le répertoire 'session.save_path'";
-$locale["The wordwrap of the preview doesn't take nested markup or list indentation into consideration!"] =
-   "Le retour chariot de la prévisualisation ne prend pas en compte les marques des listes indentées !";
-$locale["Theme"] =
-   "Thème";
-$locale["There is already a file with name %s uploaded."] =
-   "Un fichier portant le nom '%s' existe déjà.";
-$locale["There is no image creation data available to id '%s'. Please reload referring page."] =
-   "Aucune image ne correspond à l'id %s. Veuillez recharger cette page.";
-$locale["These page titles match fuzzy with '%s'"] =
-   "Ces titres de pages correspondent de manière floue à '%s'";
-$locale["These pages share an initial or final title word with '%s'"] =
-   "Ces pages partagent un mot initial ou final dans leur titre avec %s";
-$locale["This data is based on users active over the past %s."] =
-   "Ces données sont basées sur les utilisateurs actifs depuis %s.";
-$locale["This internal action page cannot viewed."] =
-   "Cette page ne peut être vue.";
-$locale["This is a minor change."] =
-   "Modification mineure.";
-$locale["This page has been locked by the administrator so your changes can not be saved."] =
-   "Cette page a été verrouillée par l'administrateur et vos changements n'ont pas pu être enregistrée.";
-$locale["This plugin is currently under development and does not work!"] =
-   "Ce plugin est en cours de développement et ne marche pas !";
-$locale["Time Zone"] =
-   "Fuseau horaire";
-$locale["Title"] =
-   "Titre";
-$locale["Title 1"] =
-   "Titre 1";
-$locale["Title 2"] =
-   "Titre 2";
-$locale["Title 3"] =
-   "Titre 3";
-$locale["Title Search"] =
-   "Recherche par titre";
-$locale["Title search results for '%s'"] =
-   "Résultat de recherche sur les titres de pages pour '%s'";
-$locale["Title:"] =
-   "Titre :";
-$locale["TitleSearch"] =
-   "RechercheParTitre";
-$locale["To add check 'Add' near the dropdown list."] =
-   "Pour ajouter cocher 'Add' près de la liste déroulante.";
-$locale["To ignore delete the line."] =
-   "Pour ignorer effacez la ligne.";
-$locale["Today"] =
-   "Aujourd'hui";
-$locale["Too many external links."] =
-   "Trop de liens extérieurs.";
-$locale["Toolbox"] =
-   "Boîte à outils";
-$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: "] =
-   "%d langages au total : ";
-$locale["Total of %d themes: "] =
-   "%d thèmes au total: ";
-$locale["Transclude"] =
-   "Insérer";
-$locale["TranscludePlugin"] =
-   "PluginInsérer";
-$locale["Transcluded from %s"] =
-   "Inséré de %s";
-$locale["Transcluded page"] =
-   "Page insérées";
-$locale["Translate"] =
-   "Traduire";
-$locale["Translate %s to %s in %s"] =
-   "Traduire de %s à %s en %s";
-$locale["Translate '%s' to '%s' in *%s*"] =
-   "Traduire de '%s' à '%s' en *%s*";
-$locale["TranslateText"] =
-   "TraduireUnTexte";
-$locale["Translation Error!"] =
-   "Erreur de traduction !";
-$locale["Type"] =
-   "Type";
-$locale["Type it again"] =
-   "Verification";
-$locale["UNOBTAINABLE"] =
-   "INACCESSIBLE";
-$locale["USER"] =
-   "UTILISATEUR";
-$locale["Unable to bind LDAP server %s using %s %s"] =
-   "Impossible de se connecter au serveur LDAP %s";
-$locale["Unable to connect to IMAP server "] =
-   "Impossible de se connecter au serveur IMAP ";
-$locale["Unable to connect to LDAP server %s"] =
-   "Impossible de se connecter au serveur LDAP %s";
-$locale["Unable to find src='%s'"] =
-   "Impossible de lire src=%s";
-$locale["Unable to open directory '%s' for reading"] =
-   "Impossible d'ouvrir le répertoire '%s' en lecture";
-$locale["Unable to read src='%s'"] =
-   "Impossible de lire src=%s";
-$locale["Undefined method %s for special group %s"] =
-   "Méthode non définie %s pour le groupe %s";
-$locale["Undo"] =
-   "Annuler l'action";
-$locale["Undo Search & Replace"] =
-   "Annuler Rechercher & Remplacer";
-$locale["Undo disabled"] =
-   "Annuler dernière action désactivé.";
-$locale["Unexpected EOF in zip file"] =
-   "Fin de fichier (EOF) inattendue dans le fichier Zip";
-$locale["UnfoldSubpages"] =
-   "ListeDesSousPages";
-$locale["UnfoldSubpagesPlugin"] =
-   "PluginListeSousPages";
-$locale["Unknown special group '%s'"] =
-   "Groupe spécial %s inconnu";
-$locale["Unlock"] =
-   "Déverrouiller";
-$locale["Unlock Page"] =
-   "Déverrouiller la page";
-$locale["Unlocking pages"] =
-   "Déverrouillage des pages";
-$locale["Unsupported ACL access type %s ignored."] =
-   "Le type d'accès ACL %s n'est pas supporté. -- Ignoré.";
-$locale["Up"] =
-   "Haut";
-$locale["UpLoad"] =
-   "DéposerUnFichier";
-$locale["UpLoadPlugin"] =
-   "PluginDéposer";
-$locale["Update Preferences"] =
-   "Mettre à jour les préférences";
-$locale["Upgrade"] =
-   "Mettre à jour";
-$locale["Upgrade disabled: user != isAdmin"] =
-   "Mise à jour désactivée, vous n'êtes pas administrateur";
-$locale["Upgrading this PhpWiki"] =
-   "Mise à jour du PhpWiki";
-$locale["Upload"] =
-   "Déposer";
-$locale["Upload File"] =
-   "Déposer un fichier";
-$locale["Upload file"] =
-   "Déposer un fichier";
-$locale["Upload files to the local InterWiki Upload:<filename>"] =
-   "Transférer les fichiers vers Upload:<filename>";
-$locale["Uploading %s"] =
-   "Dépôt de %s";
-$locale["Uploading failed."] =
-   "Échec du dépôt.";
-$locale["Uploading zip dumps"] =
-   "Déposer la sauvegarde compressée";
-$locale["Use old markup"] =
-   "Anciennes règles";
-$locale["User not found in LDAP"] =
-   "Utilisateur non trouvé dans l'annuaire LDAP";
-$locale["User page"] =
-   "Page de l'utilisateur";
-$locale["User statistics"] =
-   "Statistiques d'utilisateur";
-$locale["UserId"] =
-   "IdentifiantUtilisateur";
-$locale["UserId:"] =
-   "Nom d'utilisateur :";
-$locale["UserPreferences"] =
-   "PréférencesUtilisateurs";
-$locale["UserRatings"] =
-   "Statistiques d'utilisateur";
-$locale["Users will not be able to sign in."] =
-   "Les utilisateurs ne pourront pas s'inscrire.";
-$locale["Using directory '%s'"] =
-   "Utilisation du répertoire '%s'";
-$locale["Verification Status"] =
-   "Vérification du statut";
-$locale["Verify the current action"] =
-   "Vérifier l'action actuelle";
-$locale["Version"] =
-   "Version";
-$locale["Version "] =
-   "Version";
-$locale["Version %d"] =
-   "Version %d";
-$locale["Version %s"] =
-   "Version %s";
-$locale["Version %s, saved %s"] =
-   "Version %s, enregistrée %s";
-$locale["Version %s, saved on %s"] =
-   "Version %s, enregistrée sur %s";
-$locale["Versions are identical"] =
-   "Les versions sont identiques";
-$locale["View Source"] =
-   "Afficher la source";
-$locale["View Source: %s"] =
-   "Afficher la source : %s";
-$locale["View a single page dump online."] =
-   "Voir une sauvegarde de page en ligne.";
-$locale["View the current version"] =
-   "Visualiser la version actuelle";
-$locale["View this page and all subpages"] =
-   "Voir cette page et ses sous-pages";
-$locale["Viewing redirecting page."] =
-   "Consultation des pages de redirection.";
-$locale["Viewing the source of pages"] =
-   "Visualisation de la source des pages";
-$locale["Views"] =
-   "Vues";
-$locale["Visited pages on this wiki, ordered by popularity:"] =
-   "Pages visitées sur ce wiki, classées par ordre de popularité :";
-$locale["Visualizes the Wiki structure in a graph using the 'dot' commandline tool from graphviz."] =
-   "Représenter la structure du wiki par un graphe utilisant l'outil dot de graphviz.";
-$locale["W"] =
-   "L";
-$locale["WabiSabi"] =
-   "WabiSabi";
-$locale["Wanted From"] =
-   "Recherchées par";
-$locale["Wanted Pages for %s (%d total):"] =
-   "Pages recherchées pour %s  dans ce wiki (%d au total) :";
-$locale["Wanted Pages for %s:"] =
-   "Pages recherchées pour %s :";
-$locale["Wanted Pages in this wiki (%d total):"] =
-   "Pages recherchées dans ce wiki (%d au total) :";
-$locale["Wanted Pages in this wiki:"] =
-   "Pages recherchées dans ce wiki :";
-$locale["WantedPages"] =
-   "PagesRecherchées";
-$locale["Warning:"] =
-   "Attention:";
-$locale["Warning: The search string cannot be empty!"] =
-   "ATTENTION: vous devez entrez au moins une lettre pour la recherche!";
-$locale["Warning: You are editing an old revision."] =
-   "Attention : vous modifiez une version archivée.";
-$locale["Watch"] =
-   "Suivre";
-$locale["WatchPage"] =
-   "Suivre";
-$locale["We have a total of %d registered users."] =
-   "Nous avons %d utilisateurs enregistrés.";
-$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] =
-   "Bienvenue sur %s!\nVotre compte email a été vérifié et\nsera utilisé pour les notifications de changements de pages.\nVoir %s";
-$locale["What links here"] =
-   "Pages liées";
-$locale["White space converted to single space"] =
-   "Espace blanc converti en espace simple";
-$locale["Who Is Online"] =
-   "Qui est en ligne";
-$locale["Who is online"] =
-   "Qui est en ligne";
-$locale["WhoIsOnline"] =
-   "QuiEstEnLigne";
-$locale["Width"] =
-   "Largeur";
-$locale["Wiki Name"] =
-   "Nom Wiki";
-$locale["WikiAdminChmod"] =
-   "AdministrationDePhpWiki/Droits";
-$locale["WikiAdminChown"] =
-   "WikiAdminChown";
-$locale["WikiAdminRemove"] =
-   "WikiAdminSupprimer";
-$locale["WikiAdminRename"] =
-   "WikiAdminRenommer";
-$locale["WikiAdminSearchReplace"] =
-   "WikiAdminRemplacementRecherche";
-$locale["WikiAdminSelect"] =
-   "WikiAdminSelect";
-$locale["WikiAdminSetAcl"] =
-   "WikiAdminSetAcl";
-$locale["WikiAdminUtils"] =
-   "WikiAdminUtils";
-$locale["WikiBlog"] =
-   "WikiBlog";
-$locale["WikiBlogPlugin"] =
-   "PluginWikiBlog";
-$locale["WikiDB::renamePage() not yet implemented for this backend"] =
-   "WikiBD::renamePage() pas encore implémentée pour le Principal";
-$locale["WikiForm"] =
-   "WikiForm";
-$locale["WikiForm: %s: unknown action"] =
-   "FormulaireWiki : %s : action inconnue";
-$locale["WikiForum"] =
-   "WikiForum";
-$locale["WikiPlugin"] =
-   "PluginWiki";
-$locale["WikiPoll"] =
-   "WikiPoll";
-$locale["WikiWikiWeb"] =
-   "WikiWikiWeb";
-$locale["Wikiname regexp"] =
-   "regexp du WikiNom";
-$locale["With the current offset, this would be reported as %s."] =
-   "Avec l'offset actuel, ceci serait affiché comme %s.";
-$locale["Wrong password. Try again."] =
-   "Mot de passe invalide, essayez encore.";
-$locale["Wrong password: "] =
-   "Mot de passe invalide, essayez encore.";
-$locale["XML-RPC access"] =
-   "Accès XML-RPC";
-$locale["Yes"] =
-   "Oui";
-$locale["You are about to remove '%s'!"] =
-   "Vous êtes sur le point de supprimer ' %s ' de façon permanente !";
-$locale["You are signed but not authenticated as %s. "] =
-   "Vous êtes enregistré mais pas connecté en tant que %s. ";
-$locale["You are signed in as %s"] =
-   "Vous êtes connecté comme %s";
-$locale["You are viewing an old revision of this page."] =
-   "Vous lisez une ancienne révision de cette page.";
-$locale["You can only use it via the _WikiTranslation plugin."] =
-   "Vous pouvez uniquement l'utiliser via le plugin _WikiTranslation.";
-$locale["You can personalize various settings in %s."] =
-   "Vous pouvez personnaliser quelques préférences dans %s.";
-$locale["You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config.ini"] =
-   "Vous avez oublié de mettre ENCRYPTED_PASSWD à true. Veuillez éditer votre config/config.ini";
-$locale["You have not made any changes so no new version has been saved."] =
-   "Vous n'avez effectué aucun changement, aucune nouvelle version n'a donc été enregistrée.";
-$locale["You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"] =
-   "Vous devez définir PHPWEATHER_BASE_DIR avant de l'utiliser (config/config.ini)";
-$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."] =
-   "Vous pouvez vous inscrire en utilisant n'importe quel WikiMot comme identifiant utilisateur (ÀÖØöøÿßö peuvent être utilisés). L'identifiant sera utilisé comme lien vers votre PagePersonnelle dans DernièresModifs.";
-$locale["You must be an administrator to %s."] =
-   "Vous devez être un administrateur pour %s.";
-$locale["You must be an administrator to use this plugin."] =
-   "Vous devez être un administrateur pour utiliser ce plugin.";
-$locale["You must be logged in to view ratings."] =
-   "Vous devez vous connecter pour voir les scores.";
-$locale["You must sign in to %s."] =
-   "Vous devez vous inscrire pour %s.";
-$locale["You must specify a directory to dump to"] =
-   "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde";
-$locale["You stored an empty password in your '%s' page."] =
-   "Vous n'avez pas saisi de mot de passe pour la page %s.";
-$locale["Your E-Mail:"] =
-   "Votre adresse électronique :";
-$locale["Your UserPreferences have been successfully reset to default."] =
-   "Vos préférences ont été reinitialisees avec succès.";
-$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] =
-   "Votre choix '%s' de WikiDB DB ne peut pas être utilisé pour DbSession.";
-$locale["Your access permissions are only for a BogoUser."] =
-   "Vos permissions d'acces sont celles d'un utilisateur Bogo.";
-$locale["Your are probably trying to edit/create an invalid version of this page."] =
-   "Vous lisez une ancienne révision de cette page.";
-$locale["Your browser should have redirected you to %s."] =
-   "Votre navigateur aurait du vous redirigé vers %s.";
-$locale["Your careful attention to detail is much appreciated."] =
-   "Votre souci particulier du détail est très apprécié.";
-$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."] =
-   "Vos modifications ne peuvent être enegistrées, puisqu'elles écraseraient celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de l'autre auteur ont été combinées. Le résultat est affiché ci-dessous.";
-$locale["Your current watchlist: "] =
-   "Votre liste de suivi actuelle : ";
-$locale["Your home page has not been created yet so your preferences cannot not be saved."] =
-   "Cette page a été verrouillée par l'administrateur et vos changements n'ont pas pu être enregistrée.";
-$locale["Your home page is locked so your preferences cannot not be saved."] =
-   "Cette page a été verrouillée par l'administrateur et vos changements n'ont pas pu être enregistrée.";
-$locale["Your rating was %.1f"] =
-   "Votre note est %.1f";
-$locale["Your signature"] =
-   "Votre signature";
-$locale["Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation."] =
-   "Le texte traduit n'apparait pas encore dans ce %s, mais l'administrateur l'ajoutera à l'installation.";
-$locale["Your translated text is either empty or equal to the untranslated text. Please try again."] =
-   "Soit votre texte est vide soit il est le même que le texte à traduire, veuillez réessayer.";
-$locale["Your translation is stored in %s"] =
-   "Votre traduction est enregistrée dans %s";
-$locale["Your version"] =
-   "Votre version";
-$locale["[%d] See [%s]"] =
-   "[%d] Voir [%s]";
-$locale["[purged]"] =
-   "[purgé]";
-$locale["_WikiTranslation"] =
-   "_WikiTranslation";
-$locale["access this wiki via SOAP"] =
-   "accéder à ce wiki via SOAP";
-$locale["access this wiki via XML-RPC"] =
-   "accéder à ce wiki via XML-RPC";
-$locale["add "] =
-   "ajouter";
-$locale["always skip the HomePage."] =
-   "toujours ignorer la page d'accueil.";
-$locale["argument '%s' not declared by plugin"] =
-   "argument '%s' non déclaré par le plugin";
-$locale["authenticated"] =
-   "authentifié";
-$locale["blog"] =
-   "blog";
-$locale["by"] =
-   "par";
-$locale["by %s"] =
-   "par %s";
-$locale["cached pagedata:"] =
-   "page bufferisée :";
-$locale["cached versiondata:"] =
-   "version bufferisée :";
-$locale["chmod page '%s' to '%s'."] =
-   "Changement de mode %s à %s.";
-$locale["comments"] =
-   "commentaires";
-$locale["compare revisions"] =
-   "comparer les révisions";
-$locale["content is identical to current version %d - no new revision created"] =
-   "contenu est identique à la version en cours %d - pas de révision";
-$locale["couldn't move %s to %s"] =
-   "impossible de déplacer %s en %s";
-$locale["couldn't open file '%s' for writing"] =
-   "Impossible d'ouvrir le fichier '%s' en écriture";
-$locale["create this page"] =
-   "créer cette page";
-$locale["current version"] =
-   "version actuelle";
-$locale["database"] =
-   "Base de données";
-$locale["days"] =
-   "jours";
-$locale["default page permission"] =
-   "Permission de page par défaut";
-$locale["diff"] =
-   "diff";
-$locale["diff this page"] =
-   "diff de cette page";
-$locale["download a html zip dump from this wiki"] =
-   "télécharger une sauvegarde HTML compressée de ce wiki";
-$locale["download a zip dump from this wiki"] =
-   "télécharger une sauvegarde compressée de ce wiki";
-$locale["dump html pages"] =
-   "récupération des pages HTML";
-$locale["dump serial pages"] =
-   "récupération des pages sérialisées";
-$locale["edit area"] =
-   "Zone d'édition";
-$locale["edit this page"] =
-   "éditer cette page";
-$locale["edits"] =
-   "éditions";
-$locale["empty source"] =
-   "source vide";
-$locale["external"] =
-   "externe";
-$locale["from"] =
-   "de";
-$locale["from %s"] =
-   "du %s";
-$locale["has edit conflicts - overwriting anyway"] =
-   "conflits d'édition - écraser quand même ";
-$locale["has edit conflicts - skipped"] =
-   "a des conflits d'édition - ignoré";
-$locale["home page"] =
-   "Page d'accueil";
-$locale["invalid %s ignored"] =
-   "%s non valable ignoré";
-$locale["invalid argument %s"] =
-   "Argument non valable : %s";
-$locale["latest comment by "] =
-   "dernier commentaire par ";
-$locale["load files into this wiki"] =
-   "chargement des fichiers sur ce wiki";
-$locale["lock this page"] =
-   "verrouiller cette page";
-$locale["locked"] =
-   "verrouillée";
-$locale["major edits"] =
-   "éditions majeures";
-$locale["max: %d"] =
-   "maximum : %d";
-$locale["mean: %2.3f"] =
-   "moyenne : %2.3f";
-$locale["median: %d"] =
-   "médiane : %d";
-$locale["minor"] =
-   "mineure";
-$locale["minor edit"] =
-   "édition mineure";
-$locale["minor edits"] =
-   "éditions mineures";
-$locale["minutes"] =
-   "minutes";
-$locale["missing required version argument"] =
-   "argument de version requis manquant";
-$locale["newer than the existing page."] =
-   "plus récent que la page existante.";
-$locale["no cache used"] =
-   "pas de cache utilisé";
-$locale["no page content"] =
-   "pas de sommaire de page";
-$locale["no page specified"] =
-   "aucune page indiquée";
-$locale["not affected"] =
-   "non affectée";
-$locale["not authenticated"] =
-   "non authentifié";
-$locale["not yet"] =
-   "pas encore";
-$locale["older than the existing page."] =
-   "plus vieux que la page existante.";
-$locale["only %d pages displayed"] =
-   "Seulement %d pages affichées";
-$locale["page not locked"] =
-   "page déverrouillée";
-$locale["page permission inherited from %s"] =
-   "permissions héritées de %s";
-$locale["plain file %s"] =
-   "fichier simple %s";
-$locale["predecessor to the previous major change"] =
-   "prédécesseur de la modification majeure précédente";
-$locale["previous revision"] =
-   "révision précédente";
-$locale["purge this page"] =
-   "purger cette page";
-$locale["really"] =
-   "vraiment";
-$locale["recursive inclusion of page %s"] =
-   "insertion récursive de la page %s";
-$locale["recursive inclusion of page %s ignored"] =
-   "insertion récursive de la page %s ignoré";
-$locale["recursive inclusion of url %s"] =
-   "insertion récursive de l'URL %s";
-$locale["remove this page"] =
-   "supprimer cette page";
-$locale["rename this page"] =
-   "renommer cette page";
-$locale["renamed from %s"] =
-   "renommée à partir de %s";
-$locale["revert to a previous version of this page"] =
-   "revenir à une précédente version de cette page.";
-$locale["revert to version %d"] =
-   "revenir à la version %d";
-$locale["revision by previous author"] =
-   "révision par auteur précédent";
-$locale["same version page"] =
-   "même version de page";
-$locale["saved as "] =
-   "enregistrée sous ";
-$locale["saved as %s"] =
-   "enregistrée sous %s";
-$locale["sent to %s"] =
-   "envoyé à %s";
-$locale["sortby=mtime not supported with MostPopular"] =
-   "sortby=mtime non supporté avec MostPopular";
-$locale["stddev: %2.3f"] =
-   "écart-type : %2.3f";
-$locale["the file '%s'"] =
-   "le fichier %s";
-$locale["the session.save_path directory '%s'"] =
-   "le répertoire 'session.save_path' '%s'";
-$locale["to"] =
-   "à";
-$locale["today"] =
-   "aujourd'hui";
-$locale["too long"] =
-   "trop long";
-$locale["total hits: %d"] =
-   "%d visites totales";
-$locale["trailing cruft in plugin args: '%s'"] =
-   "cochonneries terminant les arguments du plugin : '%s'";
-$locale["unknown argument '%s' to SystemInfo"] =
-   "argument inconnu pour SystemInfo (%s)";
-$locale["unknown color %s ignored"] =
-   "%s color non valable ignoré";
-$locale["unlock this page"] =
-   "déverrouiller la page";
-$locale["upload a zip dump"] =
-   "déposer un fichier zip";
-$locale["uploaded %s"] =
-   "dépôt de %s";
-$locale["use this plugin"] =
-   "utiliser ce plugin";
-$locale["users"] =
-   "utilisateurs";
-$locale["verify the current action"] =
-   "vérifier l'action actuelle";
-$locale["version %d"] =
-   "version %d";
-$locale["version %s"] =
-   "version %s";
-$locale["version <em>%s</em>"] =
-   "version <em>%s</em>";
-$locale["version <em>%s</em> not affected"] =
-   "version <em>%s</em> non affectée";
-$locale["view the source of this page"] =
-   "voir la source de cette page";
-$locale["view this page"] =
-   "voir cette page";
+$locale[" (syntax error for latex) "] = " (erreur de syntaxe pour latex) ";
+$locale[" (to pages linked from \"%s\")"] = " (aux pages liées à \"%s\")";
+$locale[" - %d / %d - "] = " - %d / %d - ";
+$locale[" ... around %s"] = "... autour de %s";
+$locale[" ... first %d bytes"] = "... %d premiers octets";
+$locale[" ... first %d lines"] = "... %d premières lignes";
+$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "De plus, essayez de conserver les dernières contributions de tous les auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne conservez en aucun cas plus que %d versions par auteur.";
+$locale[" Keep the latest contributions of the last %d authors up to %d days."] = "Garder les dernières contributions des derniers %d auteurs jusqu'à %d jours.";
+$locale[" Keep up to %d minor edits, but keep them no longer than %d days."] = "Garder jusqu'à %d édition mineures, mais pas plus que %d jours.";
+$locale[" Skipped"] = "Ignoré.";
+$locale[" Sorry, cannot merge."] = " Désolé, impossible de fusionner.";
+$locale[" and "] = " et ";
+$locale[" for all pages linking to %s"] = " pour les pages liées à %s.";
+$locale[" for all pages matching '%s'"] = " pour les pages correspondant à %s.";
+$locale[" for pages changed by %s"] = " pour les pages modifiées par %s";
+$locale[" for pages owned by %s"] = " pour les pages possédées par %s";
+$locale[" is identical."] = " est identique.";
+$locale[" replace "] = " remplace ";
+$locale[" skipped"] = " ignoré";
+$locale[" to "] = " à ";
+$locale[" was created because: "] = " a été créée car : ";
+$locale["# things"] = "Nb d'éléments";
+$locale["%4d  %s\n"] = "%4d  %s\n";
+$locale["%d UserPreferences fields successfully updated."] = "%d préférences ont été mises à jour avec succès.";
+$locale["%d best incoming links: "] = "%d meilleurs liens entrants : ";
+$locale["%d best outgoing links: "] = "%d meilleurs liens sortants : ";
+$locale["%d homepages"] = "%d pages d'accueil";
+$locale["%d minutes"] = "%d minutes";
+$locale["%d most popular nearby: "] = "%d pages les plus visitées aux alentours : ";
+$locale["%d not-empty pages"] = "%d pages non vides";
+$locale["%d online users"] = "%d utilisateurs en ligne";
+$locale["%d page(s) with more than %d hits (>%d%%)."] = "%d pages ayant eu plus de %d visiteurs (>%d%%).";
+$locale["%d pages"] = "%d pages";
+$locale["%d pages have been changed."] = "%d pages ont été modifiées.";
+$locale["%d pages have been changed:"] = "%d pages ont été modifiées :";
+$locale["%d pages have been permanently purged:"] = "%d pages ont été définitivement purgées :";
+$locale["%d pages have been renamed:"] = "%d pages ont été renommées :";
+$locale["%d pages with less than %d hits (<%d%%)."] = "%d pages ayant eu moins de %d visiteurs (<%d%%).";
+$locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] = "%s %s %s est interdite sur ce wiki pour %s l'utilisateur « %s » (niveau : %s).";
+$locale["%s KiB (%s bytes)"] = "%s Kio (%s octets)";
+$locale["%s already exists"] = "%s existe déjà";
+$locale["%s at %s"] = "%s à %s";
+$locale["%s by %s"] = "%s par %s";
+$locale["%s bytes"] = "%s octets";
+$locale["%s bytes written"] = "%s octets enregistrés";
+$locale["%s days"] = "%s jours";
+$locale["%s does not appear to be a WikiPlugin."] = "%s ne semble pas être un greffon.";
+$locale["%s does not exist"] = "%s n'existe pas";
+$locale["%s does not know about the language '%s', using 'en' instead."] = "%s ne connait pas le langage '%s', utilisation de 'en' a la place.";
+$locale["%s has no subpages defined."] = "La page %s n'a aucune sous-page définie.";
+$locale["%s is disallowed on this wiki."] = "L'action %s est interdite sur ce wiki.";
+$locale["%s is empty"] = "%s est vide.";
+$locale["%s is empty."] = "%s est vide.";
+$locale["%s is missing"] = "%s est manquant";
+$locale["%s is not locked!"] = "%s n'est pas verrouillé!";
+$locale["%s is not writable."] = "%s n'est pas modifiable.";
+$locale["%s is only allowed in locked pages."] = "%s n'est autorisé que dans les pages verrouillées.";
+$locale["%s not defined"] = "%s non défini";
+$locale["%s not found"] = "%s non trouvé";
+$locale["%s not found in %s"] = "%s non trouvé dans %s";
+$locale["%s of this page"] = "%s de cette page";
+$locale["%s on %s:"] = "%s on %s :";
+$locale["%s or %s parameter missing"] = "%s ou %s paramètre manquant";
+$locale["%s pages link to %s:"] = "%s pages pointent vers %s :";
+$locale["%s pages would link to %s:"] = "%s pages pointaient vers %s :";
+$locale["%s parameter missing"] = "%s paramètre manquant";
+$locale["%s words"] = "%s mots";
+$locale["%s: %s"] = "%s : %s";
+$locale["%s: Bad action"] = "%s : Mauvaise action";
+$locale["%s: Can't open dba database"] = "%s : impossible d'ouvrir la base de données dba";
+$locale["%s: Date of new revision is %s"] = "%s : la date de la nouvelle version est %s";
+$locale["%s: argument index out of range"] = "%s : index d'argument hors intervalle";
+$locale["%s: error while handling error:"] = "%s : erreur pendant la gestion de l'erreur :";
+$locale["%s: file not found"] = "%s : fichier non trouvé";
+$locale["%s: no such class"] = "<%s : pas de section de ce type>";
+$locale["%s: no such revision %d."] = "%s(%d) : version inexistante";
+$locale["%s: not a subclass of WikiPlugin."] = "%s n'est pas une sous classe de WikiPlugin.";
+$locale["%s: not defined"] = "%s : non défini";
+$locale["' in page name."] = "' dans le nom de la page.";
+$locale["'%s': Bad page name"] = "'%s' : nom de page non valide";
+$locale["'%s': corrupt file"] = "'%s' : ce fichier est abîmé";
+$locale["(%d Links)"] = "(%d liens)";
+$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(Copiez vos modifications dans le presse-papier. Vous pouvez essayer de modifier une page différente ou enregistrer votre texte à l'aide d'un éditeur).";
+$locale["(Redirected from %s)"] = "(Redirigé de %s)";
+$locale["(Your preferences are stored as hidden data within this page)."] = "(Vos préférences sont enregistrées en mode invisible sur cette page.)";
+$locale["(diff)"] = "(diff)";
+$locale["(disable individual page permissions, enable inheritance)?"] = "(désactive les permissions individuelles par page, activer l'héritage) ?";
+$locale["(formatted for PhpWiki developers as pgsrc template, not for backing up)"] = "(format pour les développeurs, pas pour la sauvegarde)";
+$locale["(formatted for backing up: all revisions)"] = "(format de sauvegarde : toutes les versions)";
+$locale["(max. recursion level: %d)"] = "(niveau maximum de récursivité: %d)";
+$locale["(ugo : rwx)"] = "(ugo : rwx)";
+$locale[", Memory: %s"] = ", mémoire : %s";
+$locale["- saved to database as version %d"] = "- enregistrée dans la base de données sous la version %d";
+$locale["- version %d saved to database as version %d"] = "- version %d sauvée dans la base de données sous la version %d";
+$locale["-???"] = "-???";
+$locale["... (first %s words)"] = "... (%s premiers mots)";
+$locale["... copied to %s"] = "... copié à %s";
+$locale["... not copied to %s"] = "... non copié à %s";
+$locale["... not found"] = "... non trouvé";
+$locale["1 day"] = "1 jour";
+$locale["1 word"] = "1 mot";
+$locale[": "] = " : ";
+$locale["<%s: no such section>"] = "<%s : pas de section de ce type>";
+$locale["<empty>"] = "<vide>";
+$locale["<no matches>"] = "<aucun résultat>";
+$locale["<none>"] = "<aucun>";
+$locale["<not displayed>"] = "<non affiché>";
+$locale["<system language>"] = "<langue du système>";
+$locale["<system theme>"] = "<thème du système>";
+$locale["<unknown>"] = "<inconnu>";
+$locale["A plugin to provide for raw HTML within wiki pages."] = "Un Plugin pour intégrer du code HTML dans les WikiPages.";
+$locale["ACCESS DENIED: You must log in to upload files."] = "ACCES REFUSE: Vous devez être connecté pour uploader.";
+$locale["ACL"] = "ACL";
+$locale["ACL changed for page '%s'"] = "ACL modifié pour la page %s.";
+$locale["ACL not changed for page '%s'."] = "ACL inchangé pour la page %s.";
+$locale["ACL type:"] = "Type d'ACL :";
+$locale["ACL:"] = "ACL :";
+$locale["ADDING"] = "AJOUT";
+$locale["ADMIN"] = "ADMIN";
+$locale["ANON"] = "ANONYME";
+$locale["About"] = "À propos de";
+$locale["Access"] = "Accès";
+$locale["Access Rights"] = "Droits d'accès";
+$locale["Access denied to change page '%s'."] = "Accès refusé pour changer la page '%s'.";
+$locale["Access denied to rename page '%s'."] = "Accès refusé pour renommer la page '%s'.";
+$locale["Access for you is forbidden to %s."] = "L'accès à %s vous est interdit.";
+$locale["Action Page"] = "Page d'action";
+$locale["Action page"] = "Page d'action";
+$locale["Add %s hours to the server's local time when reporting times."] = "Ajouter %s heures à l'heure locale du serveur pour afficher les horodatages.";
+$locale["Add %s:"] = "Ajouter %s :";
+$locale["Add Comment"] = "Ajouter un commentaire";
+$locale["Add Entry"] = "Ajouter une entrée";
+$locale["Add Google links to unknown pages behind the '?', and the create action behind the pagename instead. See %s."] = "Ajouter un liens vers Google pour les pages inconnues derrière le '?', et l'action de création. Voir %s.";
+$locale["Add Image or Video"] = "Ajouter une image ou une vidéo";
+$locale["Add Message"] = "Ajouter un message";
+$locale["Add or change a page-level metadata 'key=>value' pair. Note that you can remove a key by leaving the value-box empty."] = "Ajouter ou changer le niveau de page 'key=>value'. Notez que vous pouvez supprimer une clé en lui attribuant une valeur nulle.";
+$locale["Add this ACL"] = "Ajouter cette ACL";
+$locale["AddCategory"] = "Ajouter une catégorie";
+$locale["AddComment"] = "AjouterDesCommentaires";
+$locale["AddPageLink"] = "Insérer un lien";
+$locale["AddPlugin"] = "Insérer un greffon";
+$locale["AddTemplate"] = "Ajouter un modèle";
+$locale["Adjust"] = "Ajuster";
+$locale["Admin"] = "Administration";
+$locale["Admin is also online."] = "L'administrateur est aussi en ligne.";
+$locale["Administration"] = "Administration";
+$locale["Administrators"] = "Administrateurs";
+$locale["Advanced..."] = "Avancée...";
+$locale["All"] = "Tout";
+$locale["All %s are listed below."] = "Toutes les %s sont énumérées ci-dessous.";
+$locale["All modifications"] = "Toutes les modifications";
+$locale["All pages"] = "Toutes les pages";
+$locale["All pages in this wiki (%d total):"] = "Toutes les pages de ce wiki (%d au total) :";
+$locale["All pages with all links in this wiki (%d total):"] = "Tout pages avec tous les liens dans ce wiki (%d au total) :";
+$locale["All time"] = "Depuis le début";
+$locale["All users"] = "Tous les utilisateurs";
+$locale["AllPages"] = "ToutesLesPages";
+$locale["AllPagesOwnedByMe"] = "ToutesMesPages";
+$locale["AllUsers"] = "TousLesUtilisateurs";
+$locale["Allow / Deny"] = "Autoriser / Refuser";
+$locale["Allowed protocols"] = "Protocoles autorisés";
+$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] = "Permet de choisir plusieurs pages qui seront passées vers d'autre plugins WikiAdmin.";
+$locale["Already logged in"] = "Déjà connecté";
+$locale["Also pages which have been deleted at least %s days."] = "Même les pages qui ont été supprimées il y a au plus %s days.";
+$locale["An unnamed PhpWiki"] = "Un PhpWiki sans titre";
+$locale["Anonymous Users"] = "Utilisateurs anonymes";
+$locale["Appearance"] = "Apparence";
+$locale["Append text to any page in this wiki."] = "Apposez le texte à n'importe quelle page de ce wiki.";
+$locale["AppendText"] = "ApposezLeTexte";
+$locale["Application name"] = "Nom de l'application";
+$locale["Application size: %d KiB"] = "Taille de l'application : %d Kio";
+$locale["Apply changes"] = "Appliquer les changements.";
+$locale["Approve"] = "Approuver";
+$locale["Archives"] = "Archives";
+$locale["Are you sure you want to change the owner of the selected pages?"] = "Êtes-vous sûr de vouloir changer le propriétaire des pages sélectionnées ?";
+$locale["Are you sure you want to permanently change access rights to the selected files?"] = "Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers sélectionnés ?";
+$locale["Are you sure you want to permanently change the selected files?"] = "Êtes-vous sûr de vouloir modifier de manière permanente les fichiers sélectionnés ?";
+$locale["Are you sure you want to permanently purge the following files?"] = "Êtes-vous sûr de vouloir purger définitivement les pages suivantes ?";
+$locale["Are you sure you want to remove the selected files?"] = "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?";
+$locale["Are you sure you want to rename the selected pages?"] = "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?";
+$locale["Are you sure you want to replace text in the selected files?"] = "Etes-vous sur de vouloir rechercher et remplacer dans les fichiers sélectionnées ?";
+$locale["Argument '%s' not declared by plugin."] = "argument '%s' non déclaré par le plugin.";
+$locale["Arguments"] = "Arguments";
+$locale["Attempting to use the directory '%s' instead."] = "Tentative d'utilisation du répertoire '%s' à la place.";
+$locale["Attribute"] = "Attribut";
+$locale["Attribute %s, value: %s"] = "Attribut %s, valeur : %s";
+$locale["Attributes"] = "Attributs";
+$locale["Attributes of %s"] = "Attributs de %s";
+$locale["Auth Level"] = "Niveau d'autorisation";
+$locale["Auth Method"] = "Méthode d'authentification";
+$locale["Authenticated Users"] = "Utilisateurs authentifiés";
+$locale["Authenticated as %s"] = "Vous êtes connecté en tant que %s";
+$locale["Authenticated users on this wiki (%d total):"] = "Utilisateurs connectés à ce wiki (%d au total) :";
+$locale["Author"] = "Auteur";
+$locale["Author history"] = "Historique des auteurs";
+$locale["Author will be logged as %s."] = "L'auteur sera enregistré sous le nom %s.";
+$locale["AuthorHistory"] = "HistoriqueAuteur";
+$locale["Available plugins"] = "Greffons disponibles";
+$locale["Avg. Rating"] = "Note moyenne";
+$locale["BAD URL -- remove all of <, >, \""] = "MAUVAIS URL -- retirez tous les <, >, \"";
+$locale["BOGO"] = "BOGO";
+$locale["Back"] = "Retour";
+$locale["Back Links"] = "Pages liées";
+$locale["BackLinks"] = "RétroLiens";
+$locale["BackLinks for %s"] = "Page liées à %s";
+$locale["Bad Version"] = "Mauvaise version";
+$locale["Bad file type: %s"] = "Mauvais type de fichier : %s";
+$locale["Bad url in src: remove all of <, >, \""] = "Mauvaise url dans la source : retirez tous les <, >, \"";
+$locale["Blog"] = "Blog";
+$locale["Blog page"] = "Page de blog";
+$locale["Bogo Users"] = "Utilisateurs Bogo";
+$locale["Bold text"] = "Gras";
+$locale["Bold text [alt-b]"] = "Gras [alt-b]";
+$locale["Browsing pages"] = "Navigation en cours";
+$locale["Buddies:"] = "Connaissances :";
+$locale["CANCEL"] = "ANNULE";
+$locale["CREATED"] = "CRÉÉ";
+$locale["Cache statistics"] = "Statistiques de cache";
+$locale["Calendar"] = "Calendrier";
+$locale["CalendarList"] = "ListeDuCalendrier";
+$locale["Can't inflate data: zlib support not enabled in this PHP"] = "Impossible de décompresser les données : le support de zlib n'a pas été validé dans ce PHP";
+$locale["Can't mix '%s' with '%s' type format strings"] = "Impossible de mélanger les chaînes de type '%s' et '%s'";
+$locale["Can't open the upload logfile."] = "Impossible d'ouvrir le journal des fichiers déposés.";
+$locale["Can't open zip file '%s' for reading"] = "Impossible d'ouvrir le fichier zip '%s' en lecture";
+$locale["Cancel"] = "Annuler";
+$locale["Cancel your rating"] = "Annuler la notation";
+$locale["Cancelled"] = "Annulé";
+$locale["Cannot create directory '%s'"] = "Impossible de créer le répertoire : « %s »";
+$locale["Cannot open AUTH_GROUP_FILE %s"] = "Impossible d'ouvrir AUTH_GROUP_FILE %s";
+$locale["Case exact?"] = "respect de la casse";
+$locale["Case insensitive?"] = "Insensible à la casse ?";
+$locale["Category"] = "Catégorie";
+$locale["CategoryCategory"] = "CatégorieCatégorie";
+$locale["CategoryGroup"] = "CatégorieGroupes";
+$locale["CategoryHomePages"] = "CatégoriePagesAccueil";
+$locale["CategoryHomepage"] = "CatégoriePagesAccueil";
+$locale["CategoryPage"] = "CatégoriePages";
+$locale["Change Access Rights"] = "Droits d'acces";
+$locale["Change Owner"] = "Changer le propriétaire";
+$locale["Change Password"] = "Modifier mon mot de passe";
+$locale["Change Verification Status"] = "Changer la vérification du statut";
+$locale["Change country"] = "Changer le pays";
+$locale["Change markup type"] = "Changer le type de syntaxe";
+$locale["Change owner of page '%s' to '%s'."] = "Changement de propriétaire %s à %s.";
+$locale["Change owner of selected pages"] = "Changer le propriétaire des pages sélectionnées";
+$locale["Change owner of selected pages."] = "Changer le propriétaire des pages sélectionnées.";
+$locale["Change owner to: "] = "Changer le propriétaire par : ";
+$locale["Change page attributes"] = "Modifier les attributs de la page";
+$locale["Change pagename in all linked pages also?"] = "Changer les noms de pages dans toutes les pages liées ?";
+$locale["Change the markup type of selected pages."] = "Changer la syntaxe des pages sélectionnées.";
+$locale["Changes"] = "Modifications";
+$locale["Chart"] = "Diagramme";
+$locale["Check any two boxes then %s."] = "Cochez une boîte puis %s.";
+$locale["Check any two boxes to compare revisions."] = "Cochez deux boîtes quelconques pour comparer les versions.";
+$locale["Check for %s"] = "Cases à cocher";
+$locale["Check for extra page.cached_html column"] = "recherche une extra colonne page.cached_html";
+$locale["Check for new session.sess_ip column"] = "recherche une nouvelle colonne session.sess_ip";
+$locale["Check for table %s"] = "vérifie la table %s";
+$locale["Check if you do not want to be notified of minor modifications."] = "Cochez la case si vous ne voulez pas recevoir les modifications mineures";
+$locale["Check if you do not want to be notified of your own modifications."] = "Cochez la case si vous ne voulez pas recevoir vos propres modifications.";
+$locale["Check menu items to display."] = "Cliquez les éléments de menu à afficher";
+$locale["Check to add this ACL"] = "Cocher pour ajouter cette ACL";
+$locale["Check you are a member of the current project."] = "Vous êtes déjà membre de ce projet.";
+$locale["Check you are in the right project."] = "Vérifiez que vous êtes dans le bon projet.";
+$locale["Check you are logged in."] = "Vous devez vous identifier";
+$locale["Chmod"] = "Chmod";
+$locale["Chmod to permission:"] = "Changer le mode de permission à :";
+$locale["Chown"] = "Chown";
+$locale["Click a button to get an example text"] = "Cliquer sur un bouton pour obtenir une exemple de texte";
+$locale["Click to authenticate as %s"] = "Cliquez pour vous identifier en tant que %s";
+$locale["Click to de-/select all pages"] = "Cliquez pour (de)sélectionner toutes les pages";
+$locale["Click to display"] = "Cliquez pour afficher";
+$locale["Click to display all comments"] = "Cliquez pour afficher tous les commentaires";
+$locale["Click to display to TOC"] = "Cliquez pour afficher la table des matières";
+$locale["Click to hide the comments"] = "Cliquez pour masquer les commentaires";
+$locale["Click to hide/show"] = "Cliquez pour masquer/afficher";
+$locale["Click to reverse sort order"] = "Cliquez pour inverser le tri";
+$locale["Click to sort by %s"] = "Cliquez pour trier par %s";
+$locale["Close"] = "Fermer";
+$locale["Color"] = "Couleur";
+$locale["Color text"] = "Texte en couleur";
+$locale["Columns: %s."] = "Colonnes : %s.";
+$locale["Comment"] = "Commentaire";
+$locale["Comment modified on %s by %s"] = "Commentaire modifié le %s par %s";
+$locale["Comments"] = "Commentaires";
+$locale["Comments on %s by %s."] = "Commentaire le %s par %s.";
+$locale["Complete."] = "Terminé.";
+$locale["Conflicting Edits!"] = "Modifications conflictuelles !";
+$locale["Content"] = "Contenu";
+$locale["Content of versions "] = "Contenu des versions ";
+$locale["Contents"] = "Contenu";
+$locale["ContributedTranslations"] = "TraductionsContribuées";
+$locale["Convert"] = "Convertir";
+$locale["Convert Tex mathematicals expressions to cached png files. This is for small text"] = "Convertit des expressions mathématiques au format TeX en des fichiers png mis en cache.";
+$locale["Convert text into a png image using GD."] = "Converti le texte en une image png utilisant GD.";
+$locale["Converted successfully %d pages"] = "%d pages converties avec succès";
+$locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "Pour convertir des formules TeX en image.";
+$locale["Copyrights"] = "Copyrights";
+$locale["Could not change owner of page '%s' to '%s'."] = "Impossible de changer le propriétaire '%s' à '%s'.";
+$locale["Couldn't chmod page '%s' to '%s'."] = "Impossible de changer le mode '%s' à '%s'.";
+$locale["Couldn't connect to %s"] = "Impossible d'établir une connexion à la base de données : %s";
+$locale["Couldn't rename page '%s' to '%s'."] = "Impossible de renommer la page '%s' en '%s'.";
+$locale["Couldn't start commandline '%s'"] = "Impossible de lancer la ligne de commande '%s'";
+$locale["Count"] = "Nombre";
+$locale["Create Page"] = "Créer une page";
+$locale["Create a Wiki page by the provided name."] = "Créer une PageWiki avec le nom demandé.";
+$locale["Create a Wiki page."] = "Créer une page wiki";
+$locale["Create a new (sub)page"] = "Créer une nouvelle (sous-)page";
+$locale["Create redirect from old to new name?"] = "Créer une redirection de l'ancien nom vers le nouveau ?";
+$locale["Create: %s"] = "Créer : %s";
+$locale["CreatePage"] = "CréerUnePage";
+$locale["CreateToc"] = "CréerUneTdm";
+$locale["Created by CreatePage"] = "Créée par CréerUnePage";
+$locale["Created directory '%s' for the page dump..."] = "Répertoire « %s » créé pour la sauvegarde...";
+$locale["Creating pages"] = "Créer des pages";
+$locale["Creator"] = "Créateur";
+$locale["Current Language"] = "Ma langue";
+$locale["Current Theme"] = "Mon thème";
+$locale["Current language: '%s'"] = "Langage actuel : %s";
+$locale["Current theme: '%s'"] = "Thème actuel : '%s'";
+$locale["CurrentTime"] = "Heure actuelle";
+$locale["DB admin password:"] = "DB admin mot de passe :";
+$locale["DB admin user:"] = "DB admin nom de user :";
+$locale["Database"] = "Base de données";
+$locale["Date Format"] = "Format de la date";
+$locale["DebugGroupInfo"] = "InfosDeDéboguageGroupe";
+$locale["DebugInfo"] = "InfosDeDéboguage";
+$locale["Default InterWiki map file not loaded."] = "Carte InterWiki par défaut non chargée.";
+$locale["Default language: '%s'"] = "Langage par défaut : %s";
+$locale["Default preferences will be used."] = "Les préférences par défaut seront utilisées.";
+$locale["Default theme: '%s'"] = "Thème par défaut : '%s'";
+$locale["Define a translation for a specified text"] = "Traduire du texte";
+$locale["Define the translation for %s in %s"] = "Définir la traduction pour %s en %s";
+$locale["Del/+"] = "Suppr/+";
+$locale["Delete this ACL"] = "Supprimer cette ACL";
+$locale["Deleted"] = "Supprimé";
+$locale["Deleted %d pages with invalid names:"] = "%d pages ont été supprimées à cause de leur nom invalide:";
+$locale["Describe %s here."] = "Décrire %s ici.";
+$locale["Description"] = "Description";
+$locale["Dialog"] = "Dialogue";
+$locale["Didn't purge page '%s'. Access denied."] = "Page '%s' non purgée. Accès refusé.";
+$locale["Didn't remove page '%s'. Access denied."] = "Page '%s' non supprimée. Accès refusé.";
+$locale["Diff previous Author"] = "Différences avec l'auteur précédent";
+$locale["Diff previous Revision"] = "Différences avec la version précédente";
+$locale["Diff: %s"] = "Diff : %s";
+$locale["Differences between %s and %s of %s."] = "Différences entre %s et %s de %s.";
+$locale["Diffing pages"] = "Comparaison des pages";
+$locale["Discussion"] = "Discussion";
+$locale["Display arbitrary SQL result tables"] = "Affiche le résultat de requêtes SQL simples";
+$locale["Display as Pdf"] = "Afficher en PDF";
+$locale["Display differences between revisions"] = "Affiche les différences entre versions";
+$locale["Display general and user specific auth information."] = "Afficher les informations générales de l'utilisateur.";
+$locale["Display video in Flash"] = "Afficher une vidéo en Flash";
+$locale["Displays a list of randomly chosen pages or redirects to a random page."] = "Affiche une liste de pages prises au hasard sur ce wiki.";
+$locale["Displays a set of photos listed in a text file with optional descriptions"] = "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives.";
+$locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé.";
+$locale["Do not send minor modifications:"] = "Ne pas envoyer les modifications mineures :";
+$locale["Do not send my own modifications:"] = "Ne pas envoyer mes propres modifications :";
+$locale["Do you %s want to add this page \"%s\" to your WatchList?"] = "Voulez-vous %s ajouter la page « %s » à votre liste de suivi ?";
+$locale["Do you really want to create the page '%s'?"] = "Voulez-vous réellement crééer la page '%s' ?";
+$locale["Do you really want to reset all your UserPreferences?"] = "Voulez-vous réellement réinitialiser toutes vos préférences ?";
+$locale["Do you really want to reset the password of user %s?"] = "Voulez-vous réellement réinitialiser les mot de passe de %s ?";
+$locale["Don't cache this page."] = "Ne pas mettre en cache cette page.";
+$locale["Double redirect not allowed."] = "La double redirection interdit.";
+$locale["Download all revisions for backup"] = "Télécharger toutes les versions pour sauvegarder";
+$locale["Download for Subversion"] = "Télécharger pour Subversion";
+$locale["Download for backup"] = "Télécharger pour sauvegarder";
+$locale["Download page contents"] = "Télécharger le contenu de la page";
+$locale["Downloading html zip dumps"] = "Téléchargement des sauvegardes HTML compressées";
+$locale["Downloading zip dumps"] = "Téléchargement des sauvegardes compressées";
+$locale["Dump Pages"] = "Récupérer les pages";
+$locale["Dump Pages as XHTML"] = "Sauvegarde des pages au format XHTML";
+$locale["Dump pages as XHTML"] = "Exporter les pages en XHTML";
+$locale["Dump to directory"] = "Récupération dans le répertoire";
+$locale["Dumping Pages"] = "Récupération des pages";
+$locale["Dumping html pages"] = "Récupération des pages HTML";
+$locale["Dumping serial pages"] = "Récupération des pages sérialisées";
+$locale["Dynamically include the content from another wiki page."] = "Inclure dynamiquement le texte d'une autre PageWiki.";
+$locale["E-Mail"] = "Adresse électronique";
+$locale["E-Mail address confirmation"] = "Vérification de l'adresse électronique";
+$locale["E-mail"] = "Adresse électronique";
+$locale["E-mail Notification"] = "Courriel de notification";
+$locale["E-mail address '%s' is not properly formatted"] = "L'adresse électronique '%s' ne semble pas être bien formée.";
+$locale["E-mail address '%s' is properly formatted"] = "L'adresse électronique '%s' semble être bien formée.";
+$locale["ERROR uploading '%s'"] = "ERREUR en déposant '%s' : ";
+$locale["ERROR: No email defined! You need to do this in your "] = "ERREUR : pas d'adresse électronique definie! Vous devez le faire dans vos ";
+$locale["Easy navigation buttons for %s"] = "Boutons de navigation rapide pour %s";
+$locale["Edit"] = "Modifier";
+$locale["Edit %s"] = "Éditer %s";
+$locale["Edit Area Size"] = "Modifier la taille de la zone";
+$locale["Edit Old Revision"] = "Modifier une ancienne version";
+$locale["Edit aborted."] = "Modification annulée.";
+$locale["Edit metadata for %s"] = "Éditer les métadonnées pour %s";
+$locale["Edit old revision"] = "Modifier l'ancienne version";
+$locale["Edit this page"] = "Modifier cette page";
+$locale["Edit this page and all subpages"] = "Modifier cette page et toutes ses sous-pages";
+$locale["Edit: %s"] = "Modifier : %s";
+$locale["EditMetaData"] = "EditerLesMetaDonnées";
+$locale["EditText"] = "ÉditerLeContenu";
+$locale["Edited by: %s"] = "Modifié par : %s";
+$locale["Editing pages"] = "Modifier des pages";
+$locale["Either %s is missing or DATABASE_TYPE != '%s'"] = "%s est manquant ou DATABASE_TYPE != '%s'";
+$locale["Elapsed time: %s s"] = "Temps écoulé : %s s";
+$locale["Email Verification"] = "Vérification de l'adresse électronique";
+$locale["Email not yet verified."] = "Adresse électronique pas encore vérifiée";
+$locale["Email verified."] = "Adresse électronique vérifiée";
+$locale["Embed hidden comments in WikiPages."] = "Cacher des commentaires dans une PageWiki.";
+$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu.";
+$locale["Empty link to: %s"] = "Lien vide vers : %s";
+$locale["Empty pagename!"] = "Nom de page vide !";
+$locale["Enable DoubleClick Edit"] = "Autoriser la modification par double clic";
+$locale["Enable configurable polls"] = "Permettre de faire des sondages configurables";
+$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "Entrer les pages séparées par des virgules. Les étoiles (jokers) sont autorisées.";
+$locale["Enter your UserId to sign in"] = "Entrez votre identifiant utilisateur pour vous connecter";
+$locale["Entry on %s by %s."] = "Commentaire le %s par %s.";
+$locale["Enumeration"] = "Énumération";
+$locale["Error"] = "Erreur";
+$locale["Error:"] = "Erreur :";
+$locale["Error: Couldn't send %s to %s"] = "Erreur : impossible d'envoyer %s à %s";
+$locale["Error: Empty search string."] = "Erreur : la chaîne à rechercher est vide.";
+$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "La page d'accueil d'un utilisateur doit être un NomWiki valide. Les préférences ne peuvent pas être enregistrées.";
+$locale["Every"] = "Toutes";
+$locale["Expiry parameters"] = "Expiration des paramètres";
+$locale["Export to a seperate public area?"] = "Exporter dans une zone publique distincte ?";
+$locale["External"] = "Externe";
+$locale["External Links"] = "Liens externes";
+$locale["External link (remember http:// prefix)"] = "Lien externe (le préfixe http:// est obligatoire)";
+$locale["ExternalSearch"] = "RechercheExterne";
+$locale["FAIL"] = "ÉCHOUÉ";
+$locale["FAILED"] = "ÉCHOUÉ";
+$locale["FIXED"] = "CORRIGÉ";
+$locale["FORBIDDEN"] = "INTERDIT";
+$locale["Failed to connect to LDAP host"] = "Impossible de se connecter au serveur LDAP ";
+$locale["Fatal PhpWiki Error"] = "Erreur fatale de PhpWiki";
+$locale["Favorite Categories"] = "Catégories populaires";
+$locale["File '%s' not found."] = "Fichier « %s » non trouvé.";
+$locale["File successfully uploaded."] = "Fichier téléchargé avec succès";
+$locale["Files with extension %s are not allowed."] = "%s: extension interdite.";
+$locale["Find page"] = "Rechercher";
+$locale["FindPage"] = "ChercherUnePage";
+$locale["First"] = "Premier";
+$locale["Found by "] = "Trouvé par ";
+$locale["FrameInclude"] = "InclureUnCadre";
+$locale["From english to %s: "] = "De l'Anglais au %s: ";
+$locale["Full changes"] = "Changements exhaustifs";
+$locale["Full text search results for '%s'"] = "Résultats de la recherche en texte intégral de ' %s '";
+$locale["FullDump"] = "SauvegardeTotale";
+$locale["FullRecentChanges"] = "DernièresModifs";
+$locale["FullTextSearch"] = "RechercheEnTexteIntégral";
+$locale["FuzzyPages"] = "PagesFloues";
+$locale["General Auth Settings"] = "Préférences générales d'auteur";
+$locale["Get an email notification at changes of the following pages:"] = "Recevoir une notification par courriel pour les modifications des pages suivantes :";
+$locale["Get debugging information for %s."] = "Obtenir des infos de déboguage pour %s.";
+$locale["Get preferences information for current user %s."] = "Obtenir des infos de préférences pour l'utilisateur %s.";
+$locale["Given password ignored."] = "Mot de passe ignoré.";
+$locale["Global user preferences (for all projects)"] = "Préférences globales (pour tous les projets)";
+$locale["Go"] = "OK";
+$locale["Go to %s."] = "Aller à %s";
+$locale["Go to or create page."] = "Aller à la page ou la créer.";
+$locale["Go?"] = "Continuer?";
+$locale["GoTo"] = "AllerVers";
+$locale["Google:%s"] = "Google: %s";
+$locale["GooglePlugin"] = "PluginGoogle";
+$locale["Grant"] = "Accorder";
+$locale["Group %s does not exist"] = "Le groupe %s n'existe pas";
+$locale["Group page '%s' does not exist"] = "Le groupe de page %s n'existe pas";
+$locale["Group/User"] = "Groupe/utilisateur";
+$locale["Guest"] = "Invité";
+$locale["Guests"] = "Invités";
+$locale["H"] = "H";
+$locale["Handles threaded topics with comments/news and provide a input form"] = "Contrôler les sujets traités avec les commentaires/nouvelles et fournir une entrée de formulaire";
+$locale["Headline text"] = "Titre";
+$locale["Height"] = "Hauteur";
+$locale["HelloWorld"] = "BonjourLeMonde";
+$locale["Help"] = "Aide";
+$locale["Help/AddCommentPlugin"] = "Aide/AjoutDesCommentaires";
+$locale["Help/AddingPages"] = "Aide/AjouterDesPages";
+$locale["Help/AuthorHistoryPlugin"] = "Aide/PluginHistoriqueAuteur";
+$locale["Help/CalendarListPlugin"] = "Aide/PluginListeDuCalendrier";
+$locale["Help/CalendarPlugin"] = "Aide/PluginCalendrier";
+$locale["Help/CommentPlugin"] = "Aide/PluginCommenter";
+$locale["Help/CreateTocPlugin"] = "Aide/PluginCréerUneTdm";
+$locale["Help/EditMetaDataPlugin"] = "Aide/PluginÉditerMetaData";
+$locale["Help/ExternalSearchPlugin"] = "Aide/PluginRechercheExterne";
+$locale["Help/FoafViewerPlugin"] = "Aide/PluginFoafViewer";
+$locale["Help/FrameIncludePlugin"] = "Aide/PluginInclureUnCadre";
+$locale["Help/GoodStyle"] = "Aide/StyleCorrect";
+$locale["Help/HelloWorldPlugin"] = "Aide/PluginBonjourLeMonde";
+$locale["Help/IncludePagePlugin"] = "Aide/PluginInclureUnePage";
+$locale["Help/LinkIcons"] = "Aide/IcônesLiens";
+$locale["Help/MagicPhpWikiURLs"] = "Aide/URLMagiquesPhpWiki";
+$locale["Help/MoreAboutMechanics"] = "Aide/DétailsTechniques";
+$locale["Help/OldStyleTablePlugin"] = "Aide/PluginTableauAncienStyle";
+$locale["Help/OldTextFormattingRules"] = "Aide/RèglesDeFormatageDesTextes";
+$locale["Help/PhotoAlbumPlugin"] = "Aide/PluginAlbumPhotos";
+$locale["Help/PhpHighlightPlugin"] = "Aide/PluginColorationPhp";
+$locale["Help/PhpWeatherPlugin"] = "Aide/PluginMétéoPhp";
+$locale["Help/PhpWiki"] = "Aide/PhpWiki";
+$locale["Help/PloticusPlugin"] = "Aide/PluginPloticus";
+$locale["Help/RawHtmlPlugin"] = "Aide/PluginHtmlPur";
+$locale["Help/RedirectToPlugin"] = "Aide/PluginRedirection";
+$locale["Help/RichTablePlugin"] = "Aide/PluginBeauTableau";
+$locale["Help/SystemInfoPlugin"] = "Aide/PluginInfosSystème";
+$locale["Help/TextFormattingRules"] = "Aide/RèglesDeFormatageDesTextes";
+$locale["Help/TranscludePlugin"] = "Aide/PluginInsérer";
+$locale["Help/UnfoldSubpagesPlugin"] = "Aide/PluginListeSousPages";
+$locale["Help/UpLoadPlugin"] = "Aide/PluginDéposer";
+$locale["Help/WabiSabi"] = "Aide/WabiSabi";
+$locale["Help/WikiBlogPlugin"] = "PluginWikiBlog";
+$locale["Help/WikiPlugin"] = "Aide/PluginWiki";
+$locale["Help/WikiWikiWeb"] = "Aide/WikiWikiWeb";
+$locale["Here you can override site-specific default values."] = "Ici vous pouvez écraser les valeurs par défaut du site spécifié.";
+$locale["Hide %s:"] = "Cacher %s :";
+$locale["Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections."] = "Cacher ou montrer les icônes de liens (si supportées par le thème actuel). Très utile pour les navigateurs ne supportant pas les images ou pour les connexion bas débit.";
+$locale["Hide or show LinkIcons."] = "Cacher ou montrer les icônes de liens.";
+$locale["History"] = "Historique";
+$locale["History of all major and minor edits by %s to page %s."] = "Historique de toutes les éditions majeures et mineures par %s sur la page %s.";
+$locale["History of all major and minor modifications for any page edited by %s."] = "Historique des éditions majeures ou mineures pour n'importe quelle page éditée par %s.";
+$locale["History of changes."] = "Historique des modifications.";
+$locale["Hit statistics"] = "Statistiques de visites";
+$locale["Hits"] = "Visites";
+$locale["Hits:"] = "Visites :";
+$locale["Home"] = "Accueil";
+$locale["Home Page"] = "Accueil";
+$locale["Home page"] = "Accueil";
+$locale["HomePage"] = "PageAccueil";
+$locale["HomePageAlias"] = "AliasAccueil";
+$locale["Horizontal line"] = "Ligne horizontale";
+$locale["HowToUseWiki"] = "CommentUtiliserWiki";
+$locale["I'm just doing minor edits. Please divert the usual logging to %s instead."] = "Je ne fais que des modifications mineures. Veuillez rediriger les logs habituels vers %s.";
+$locale["I'm sorry, there is no such page as %s."] = "Désolé, %s ne correspond à aucune page.";
+$locale["I'm sorry.  Version %d of %s is not in the database."] = "Je suis désolé. La version %d de %s n'est pas dans la base de données.";
+$locale["Ignore wiki formatting"] = "Ignorer la syntaxe wiki";
+$locale["Illegal access to page %s: no read access"] = "Accès en lecture interdit pour la page « %s ».";
+$locale["Illegal character '"] = "Caractère interdit '";
+$locale["Illegal characters in external URL."] = "Caractère interdit dans une URL externe.";
+$locale["Illegal chars %s removed"] = "Caractères interdits %s supprimés";
+$locale["Illegal inclusion of page %s: no read access."] = "insertion récursive de la page %s ignoré";
+$locale["Illegal operator: %s"] = "Caractère interdit dans le nom.";
+$locale["Image loaded from cache file: %s"] = "Image chargée depuis le fichier cache : %s";
+$locale["Image saved to cache file: %s"] = "Image sauvée dans le fichier cache : %s";
+$locale["In the time since you started editing this page, another user has saved a new version of it."] = "Depuis que vous avez commencé à modifier cette page, un autre utilisateur en a enregistré une nouvelle version.";
+$locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] = "Au total: %d utilisateurs en ligne. :: %d enregistré(s) et %d invité(s)";
+$locale["Include an external web page within the body of a wiki page."] = "Inclure une page externe dans le corps de la WikiPage.";
+$locale["Include recursively all linked pages starting at %s"] = "Créer une carte du site commençant à %s";
+$locale["Include text from another wiki page."] = "Inclure le texte d'une autre PageWiki.";
+$locale["IncludePage"] = "InclureUnePage";
+$locale["IncludePages"] = "InclurePages";
+$locale["IncludeSiteMap"] = "CarteDuSite";
+$locale["Included from %s"] = "Inséré de %s";
+$locale["Included from %s (revision %d)"] = "Inséré de %s (version %d)";
+$locale["Included from %s:"] = "Inséré de %s :";
+$locale["Includes the content of all SubPages of the current page."] = "Pour inclure le contenu de toutes les sous pages de la page actuelle.";
+$locale["Index"] = "Index";
+$locale["Inline images"] = "Images intégrées";
+$locale["Insert"] = "Insérer";
+$locale["Insert Categories"] = "Ajouter une catégorie";
+$locale["Insert Image or Video"] = "Ajouter une image ou une vidéo";
+$locale["Insert PageLink"] = "Insérer un lien";
+$locale["Insert Plugin"] = "Insérer un greffon";
+$locale["Insert Template"] = "Ajouter un modèle";
+$locale["Insert non-formatted text here"] = "Insérer le texte préformaté ici";
+$locale["Insufficient permissions."] = "Permissions insuffisantes.";
+$locale["InterWiki"] = "InterWiki";
+$locale["InterWiki Address"] = "Adresse InterWiki";
+$locale["InterWikiMap"] = "CarteInterWiki";
+$locale["InterWikiSearch"] = "RechercheInterWiki";
+$locale["Invalid ACL"] = "ACL invalide";
+$locale["Invalid [] syntax ignored"] = "Syntaxe [] invalide ignorée";
+$locale["Invalid argument %s"] = "Argument non valable : %s";
+$locale["Invalid argument: %s=%s"] = "Argument non valable : %s=%s";
+$locale["Invalid chmod string"] = "Chaîne de caractère invalide pour le changement de mode";
+$locale["Invalid color: %s"] = "Couleur non valide : %s";
+$locale["Invalid image attribute \"%s\" %s=%s"] = "Argument non valable : %s=%s";
+$locale["Invalid image size"] = "Taille d'image invalide";
+$locale["Invalid pagename!"] = "Nom de page invalide !";
+$locale["Invalid password or userid."] = "Mot de passe ou utilisateur non valide :";
+$locale["Invalid password."] = "Mot de passe invalide.";
+$locale["Invalid username '%s' for LDAP Auth"] = "Utilisateur non valide '%s' dans l'annuaire LDAP";
+$locale["Invalid username."] = "Identifiant d'utilisateur invalide.";
+$locale["Is External:"] = "Externe ?";
+$locale["Italic text"] = "Italique";
+$locale["Italic text [alt-i]"] = "Italique [alt-i]";
+$locale["Keep old"] = "Garder l'ancien";
+$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["Language"] = "Langue";
+$locale["Last"] = "Dernier";
+$locale["Last Author"] = "Dernier auteur";
+$locale["Last Difference"] = "Dernière différence";
+$locale["Last Modified"] = "Dernière modification";
+$locale["Last Summary"] = "Dernier résumé";
+$locale["Last edited %s"] = "Dernière modification le %s";
+$locale["Last edited on %s"] = "Dernière modification le %s";
+$locale["LatestSnapshot"] = "DernierInstantané";
+$locale["Layout tables using a very rich markup style."] = "Un système de marques pour faire des tableaux sophistiqués.";
+$locale["Layout tables using the old markup style."] = "Apparences de tableaux utilisant l'ancien modèle de balisage.";
+$locale["LdapSearch"] = "LdapChercher";
+$locale["Left Menu"] = "Menu de gauche";
+$locale["Legend"] = "Légende";
+$locale["Level 1 headline"] = "Titre de niveau 1";
+$locale["Like Pages"] = "Pages semblables";
+$locale["Like pages"] = "Pages semblables";
+$locale["LikePages"] = "PagesSemblables";
+$locale["Line %s does not begin with a '|'."] = "La ligne %s ne commence pas par un '|'.";
+$locale["Link"] = "Lien";
+$locale["Link to page"] = "Lien vers une page";
+$locale["LinkDatabase"] = "LiensDatabase";
+$locale["LinkSearch"] = "RechercheLive";
+$locale["Links"] = "Liens";
+$locale["List"] = "Liste";
+$locale["List PageHistory for %s"] = "Historique de %s";
+$locale["List all once authenticated users."] = "Énumérez tous les utilisateurs une fois authentifiés.";
+$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."] = "Affiche la liste de toutes les versions faites par un auteur, ou montre une liste du type HistoriquePage pour une simple page uniquement pour un auteur.";
+$locale["List all pages in this wiki."] = "Liste de toutes les pages de ce wiki.";
+$locale["List all pages which link to %s."] = "Liste des pages liées à %s.";
+$locale["List all recent changes in this wiki."] = "Montrer tous les changements récents de ce wiki.";
+$locale["List all recent edits in this wiki."] = "Afficher les dernières modifications de ce wiki.";
+$locale["List of pages created by [%s] (%d total):"] = "Liste des pages créé près [%s] (%d au total) :";
+$locale["List of pages last edited by [%s] (%d total):"] = "Liste des pages modifiées en dernier par [%s] (%d au total) :";
+$locale["List of pages owned by [%s] (%d total):"] = "Liste des pages possédées par [%s] (%d au total) :";
+$locale["List of plugins on this wiki"] = "Liste des greffons de ce wiki";
+$locale["List of user-created pages (%d total):"] = "Liste des pages créées par les utilisateurs (%d au total) :";
+$locale["List page names which share an initial or final title word with '%s'."] = "Affiche la liste des pages qui partagent un mot initial ou final dans leur titre avec %s.";
+$locale["List pages that are explicitly given as the pages argument."] = "Liste des pages qui sont explicitement données en argument.";
+$locale["List pages which are not linked to by any other page."] = "Liste des pages qui ne sont liées à aucune autre.";
+$locale["List the most popular pages."] = "Voir les pages les plus populaires.";
+$locale["List this page and all subpages"] = "Lister cette page et ses sous-pages";
+$locale["ListPages"] = "ListeDePages";
+$locale["ListSubpages"] = "ListeDesSousPages";
+$locale["Lists referenced page names which do not exist yet."] = "Afficher toutes les pages référencées qui n'existent pas.";
+$locale["Lists the names of all SubPages of the current page."] = "Affiche la liste des noms de toutes les sous-pages de la page courante.";
+$locale["LiveSearch"] = "RechercheLive";
+$locale["Load File"] = "Importer un fichier";
+$locale["LoadDump"] = "RécupérationDeLaPage";
+$locale["Loading '%s'"] = "Chargement de « %s »";
+$locale["Loading InterWikiMap from external file %s."] = "Chargement de la CarteInterWiki depuis le fichier %s.";
+$locale["Loading files"] = "Chargement des fichiers";
+$locale["Loading up virgin wiki"] = "Chargement du nouveau wiki";
+$locale["Lock"] = "Verrouiller";
+$locale["Lock Page"] = "Verrouiller la page";
+$locale["Locked"] = "Verrouillé";
+$locale["Locking pages"] = "Verrouiller des pages";
+$locale["Login"] = "S'identifier";
+$locale["Logout"] = "Déconnexion";
+$locale["MIME file %s"] = "fichier MIME %s";
+$locale["MISSING"] = "MANQUANT";
+$locale["Main Categories"] = "Catégories principales";
+$locale["Major modifications only"] = "Que les modifications majeures";
+$locale["Make the page external?"] = "Rendre la page externe ?";
+$locale["Make the page public?"] = "Rendre la page publique ?";
+$locale["Make the page read-only?"] = "Rendre la page non modifiable ?";
+$locale["Make use of the Google API"] = "Faire usage de l'API Google";
+$locale["Markup"] = "Syntaxe";
+$locale["Markup cache purged!"] = "Cache de marques purgé !";
+$locale["Markup:"] = "Syntaxe :";
+$locale["Members:"] = "Membres :";
+$locale["Merge Edit"] = "Fusionner les modifications";
+$locale["Merge and Edit: %s"] = "Fusionner et modifier : %s";
+$locale["Message"] = "Message";
+$locale["Method '%s' not implemented in this GROUP_METHOD %s"] = "La méthode '%s' n'est pas implémentée dans ce GROUP_METHOD (%s)";
+$locale["Minor"] = "Mineur";
+$locale["Minor Edit"] = "Modification mineure";
+$locale["Miscellaneous utility functions for the Administrator."] = "Plusieurs fonctions pour l'administration d'un wiki.";
+$locale["Missing %s for %s"] = "Il manque %s pour %s";
+$locale["Missing PagePermission:"] = "Permission de page individuelle absente:";
+$locale["ModeratedPage"] = "PageModérée";
+$locale["ModeratedPage Notification Error: Couldn't send email"] = "Erreur lors des notifications de page: Impossible d'envoyer";
+$locale["ModeratedPage: No emails for the moderators defined"] = "PageModerée: No emails for the moderators defined";
+$locale["Modern"] = "Moderne";
+$locale["Modified"] = "Modifié";
+$locale["Modified on %s by %s"] = "Modifié le %s par %s";
+$locale["Moniker"] = "Nom";
+$locale["More..."] = "Plus...";
+$locale["Most users ever online was %d at %s."] = "Record du nombre d'utilisateur: %d le %s.";
+$locale["MostPopular"] = "LesPlusVisitées";
+$locale["My Changes"] = "Mes modifications";
+$locale["My Discussion"] = "Ma page de discussion";
+$locale["My Preferences"] = "Mes préférences";
+$locale["My User Page"] = "Ma page";
+$locale["My modifications only"] = "Que mes modifications";
+$locale["My pages only"] = "Que mes pages";
+$locale["Name"] = "Nom";
+$locale["Navigation"] = "Navigation";
+$locale["Never edited"] = "Jamais éditée";
+$locale["New Topic"] = "Nouveau sujet";
+$locale["New comment."] = "Nouveau commentaire.";
+$locale["New entry"] = "Nouvelle entrée";
+$locale["New page"] = "Nouvelle page";
+$locale["New pages only"] = "Que les nouvelles pages";
+$locale["New password"] = "Nouveau mot de passe";
+$locale["New users may use an empty password."] = "Les nouveaux utilisateurs devraient utiliser un mot de passe vide.";
+$locale["New watchlist: "] = "Nouvelle liste de suivi : ";
+$locale["Newer page:"] = "Page plus récente :";
+$locale["Next"] = "Suivant";
+$locale["Next Month"] = "Mois suivant";
+$locale["No"] = "Non";
+$locale["No DSN alias for SqlResult.ini specified"] = "Aucun alias DSN spécifié pour SqlResult.ini";
+$locale["No DSN for alias %s in SqlResult.ini found"] = "Aucun alias DSN trouvé pour %s dans SqlResult.ini";
+$locale["No LDAP in this PHP version"] = "Pas de LDAP dans cette version de php";
+$locale["No changes found"] = "Aucune modification trouvée";
+$locale["No changes."] = "Aucun changement.";
+$locale["No comments found"] = "Aucun commentaire trouvé";
+$locale["No file selected. Please select one."] = "Pas de fichier sélectionné. Merci d'en sélectionner un.";
+$locale["No fuzzy matches with '%s'"] = "Pas de correspondances floues avec « %s »";
+$locale["No metadata for %s"] = "Pas de métadonnées pour %s";
+$locale["No or not enough GROUP_DB SQL statements defined"] = "Aucun ou pas assez de GROUP_DB définis pour SQL";
+$locale["No or unsupported GROUP_METHOD defined"] = "Aucun GROUP_METHOD défini, ou GROUP_METHOD non supporté";
+$locale["No other page links to %s yet."] = "Aucune page n'est déjà liée à %s.";
+$locale["No page links to %s."] = "Aucune page ne pointe vers %s.";
+$locale["No page specified."] = "Aucune page indiquée";
+$locale["No pagedata for %s"] = "Pas de données de page pour %s";
+$locale["No pagename specified"] = "Pas de nom de page spécifié";
+$locale["No pages changed."] = "Aucune page modifiée.";
+$locale["No pages purged."] = "Aucune page purgée.";
+$locale["No pages removed."] = "Aucune page n'a été supprimée.";
+$locale["No pages renamed."] = "Aucune page n'a été renommée.";
+$locale["No pages with bad names had to be deleted."] = "Aucune page supprimées avec un nom invalide.";
+$locale["No revisions found"] = "Aucune version trouvée";
+$locale["No uploaded file to upload?"] = "Pas de fichier à déposer ?";
+$locale["No userid"] = "Pas d'identifiant utilisateur";
+$locale["NoCache"] = "PasDeCache";
+$locale["None"] = "Aucun(e)";
+$locale["Not enough questions answered!"] = "Pas assez de réponses fournies !";
+$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."] = "Notez que beaucoup de navigateurs ajusteront automatiquement la largeur de la zone d'édition de façon qu'elle remplisse la fenêtre. Le paramètre concernant la largeur sera ignoré dans ce cas.";
+$locale["Note, that user accounts with bouncing emails will be disabled."] = "Notez que les comptes avec une adresse électronique invalide seront désactivés.";
+$locale["Note:"] = "Note :";
+$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."] = "Note: Vous pourrez enregistrer vos PréférencesUtilisateurs uniquement si vous créez votre propre page d'accueil portant le nom de votre identifiant.";
+$locale["Nothing found"] = "Aucun résultat";
+$locale["OK"] = "OK";
+$locale["Okay"] = "OK";
+$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] = "L'ancienne page %s sans mot de passe attribué a été mise à jour avec un mot de passe vide. Définissez un mot de passe dans vos PréférencesUtilisateurs.";
+$locale["Old and new pages"] = "Pages anciennes et nouvelles";
+$locale["OldStyleTable"] = "TableauAncienStyle";
+$locale["Older page:"] = "Page plus ancienne :";
+$locale["One UserPreferences field successfully updated."] = "Une préférence a été mise à jour avec succès.";
+$locale["One page has been changed:"] = "Une page a été modifiée :";
+$locale["One page has been permanently purged:"] = "Une page a été définitivement purgée :";
+$locale["One page has been removed:"] = "Une page a été supprimée :";
+$locale["One page has been renamed:"] = "Une page a été renommée :";
+$locale["One page links to %s:"] = "Une page pointe vers %s :";
+$locale["One page would link to %s:"] = "Une page pointerait vers %s :";
+$locale["Oops! Revision %s of %s seems to have been deleted!"] = "Ouille ! La version %s de %s semble avoir été effacée !";
+$locale["Operation undone"] = "Opération annulée";
+$locale["Optimizing database"] = "Optimisation de la base de données";
+$locale["Original (1.2 or 1.0)"] = "Original (1.2 ou 1.0)";
+$locale["Orphaned Pages in this wiki (%d total):"] = "Pages Orphelines dans ce wiki (%d au total) :";
+$locale["OrphanedPages"] = "PagesOrphelines";
+$locale["Other diffs:"] = "Autres comparaisons :";
+$locale["Other version"] = "L'autre version";
+$locale["Our users created a total of %d pages."] = "Nos utilisateurs ont créé un total de %d pages.";
+$locale["Overwrite All"] = "Tout écraser";
+$locale["Overwrite with new"] = "Écraser avec le nouveau";
+$locale["Owner"] = "Propriétaire";
+$locale["Owner: %s"] = "Propriétaire : %s";
+$locale["PHP syntax highlighting"] = "Coloration syntaxique du PHP";
+$locale["PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."] = "PHP n'a pas pu créer un nouveau flux d'image GD. Lisez 'lib/plugin/text2png.php' pour plus de détails.";
+$locale["Page"] = "Page";
+$locale["Page %s not found."] = "Page %s non trouvée.";
+$locale["Page '%s' already exists. Ignored."] = "La page %s existe déjà. Ignorée.";
+$locale["Page '%s' does not exist"] = "La page '%s' n'existe pas";
+$locale["Page '%s' does not exist."] = "La page « %s » n'existe pas";
+$locale["Page Content: "] = "Contenu de la page : ";
+$locale["Page Execution took %s seconds"] = "L'exécution de la page a pris %s secondes";
+$locale["Page Info"] = "Infos sur la page";
+$locale["Page Locked"] = "Page verrouillée";
+$locale["Page Name"] = "Nom de la page";
+$locale["Page Trail"] = "File d'Ariane";
+$locale["Page Type:"] = "Type de page :";
+$locale["Page Version:"] = "Version de la page :";
+$locale["Page change"] = "Modification de la page";
+$locale["Page dump"] = "Cliché de la page";
+$locale["Page info"] = "Infos sur la page";
+$locale["Page names with prefix '%s'"] = "Noms de page ayant le préfixe ' %s '";
+$locale["Page names with suffix '%s'"] = "Noms de page ayant le suffixe ' %s '";
+$locale["Page now external."] = "La page est maintenant externe.";
+$locale["Page now locked."] = "La page est maintenant verrouillée.";
+$locale["Page now not-external."] = "La page est maintenant interne.";
+$locale["Page now not-public."] = "La page est maintenant privée.";
+$locale["Page now public."] = "La page est maintenant publique.";
+$locale["Page now unlocked."] = "La page est maintenant déverrouillée.";
+$locale["Page once only"] = "Une fois par page";
+$locale["Page rename %s to %s"] = "Page renommée de %s à %s";
+$locale["Page statistics"] = "Statistiques de page";
+$locale["Page successfully updated."] = "Page mise à jour avec succès.";
+$locale["PageChange Notification Error: Couldn't send %s to %s"] = "Erreur lors de la notification de changement de page : impossible d'envoyer %s à %s";
+$locale["PageChange Notification of %s"] = "Notification de changement de la page %s";
+$locale["PageChange Notification of %s sent to %s"] = "La notification de changement de la page %s a été envoyée à %s";
+$locale["PageDump"] = "RécupérationDeLaPage";
+$locale["PageGroup"] = "GroupeDePages";
+$locale["PageGroup for %s"] = "Groupe de pages pour %s";
+$locale["PageHistory"] = "HistoriqueDeLaPage";
+$locale["PageHistory for %s"] = "Historique de %s";
+$locale["PageInfo"] = "InfosSurLaPage";
+$locale["PageName|optional label"] = "Page|label optionnel";
+$locale["PageTrail"] = "TracePage";
+$locale["PageTrail Plugin"] = "Pour suivre les pages à la trace";
+$locale["Pagedata size: %d KiB"] = "Taille des données de la page : %d Kio";
+$locale["Pagename(s): "] = "Nom de la page";
+$locale["Pages which have been deleted at least %s days are already checked."] = "Les pages qui ont été supprimées il y a au plus %s jours sont déjà cochées.";
+$locale["Password cannot be changed."] = "Impossible de changer le mot de passe.";
+$locale["Password updated."] = "Mot de passe mis à jour";
+$locale["Password was not changed."] = "Le mot de passe n'a pas été mis à jour";
+$locale["Password:"] = "Mot de passe :";
+$locale["Past versions of this page."] = "Versions précédentes de cette page.";
+$locale["Perform searches on InterWiki sites listed in InterWikiMap."] = "Effectuer une recherche sur les sites InterWiki contenu dans la carte InterWiki.";
+$locale["Permanently purge all selected pages."] = "Purger définitivement toutes les pages sélectionnées.";
+$locale["Permanently purge selected pages"] = "Purger définitivement les pages sélectionnées";
+$locale["Permanently remove all selected pages."] = "Supprimer toutes les pages sélectionnées en permanence.";
+$locale["Permission"] = "Permission";
+$locale["Personal Auth Settings for '%s'"] = "Préférences personnelles pour '%s'";
+$locale["Personal language:"] = "Ma langue :";
+$locale["Personal theme:"] = "Thème personnel :";
+$locale["PgsrcTranslation"] = "TraductionPgsrc";
+$locale["PhotoAlbum"] = "AlbumPhotos";
+$locale["PhpHighlight"] = "ColorationPhp";
+$locale["PhpWeather"] = "MétéoPhp";
+$locale["PhpWiki developers should manually inspect the downloaded file for nested markup before rewrapping with emacs and checking into Subversion."] = "Les développeurs de PhpWiki devraient inspecter manuellement les balises des fichiers téléchargés avant de les éditer sous emacs et les publier sous Subversion.";
+$locale["PhpWiki engine version"] = "Version de PhpWiki";
+$locale["PhpWikiAdministration"] = "AdministrationDePhpWiki";
+$locale["PhpWikiAdministration/Chmod"] = "AdministrationDePhpWiki/Chmod";
+$locale["PhpWikiAdministration/Chown"] = "AdministrationDePhpWiki/Chown";
+$locale["PhpWikiAdministration/Rename"] = "AdministrationDePhpWiki/Renommer";
+$locale["PhpWikiAdministration/Replace"] = "AdministrationDePhpWiki/Remplacer";
+$locale["PhpWikiDocumentation"] = "DocumentationDePhpWiki";
+$locale["PhpWikiPoll"] = "SondagePhpWiki";
+$locale["Please check it through before saving."] = "Veuillez la vérifier avant de l'enregistrer.";
+$locale["Please contact your PhpWiki administrator for assistance."] = "Veuillez contacter l'administrateur pour l'assistance.";
+$locale["Please continue editing.  (You'll find your %s at the bottom of the page.)"] = "Veuillez continuer votre édition. (Vous trouverez votre %s en bas de page).";
+$locale["Please ensure that %s is writable, or redefine %s in config/config.ini."] = "Veuillez vous assurer que %s est modifiable, ou redéfinissez %s dans config/config.ini.";
+$locale["Please set ENCRYPTED_PASSWD to false in config/config.ini and probably change ADMIN_PASSWD."] = "Veuillez définir ENCRYPTED_PASSWD à false dans config/config.ini et probablement l'ADMIN_PASSWD.";
+$locale["Please set ENCRYPTED_PASSWD to true in config/config.ini."] = "Veuillez définir ENCRYPTED_PASSWD à true dans config/config.ini.";
+$locale["Please set a password in UserPreferences."] = "Veuillez définir votre mot de passe dans PréférencesUtilisateurs.";
+$locale["Please use one of the downloadable versions rather than copying and pasting from the above preview."] = "Veuillez utiliser une des versions téléchargeables au lieu de copier-coller à partir de la prévisualisation.";
+$locale["Plugin"] = "Greffon";
+$locale["Plugin %s disabled."] = "Greffon %s désactivé.";
+$locale["Plugin %s failed."] = "Échec du greffon %s.";
+$locale["Plugin %s: undefined"] = "Plugin %s: non défini";
+$locale["Plugin '%s' does not exist."] = "Le greffon %s n'existe pas.";
+$locale["Plugin not run: not in browse mode"] = "Greffon non exécuté (hors navigation)";
+$locale["PluginManager"] = "GestionsDesPlugins";
+$locale["Plugins"] = "Greffons";
+$locale["PopularNearby"] = "PopulairesAlentour";
+$locale["Post new"] = "Poster une annonce";
+$locale["Posted: %s"] = "Posté le %s";
+$locale["Postponed %s for %s."] = "Pas de listes trouvées pour %1\$s";
+$locale["Preferences"] = "Préférences";
+$locale["PreferencesInfo"] = "PréférencesInfo";
+$locale["Prev"] = "Précédent";
+$locale["PrevNext"] = "PrécédentSuivant";
+$locale["Preview"] = "Prévisualiser";
+$locale["Preview as developer format"] = "Prévisualisation au format développeurs";
+$locale["Preview as normal format"] = "Prévisualisation au format de sauvegarde";
+$locale["Preview only!  Changes not saved."] = "Prévisualisation uniquement ! Modifications non enregistrées.";
+$locale["Preview: Page dump of %s"] = "Prévisualisation : récupération de %s";
+$locale["Previous"] = "Précédent";
+$locale["Previous Author"] = "Auteur précédent";
+$locale["Previous Major Revision"] = "Version majeure précédente";
+$locale["Previous Month"] = "Mois précédent";
+$locale["Previous Revision"] = "Version précédente";
+$locale["Printable version"] = "Version imprimable";
+$locale["Printer"] = "Imprimante";
+$locale["Propagate new permissions to all subpages?"] = "Propager les nouvelles permissions aux sous-pages ?";
+$locale["Provides access to PhpWiki's lower level system information."] = "Affiche les informations de bas niveau pour PhpWiki.";
+$locale["Public"] = "Public";
+$locale["Purge"] = "Purger";
+$locale["Purge HTML cache"] = "Vider le cache HTML";
+$locale["Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."] = "Purge le cache HTML pour cette page. Régénère depuis WikiMarkup lors du prochain accès.";
+$locale["Purge Markup Cache"] = "Purger le cache";
+$locale["Purge Page"] = "Purger la page";
+$locale["Purge all Pages With Invalid Names"] = "Supprimer les pages dont le nom n'est pas valide";
+$locale["Purge this page"] = "Purger cette page";
+$locale["PurgeHtmlCache"] = "PurgerLeCache";
+$locale["Purged page '%s' successfully."] = "Page '%s' purgée avec succès";
+$locale["Purging pages"] = "Purger des pages";
+$locale["Querying backend directly for '%s'"] = "Requête directe au backend pour « %s »";
+$locale["Quick Search"] = "Recherche rapide";
+$locale["Random Page"] = "Une page au hasard";
+$locale["Random page"] = "Une page au hasard";
+$locale["RandomPage"] = "PageAléatoire";
+$locale["Rate"] = "Note";
+$locale["Rate It"] = "Notez-la";
+$locale["RateIt"] = "ClassezLa";
+$locale["Rating"] = "Classement";
+$locale["Rating deleted!"] = "Évaluation supprimée !";
+$locale["Raw HTML"] = "HTML Pur";
+$locale["Raw HTML is disabled in this wiki."] = "Le HTML est interdit sur ce wiki.";
+$locale["Reason: "] = "Raison : ";
+$locale["Recent Changes"] = "Modifications récentes";
+$locale["Recent Comments"] = "Derniers commentaires";
+$locale["Recent Edits"] = "Modifications récentes";
+$locale["Recent changes"] = "Dernières modifications";
+$locale["Recent comments"] = "Derniers commentaires";
+$locale["Recent new pages"] = "Dernières pages créées";
+$locale["RecentChanges"] = "DernièresModifs";
+$locale["RecentComments"] = "CommentairesRécents";
+$locale["RecentEdits"] = "ÉditionsRécentes";
+$locale["RecentVisitors"] = "VisiteursRécents";
+$locale["Recursive inclusion of page %s"] = "Insertion récursive de la page %s";
+$locale["Recursive inclusion of page %s ignored"] = "Insertion récursive de la page %s ignoré";
+$locale["Recursive inclusion of url %s"] = "Insertion récursive de l'URL %s";
+$locale["Recursive redirect to self: '%s'"] = "Redirection récursive vers soi-même: %s";
+$locale["Recursively get BackLinks or links"] = "Obtenir récursivement des RétroLiens ou liens";
+$locale["Redirect"] = "Redirection";
+$locale["RedirectTo"] = "RedirigerVers";
+$locale["Redirects to an external web site based on form input"] = "Redirige vers un site externe basé sur un formulaire";
+$locale["Redirects to another URL or page."] = "Redirige vers une autre url ou page.";
+$locale["References"] = "Références";
+$locale["Regex?"] = "expression régulière ?";
+$locale["Registered Users"] = "Utilisateurs inscrits";
+$locale["Registered Users Online: "] = "Utilisateurs enregistrés en ligne : ";
+$locale["Reject"] = "Rejeter";
+$locale["Related Changes"] = "Changements liés";
+$locale["Related Links"] = "Liens correspondants";
+$locale["Related changes"] = "Changements liés";
+$locale["RelatedChanges"] = "ChangementsLiés";
+$locale["Relation"] = "Relation";
+$locale["Relation %s to page %s"] = "Relation %s vers la page %s";
+$locale["Relations"] = "Relations";
+$locale["ReleaseNotes"] = "NotesDeVersion";
+$locale["Remove"] = "Supprimer";
+$locale["Remove Comment"] = "Supprimer le commentaire";
+$locale["Remove Page"] = "Supprimer la page";
+$locale["Remove selected pages"] = "Supprimer les pages sélectionnées";
+$locale["Remove this page"] = "Supprimer cette page";
+$locale["Removed page '%s' successfully."] = "Page '%s' supprimée avec succès";
+$locale["Removing pages"] = "Supprimer les pages";
+$locale["Rename"] = "Renommer";
+$locale["Rename Page"] = "Renommer la page";
+$locale["Rename page"] = "Renommer la page";
+$locale["Rename selected pages"] = "Renommer les pages sélectionnées";
+$locale["Rename to"] = "Renommer en";
+$locale["Renamed page '%s' to '%s'."] = "Page '%s' renommée en '%s'.";
+$locale["Renamed page from '%s' to '%s'"] = "Renommer la page de '%s' à '%s'";
+$locale["Replace"] = "Remplacer";
+$locale["Replace with"] = "Remplacer par";
+$locale["Replaced '%s' with '%s' in page '%s'."] = "%s a bien été modifié par %s dans la page %s.";
+$locale["Reply"] = "Répondre";
+$locale["Required argument %s missing"] = "Argument obligatoire %s manquant";
+$locale["Requires WikiAdmin privileges to edit."] = "Nécessite les privilèges administrateur pour l'édition.";
+$locale["Reset"] = "Réinitialiser";
+$locale["Reset Preferences"] = "Réinitialiser les préférences";
+$locale["Restore Anyway"] = "Restaurer quand même";
+$locale["Return to %s"] = "Retourner à %s";
+$locale["Revert"] = "Révoquer";
+$locale["Revert: %s"] = "Révoquer : %s";
+$locale["Revision Not Found"] = "Version non trouvée";
+$locale["RichTable"] = "BeauTableau";
+$locale["RssFeed"] = "RessourcesRss";
+$locale["SOAP access"] = "Accès SOAP";
+$locale["Sample table"] = "Exemple de table";
+$locale["SandBox"] = "BacÀSable";
+$locale["Save"] = "Enregistrer";
+$locale["Saved on:"] = "Enregistrée le :";
+$locale["Saved: %s"] = "Enregistrée : %s";
+$locale["Saving this page will overwrite the current version."] = "Enregistrer cette page écrasera la version actuelle.";
+$locale["Score"] = "Score";
+$locale["Search"] = "Rechercher";
+$locale["Search & Replace"] = "Rechercher & Remplacer";
+$locale["Search an LDAP directory"] = "Chercher dans un annuaire LDAP";
+$locale["Search and replace text in selected wiki pages."] = "Recherche puis remplace le texte dans les pages sélectionnées.";
+$locale["Search for"] = "Rechercher";
+$locale["Search for page titles similar to %s."] = "Rechercher le titre de page similaire à %s.";
+$locale["Search the content of all pages in this wiki."] = "Rechercher le contenu de toutes les pages de ce wiki.";
+$locale["Search the titles of all pages in this wiki."] = "Rechercher les titres de toutes les pages de ce wiki.";
+$locale["Search:"] = "Rechercher :";
+$locale["SearchReplace"] = "Rechercher & Remplacer";
+$locale["See %s"] = "Voir %s";
+$locale["See %s tips for editing."] = "Voir les conseils pour éditer les pages dans %s.";
+$locale["See: %s"] = "Voir : %s";
+$locale["Select pages"] = "Sélectionner les pages";
+$locale["Select the files to purge"] = "Sélectionnez les fichiers à purger";
+$locale["Select the pages to change the owner"] = "Sélectionnez les pages dont vous voulez changer le propriétaire";
+$locale["Select the pages to change:"] = "Sélectionnez les pages à modifier :";
+$locale["Select the pages to rename:"] = "Sélectionnez les pages à renommer :";
+$locale["Select the pages to search and replace"] = "Sélectionner ci-dessous les pages dans lesquelles la recherche sera effectuée :";
+$locale["Select: "] = "Sélectionner : ";
+$locale["Selected Grant checkboxes allow access, unselected checkboxes deny access."] = "Les cases sélectionnées autorisent l'accès, sinon elles l'interdisent.";
+$locale["Selected Pages: "] = "Pages sélectionnées : ";
+$locale["Semantic relations for %s"] = "Relations sémantiques pour %s";
+$locale["Send email"] = "Envoyer message";
+$locale["Serialized file %s"] = "Fichier sérialisé %s";
+$locale["Set Password"] = "Choisir un mot de passe";
+$locale["Set USE_DB_SESSION to false."] = "Mettre USE_DB_SESSION à false.";
+$locale["Set individual page permissions."] = "Modifier les permissions individuelles de la page.";
+$locale["SetAcl"] = "DéfinirAcl";
+$locale["Show Group Information"] = "Information sur le groupe";
+$locale["Show Page Trail"] = "Afficher le fil d'Ariane";
+$locale["Show Page Trail at top of page."] = "Afficher le fil d'Ariane en tête de la page";
+$locale["Show and add blogs for %s"] = "Montrer et ajouter un blog à %s ";
+$locale["Show and add comments for %s"] = "Afficher et ajouter des commentaires pour %s";
+$locale["Show changes for:"] = "Indiquer les modifications pour :";
+$locale["Show extra page Info and statistics for %s."] = "Montrer les informations de la page %s ainsi que ses statistiques.";
+$locale["Show relative dates using 'Today' and 'Yesterday'"] = "Afficher des dates relatives avec « Aujourd'hui » et « Hier »";
+$locale["Show summary information from the access log table."] = "Montre l'index de la table access log.";
+$locale["Show summary information of the current user sessions."] = "Montre l'index de la table session. (utilisateurs en ligne).";
+$locale["Show translations of various words or pages"] = "Affiche la traduction de quelques mots dans certaines pages.";
+$locale["Sign In"] = "S'identifier";
+$locale["Sign Out"] = "Se déconnecter";
+$locale["Sign in as:"] = "S'identifier en tant que :";
+$locale["SignIn"] = "S'identifier";
+$locale["SignOut"] = "Se déconnecter";
+$locale["Signed Users"] = "Utilisateurs inscrits";
+$locale["Simple RSS Feed aggregator Plugin"] = "Importer des ressources RSS";
+$locale["Simple Sample Plugin"] = "Exemple simple de Plugin";
+$locale["Since you started the deletion process, someone has saved a new version of %s.  Please check to make sure you still want to permanently remove the page from the database."] = "Depuis que vous avez entamé le processus d'effacement, quelqu'un a enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez toujours retirer de façon permanente cette page de la base de données.";
+$locale["Since you started the purge process, someone has saved a new version of %s.  Please check to make sure you still want to permanently purge the page from the database."] = "Depuis que vous avez entamé le processus d'effacement, quelqu'un a enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez toujours retirer de façon permanente cette page de la base de données.";
+$locale["SiteMap"] = "CarteDuSite";
+$locale["Size"] = "Taille";
+$locale["Size:"] = "Taille :";
+$locale["Skipped."] = "Ignoré.";
+$locale["Skipping"] = "Ignoré";
+$locale["Some internal editing error"] = "Erreur interne pendant la modification";
+$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."] = "Certaines modifications n'ont pas pu être combinées automatiquement. Veuillez regarder les sections commençant par « %s », et se terminant par « %s ». Vous devrez éditer ces sections à la main avant de cliquer sur Enregistrer.";
+$locale["Someone has edited the page!"] = "Quelqu'un a édité la page !";
+$locale["Sorry but this file is too big."] = "Désolé, mais le fichier est trop gros.";
+$locale["Sorry for the inconvenience."] = "Désolé pour la gêne occasionnée.";
+$locale["Sorry! You must wait at least 20 minutes until you can vote again!"] = "Désolé, vous devez attendre au moins 20 minutes avant de pouvoir revoter !";
+$locale["Sorry, no dynamic DB Session support."] = "Désolé, Session dynamique non supportées.";
+$locale["Sorry, this page does not exist."] = "Désolé, cette page n'existe pas";
+$locale["Sorry, this version of PHP cannot create PNG image files."] = "Désolé, cette version de PHP ne peut pas créer des fichiers d'image PNG.";
+$locale["Sorry. Access Restrictions not yet implemented"] = "Désolé. Restriction d'accès pas encore disponible";
+$locale["Sort by %s"] = "Trier par %s";
+$locale["Sound Score"] = "Score de son";
+$locale["Special Actions"] = "Actions spéciales";
+$locale["Special Pages"] = "Pages spéciales";
+$locale["SpecialPages"] = "Pages spéciales";
+$locale["Spell Check"] = "Vérifier l'orthographe";
+$locale["Spell Checker"] = "Correcteur orthographique";
+$locale["Spelling Score"] = "Score d'épellation";
+$locale["SqlResult"] = "RésultatSql";
+$locale["Statistics about %s."] = "Statistiques sur %s.";
+$locale["Status:"] = "État :";
+$locale["SteveWainstead"] = "SteveWainstead";
+$locale["Strike"] = "Biffé";
+$locale["Strike-through text"] = "Biffé";
+$locale["String \"%s\" not found."] = "Chaîne \"%s\" non trouvée.";
+$locale["SubPages of %s:"] = "SousPages de %s :";
+$locale["Submit"] = "Soumettre";
+$locale["Submit location"] = "Soumettre la localisation";
+$locale["Subpage"] = "Sous-page";
+$locale["Summary"] = "Résumé";
+$locale["Summary: %s"] = "Résumé : %s";
+$locale["Supplanted on:"] = "Remplacée le :";
+$locale["Supported handlers are: %s"] = "Les gestionnaires supportés sont : %s";
+$locale["Supported languages"] = "Langages supportés";
+$locale["Supported themes"] = "Thèmes supportés";
+$locale["Switch to detailed list"] = "Aller à la liste détaillée";
+$locale["Switch to summary"] = "Aller au résumé";
+$locale["Synopsis"] = "Vue d'ensemble";
+$locale["Syntax language not specified."] = "Syntaxe du langage non spécifié.";
+$locale["SyntaxHighlighter"] = "ColorationSyntaxique";
+$locale["System default:"] = "Système par défaut :";
+$locale["SystemInfo"] = "InfosSystème";
+$locale["TODO: Google can only translate from english and french. Find a translation service for %s to language %s"] = "A FAIRE: Google peut uniquement traduire l'anglais et le français. Trouver un service pour traduire %s en %s";
+$locale["Table of Contents"] = "Table des matières";
+$locale["Table of content"] = "Table des matières";
+$locale["TeX imagepath not writable."] = "Répertoire TeX non accessible en écriture.";
+$locale["TeX2png"] = "TeX2png";
+$locale["Template"] = "Modèle";
+$locale["Template Name"] = "Nom du modèle";
+$locale["TermsOfUse"] = "Conditions d'utilisation";
+$locale["TextFormattingRules"] = "RèglesDeFormatageDesTextes";
+$locale["Thank you for editing %s."] = "Merci d'avoir édité %s.";
+$locale["Thanks for adding this translation!"] = "Merci d'avoir ajouté cette traduction.";
+$locale["Thanks for participating!"] = "Merci de votre participation !";
+$locale["Thanks!"] = "Merci !";
+$locale["The %d least popular pages of this wiki:"] = "Les %d pages les moins populaires de ce wiki :";
+$locale["The %d most popular pages of this wiki:"] = "Les %d pages les plus populaires de ce wiki :";
+$locale["The %d most recent %s are listed below."] = "Les %d %s les plus récentes sont listées ci-dessous.";
+$locale["The %d most recent %s during the past %s days are listed below."] = "Les %d %s les plus récentes pendant les derniers %s jours sont listées ci-dessous.";
+$locale["The %d most recent %s during the past day are listed below."] = "Les %d %s les plus récentes pendant le dernier jour sont listées ci-dessous.";
+$locale["The %d oldest %s are listed below."] = "Les %d %s les plus anciennes sont listées ci-dessous.";
+$locale["The %d oldest %s during the past %s days are listed below."] = "Les %d %s les plus anciennes pendant les derniers %s jours sont listées ci-dessous.";
+$locale["The %d oldest %s during the past day are listed below."] = "Les %d %s les plus anciennes pendant le dernier jour sont listées ci-dessous.";
+$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!"] = "Les fichiers %s sont dans le répertoire %s. Veuillez lire le fichier INSTALL et déplacez le fichier DB vers un emplacement permanent, sinon vous risquez de perdre toutes vos pages !";
+$locale["The %s subpage enables simple weblogging."] = "Les sous-pages de %s permettent l'utilisation d'un blog simple.";
+$locale["The DBA handler %s is unsupported!"] = "Le gestionnaire DBA %s n'est pas supporté !";
+$locale["The ICAO '%s' wasn't recognized."] = "L'ICAO '%s' n'a pas été reconnu.";
+$locale["The PECL %s extension cannot be loaded."] = "L'extension PECL %s ne peut être chargée.";
+$locale["The PhpWeather plugin provides weather reports from the Internet."] = "Le plugin de météo importée d'internet.";
+$locale["The PhpWiki access log file"] = "Le journal d'évènements de PhpWiki";
+$locale["The crypt function is not available in this version of PHP."] = "La fonction de cryptage n'est pas disponible dans cette version de PHP.";
+$locale["The current page has no subpages defined."] = "La page actuelle n'a aucune sous-page définie.";
+$locale["The current time at the server is %s."] = "L'heure actuelle du serveur est %s.";
+$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 taille de votre mot de passe est trop petite, vous ne pouvez pas vous connecter. Veuillez contacter l'administrateur pour le changer.";
+$locale["The list of recent changes in the wiki."] = "Liste des modifications recentes de ce wiki.";
+$locale["The most recent %s during the past %s days are listed below."] = "Les %s les plus récentes pendant les %s derniers jours sont listées ci-dessous.";
+$locale["The most recent %s during the past day are listed below."] = "Les %s les plus récentes pendant le dernier jour sont listées ci-dessous.";
+$locale["The newest registered user is %s."] = "L'utilisateur enregistré le plus récent est %s.";
+$locale["The page %s is already watched!"] = "Cette page %s fait déjà partie de votre liste de suivi !";
+$locale["The result of this poll so far:"] = "Le résultat du sondage :";
+$locale["The session.save_path directory"] = "Le répertoire 'session.save_path'";
+$locale["The upload logfile exists but is not writable."] = "Le journal des dépôts existe mais ne peut être modifié.";
+$locale["The wordwrap of the preview doesn't take nested markup or list indentation into consideration!"] = "Le retour chariot de la prévisualisation ne prend pas en compte les marques des listes indentées !";
+$locale["Theme"] = "Thème";
+$locale["There is already a file with name %s uploaded."] = "Un fichier portant le nom '%s' existe déjà.";
+$locale["There is no image creation data available to id '%s'. Please reload referring page."] = "Aucune image ne correspond à l'id %s. Veuillez recharger cette page.";
+$locale["These page titles match fuzzy with '%s'"] = "Ces titres de pages correspondent de manière floue à « %s »";
+$locale["These pages share an initial or final title word with '%s'"] = "Ces pages partagent un mot initial ou final dans leur titre avec %s";
+$locale["This data is based on users active over the past %s."] = "Ces données sont basées sur les utilisateurs actifs depuis %s.";
+$locale["This internal action page cannot viewed."] = "Cette page ne peut être vue.";
+$locale["This is a minor change."] = "Modification mineure.";
+$locale["This page edit seems to contain spam and was therefore not saved."] = "Cette modification de la page semble contenir du spam et n'a donc pas été enregistrée";
+$locale["This page has been locked and cannot be edited."] = "Cette page a été verrouillée et ne peut pas être modifiée.";
+$locale["This page has been locked by the administrator so your changes can not be saved."] = "Cette page a été verrouillée par l'administrateur et vos changements n'ont pas pu être enregistrés.";
+$locale["This page is external."] = "Cette page est externe.";
+$locale["This plugin is currently under development and does not work!"] = "Ce plugin est en cours de développement et ne marche pas !";
+$locale["This revision of the page does not exist."] = "Cette version de la page n'existe pas";
+$locale["Time Zone"] = "Fuseau horaire";
+$locale["Title"] = "Titre";
+$locale["Title 1"] = "Titre 1";
+$locale["Title 2"] = "Titre 2";
+$locale["Title 3"] = "Titre 3";
+$locale["Title Search"] = "Rechercher dans les titres";
+$locale["Title search results for '%s'"] = "Résultat de recherche sur les titres de pages pour '%s'";
+$locale["Title search results for '%s' (%d total)"] = "Résultat de recherche sur les titres de pages pour '%s' (%d au total)";
+$locale["Title:"] = "Titre :";
+$locale["TitleSearch"] = "RechercheParTitre";
+$locale["To add check 'Add' near the dropdown list."] = "Pour ajouter cocher 'Add' près de la liste déroulante.";
+$locale["To ignore delete the line."] = "Pour ignorer effacez la ligne.";
+$locale["Today"] = "Aujourd'hui";
+$locale["Too many external links."] = "Trop de liens externes.";
+$locale["Toolbox"] = "Boîte à outils";
+$locale["Top Menu"] = "Menu du haut";
+$locale["Top Recommendations"] = "Meilleures recommandations";
+$locale["Topic"] = "Sujet";
+$locale["Total %d plugins: "] = "%d plugins au total : ";
+$locale["Total Budget"] = "Budget total";
+$locale["Total Voters"] = "Total des votants";
+$locale["Total of %d languages: "] = "%d langages au total : ";
+$locale["Total of %d themes: "] = "%d thèmes au total: ";
+$locale["Transclude"] = "Insérer";
+$locale["Transcluded from %s"] = "Inséré de %s";
+$locale["Transcluded page"] = "Page insérée";
+$locale["Translate"] = "Traduire";
+$locale["Translate %s to %s in %s"] = "Traduire de %s à %s en %s";
+$locale["Translate '%s' to '%s' in *%s*"] = "Traduire de '%s' à '%s' en *%s*";
+$locale["TranslateText"] = "TraduireUnTexte";
+$locale["Translation Error!"] = "Erreur de traduction !";
+$locale["Type"] = "Type";
+$locale["Type it again"] = "Retapez-le";
+$locale["UNOBTAINABLE"] = "INACCESSIBLE";
+$locale["USER"] = "UTILISATEUR";
+$locale["Unable to bind LDAP server %s using %s %s"] = "Impossible de se connecter au serveur LDAP %s";
+$locale["Unable to connect to IMAP server "] = "Impossible de se connecter au serveur IMAP ";
+$locale["Unable to connect to LDAP server %s"] = "Impossible de se connecter à l'annuaire LDAP de l'hôte %s";
+$locale["Unable to find src='%s'"] = "Impossible de lire src=%s";
+$locale["Unable to open directory '%s' for reading"] = "Impossible d'ouvrir le répertoire '%s' en lecture";
+$locale["Unable to read src='%s'"] = "Impossible de lire src=%s";
+$locale["Undefined method %s for special group %s"] = "Méthode non définie %s pour le groupe %s";
+$locale["Undo"] = "Annuler l'action";
+$locale["Undo Search & Replace"] = "Annuler « Rechercher & Remplacer »";
+$locale["Undo disabled"] = "Annuler dernière action désactivé.";
+$locale["Unexpected EOF in zip file"] = "Fin de fichier (EOF) inattendue dans le fichier Zip";
+$locale["UnfoldSubpages"] = "ListeDesSousPages";
+$locale["Unknown special group '%s'"] = "Groupe spécial %s inconnu";
+$locale["Unlock"] = "Déverrouiller";
+$locale["Unlock Page"] = "Déverrouiller la page";
+$locale["Unlocking pages"] = "Déverrouiller des pages";
+$locale["Unsupported ACL access type %s ignored."] = "Le type d'accès ACL %s n'est pas supporté. -- Ignoré.";
+$locale["Up"] = "Monter";
+$locale["UpLoad"] = "DéposerUnFichier";
+$locale["Update Preferences"] = "Mettre à jour les préférences";
+$locale["Upgrade"] = "Mettre à jour";
+$locale["Upgrade disabled: user != isAdmin"] = "Mise à jour désactivée, vous n'êtes pas administrateur";
+$locale["Upgrading this PhpWiki"] = "Mise à jour du PhpWiki";
+$locale["Upload"] = "Téléchargé";
+$locale["Upload File"] = "Déposer un fichier";
+$locale["Upload error: file only partially received"] = "Erreur : le fichier n'a été que partiellement transmis";
+$locale["Upload file"] = "Déposer un fichier";
+$locale["Upload files to the local InterWiki Upload:<filename>"] = "Transférer les fichiers vers Upload:<filename>";
+$locale["Upload images or media files"] = "Déposer des images ou des médias";
+$locale["Uploading %s"] = "Téléchargement de %s";
+$locale["Uploading failed."] = "Le téléchargement a échoué.";
+$locale["Uploading zip dumps"] = "Déposer la sauvegarde compressée";
+$locale["Use old markup"] = "Anciennes règles";
+$locale["User %s removed page %s"] = "L'utilisateur %s a supprimé la page %s";
+$locale["User Preferences"] = "Mes préférences";
+$locale["User not found in LDAP"] = "Utilisateur non trouvé dans l'annuaire LDAP";
+$locale["User page"] = "Page d'utilisateur";
+$locale["User preferences for this project"] = "Préférences pour ce projet";
+$locale["User preferences for user %s"] = "Préférences de l'utilisateur %s";
+$locale["User statistics"] = "Statistiques d'utilisateur";
+$locale["UserId"] = "Identifiant d'utilisateur";
+$locale["UserId:"] = "Identifiant d'utilisateur :";
+$locale["UserPreferences"] = "PréférencesUtilisateurs";
+$locale["UserRatings"] = "Évaluations par les pairs";
+$locale["Username"] = "utilisateur";
+$locale["Users will not be able to sign in."] = "Les utilisateurs ne pourront pas s'inscrire.";
+$locale["Using directory '%s'"] = "Utilisation du répertoire « %s »";
+$locale["Value"] = "Valeur";
+$locale["Verification Status"] = "Vérification du statut";
+$locale["Verify the current action"] = "Vérifier l'action actuelle";
+$locale["Version"] = "Version";
+$locale["Version "] = "Version ";
+$locale["Version %d"] = "Version %d";
+$locale["Version %s"] = "Version %s";
+$locale["Version %s, saved on %s"] = "Version %s, enregistrée le %s";
+$locale["Versions are identical"] = "Les versions sont identiques";
+$locale["View Page"] = "Voir la page";
+$locale["View Source"] = "Voir la source";
+$locale["View Source: %s"] = "Source de : %s";
+$locale["View a single page dump online."] = "Voir une sauvegarde de page en ligne.";
+$locale["View the current version"] = "Visualiser la version actuelle";
+$locale["View the current version."] = "Visualiser la version actuelle";
+$locale["View the page"] = "Voir la page";
+$locale["View this page and all subpages"] = "Voir cette page et ses sous-pages";
+$locale["Viewing redirecting page."] = "Voir la page de redirection.";
+$locale["Viewing the source of pages"] = "Visualisation de la source des pages";
+$locale["Views"] = "Vues";
+$locale["Visited pages on this wiki, ordered by popularity:"] = "Pages visitées sur ce wiki, classées par ordre de popularité :";
+$locale["Visualizes the Wiki structure in a graph using the 'dot' commandline tool from graphviz."] = "Représenter la structure du wiki par un graphe utilisant l'outil dot de graphviz.";
+$locale["W"] = "L";
+$locale["Wanted From"] = "Recherchées par";
+$locale["Wanted Pages for %s (%d total):"] = "Pages recherchées pour %s  dans ce wiki (%d au total) :";
+$locale["Wanted Pages for %s:"] = "Pages recherchées pour %s :";
+$locale["Wanted Pages in this wiki (%d total):"] = "Pages recherchées dans ce wiki (%d au total) :";
+$locale["Wanted Pages in this wiki:"] = "Pages recherchées dans ce wiki :";
+$locale["WantedPages"] = "PagesRecherchées";
+$locale["Warning:"] = "Attention :";
+$locale["Warning: The search string cannot be empty!"] = "ATTENTION: vous devez entrez au moins une lettre pour la recherche!";
+$locale["Warning: You are editing an old revision."] = "Attention : vous modifiez une version archivée.";
+$locale["Watch"] = "Surveiller";
+$locale["Watch Page"] = "Surveiller";
+$locale["WatchPage"] = "Suivre";
+$locale["We have a total of %d registered users."] = "Nous avons %d utilisateurs enregistrés.";
+$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Bienvenue sur %s!\nVotre compte email a été vérifié et\nsera utilisé pour les notifications de changements de pages.\nVoir %s";
+$locale["What links here"] = "Pages liées";
+$locale["Who Is Online"] = "Qui est en ligne";
+$locale["Who is online"] = "Qui est en ligne";
+$locale["WhoIsOnline"] = "QuiEstEnLigne";
+$locale["Width"] = "Largeur";
+$locale["Wiki Admin"] = "Administration du wiki";
+$locale["Wiki Name"] = "Nom du wiki";
+$locale["WikiAdminChown"] = "WikiAdminChown";
+$locale["WikiAdminSelect"] = "WikiAdminSelect";
+$locale["WikiAdminUtils"] = "WikiAdminUtils";
+$locale["WikiBlog"] = "WikiBlog";
+$locale["WikiDB::renamePage() not yet implemented for this backend"] = "WikiBD::renamePage() pas encore implémentée pour le Principal";
+$locale["WikiForm: %s: unknown action"] = "FormulaireWiki : %s : action inconnue";
+$locale["WikiForum"] = "WikiForum";
+$locale["WikiWikiWeb"] = "WikiWikiWeb";
+$locale["Wikiname regexp"] = "regexp du WikiNom";
+$locale["With the current offset, this would be reported as %s."] = "Avec l'offset actuel, ceci serait affiché comme %s.";
+$locale["Wrong password. Try again."] = "Erreur de mot de passe. Veuillez recommencer.";
+$locale["Wrong password: "] = "Mot de passe invalide : ";
+$locale["Wysiwyg Editor"] = "Éditeur Wysiwyg";
+$locale["XML-RPC access"] = "Accès XML-RPC";
+$locale["Yes"] = "Oui";
+$locale["You are about to purge '%s'!"] = "Vous êtes sur le point de purger '%s' !";
+$locale["You are about to remove '%s'!"] = "Vous êtes sur le point de supprimer '%s' !";
+$locale["You are signed but not authenticated as %s. "] = "Vous êtes enregistré mais pas connecté en tant que %s. ";
+$locale["You are signed in as %s"] = "Vous êtes connecté comme %s";
+$locale["You are viewing an old revision of this page."] = "Vous lisez une ancienne version de cette page.";
+$locale["You can only use it via the _WikiTranslation plugin."] = "Vous pouvez uniquement l'utiliser via le plugin _WikiTranslation.";
+$locale["You can personalize various settings in %s."] = "Vous pouvez personnaliser quelques préférences dans %s.";
+$locale["You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config.ini"] = "Vous avez oublié de mettre ENCRYPTED_PASSWD à true. Veuillez éditer votre config/config.ini";
+$locale["You have not made any changes so no new version has been saved."] = "Vous n'avez effectué aucun changement, aucune nouvelle version n'a donc été enregistrée.";
+$locale["You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"] = "Vous devez définir PHPWEATHER_BASE_DIR avant de l'utiliser (config/config.ini)";
+$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."] = "Vous pouvez vous inscrire en utilisant n'importe quel WikiMot comme identifiant utilisateur (ÀÖØöøÿßö peuvent être utilisés). L'identifiant sera utilisé comme lien vers votre PagePersonnelle dans DernièresModifs.";
+$locale["You must be an administrator to %s."] = "Vous devez être un administrateur pour %s.";
+$locale["You must be an administrator to use this plugin."] = "Vous devez être un administrateur pour utiliser ce plugin.";
+$locale["You must be logged in to view ratings."] = "Vous devez vous identifier pour voir les évaluations.";
+$locale["You must sign in to %s."] = "Vous devez vous inscrire pour %s.";
+$locale["You must sign in to watch pages."] = "Vous devez vous identifier pour surveiller des pages";
+$locale["You must specify a directory to dump to"] = "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde";
+$locale["You stored an empty password in your '%s' page."] = "Vous n'avez pas saisi de mot de passe pour la page %s.";
+$locale["Your E-Mail:"] = "Adresse électronique :";
+$locale["Your PHP version is too old. You must have at least PHP 4.3.9"] = "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 4.3.9";
+$locale["Your UserPreferences have been successfully reset to default."] = "Vos préférences ont été réinitialisées avec succès";
+$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Votre choix '%s' de WikiDB DB ne peut pas être utilisé pour DbSession.";
+$locale["Your access permissions are only for a BogoUser."] = "Vos permissions d'acces sont celles d'un utilisateur Bogo.";
+$locale["Your are probably trying to edit/create an invalid version of this page."] = "Vous essayez probablement de modifier ou de créer une version invalide de cette page.";
+$locale["Your browser should have redirected you to %s."] = "Votre navigateur aurait du vous redirigé vers %s.";
+$locale["Your careful attention to detail is much appreciated."] = "Votre souci particulier du détail est très apprécié.";
+$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."] = "Vos modifications ne peuvent être enegistrées, puisqu'elles écraseraient celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de l'autre auteur ont été combinées. Le résultat est affiché ci-dessous.";
+$locale["Your current rating: "] = "Votre note actuelle : ";
+$locale["Your current watchlist: "] = "Votre liste de suivi actuelle : ";
+$locale["Your home page has not been created yet so your preferences cannot not be saved."] = "Cette page a été verrouillée par l'administrateur et vos changements n'ont pas pu être enregistrée.";
+$locale["Your home page is locked so your preferences cannot not be saved."] = "Cette page a été verrouillée par l'administrateur et vos changements n'ont pas pu être enregistrés.";
+$locale["Your rating was %.1f"] = "Votre note est %.1f";
+$locale["Your signature"] = "Votre signature";
+$locale["Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation."] = "Le texte traduit n'apparait pas encore dans ce %s, mais l'administrateur l'ajoutera à l'installation.";
+$locale["Your translated text is either empty or equal to the untranslated text. Please try again."] = "Soit votre texte est vide soit il est le même que le texte à traduire, veuillez réessayer.";
+$locale["Your translation is stored in %s"] = "Votre traduction est enregistrée dans %s";
+$locale["Your version"] = "Votre version";
+$locale["ZIP files of database"] = "Récupérer dans un fichier ZIP";
+$locale["[%d] See [%s]"] = "[%d] Voir [%s]";
+$locale["[purged]"] = "[purgé]";
+$locale["_WikiTranslation"] = "_WikiTranslation";
+$locale["access this wiki via SOAP"] = "accéder à ce wiki via SOAP";
+$locale["access this wiki via XML-RPC"] = "accéder à ce wiki via XML-RPC";
+$locale["add "] = "ajouter";
+$locale["always skip the HomePage."] = "toujours ignorer la page d'accueil.";
+$locale["argument '%s' not declared by plugin"] = "argument '%s' non déclaré par le plugin";
+$locale["authenticated"] = "authentifié";
+$locale["blog"] = "blog";
+$locale["by"] = "par";
+$locale["by %s"] = "par %s";
+$locale["cached pagedata:"] = "page bufferisée :";
+$locale["cached versiondata:"] = "version bufferisée :";
+$locale["chmod page '%s' to '%s'."] = "Changement de mode %s à %s.";
+$locale["comments"] = "commentaires";
+$locale["compare revisions"] = "comparer les versions";
+$locale["content is identical to current version %d - no new revision created"] = "le contenu est identique à la version en cours %d - pas de nouvelle version";
+$locale["couldn't move %s to %s"] = "impossible de déplacer %s en %s";
+$locale["couldn't open file '%s' for writing"] = "Impossible d'ouvrir le fichier '%s' en écriture";
+$locale["create this page"] = "créer cette page";
+$locale["current version"] = "version actuelle";
+$locale["database"] = "base de données";
+$locale["days"] = "jours";
+$locale["default page permission"] = "permission de page par défaut";
+$locale["diff"] = "diff";
+$locale["diff this page"] = "diff de cette page";
+$locale["download a html zip dump from this wiki"] = "télécharger une sauvegarde HTML ZIP de ce wiki";
+$locale["download a zip dump from this wiki"] = "télécharger une sauvegarde ZIP de ce wiki";
+$locale["dump html pages"] = "récupération des pages en HTML";
+$locale["dump serial pages"] = "récupération des pages sérialisées";
+$locale["edit area"] = "zone d'édition";
+$locale["edit this page"] = "modifier cette page";
+$locale["edits"] = "modifications";
+$locale["empty source"] = "source vide";
+$locale["external"] = "externe";
+$locale["file %s is not writable"] = "%s n'est pas accessible en écriture";
+$locale["file %s not found"] = "fichier %s non trouvé";
+$locale["from"] = "de";
+$locale["from %s"] = "du %s";
+$locale["from '%s'"] = "du %s";
+$locale["has edit conflicts - overwriting anyway"] = "conflits de modification - écraser quand même ";
+$locale["has edit conflicts - skipped"] = "a des conflits de modification - ignoré";
+$locale["home page"] = "Accueil";
+$locale["hours"] = "heures";
+$locale["http://www.example.com|optional label"] = "http://www.example.com|label facultatif";
+$locale["incoming"] = "entrant";
+$locale["individual page permission"] = "permission de page individuelle";
+$locale["invalid %s ignored"] = "%s non valable ignoré";
+$locale["invalid argument %s"] = "Argument non valable : %s";
+$locale["keep old"] = "garder l'ancien";
+$locale["latest comment by "] = "dernier commentaire par ";
+$locale["load files into this wiki"] = "importer des fichiers dans ce wiki";
+$locale["lock this page"] = "verrouiller cette page";
+$locale["locked"] = "verrouillé";
+$locale["major edits"] = "modifications majeures";
+$locale["max: %d"] = "maximum : %d";
+$locale["mean: %2.3f"] = "moyenne : %2.3f";
+$locale["median: %d"] = "médiane : %d";
+$locale["minor"] = "mineur";
+$locale["minor edit"] = "modification mineure";
+$locale["minor edits"] = "modifications mineures";
+$locale["minutes"] = "minutes";
+$locale["missing required version argument"] = "argument de version obligatoire manquant";
+$locale["new pages"] = "nouvelles pages";
+$locale["newer than the existing page."] = "plus récent que la page existante.";
+$locale["no cache used"] = "pas de cache utilisé";
+$locale["no page content"] = "pas de contenu dans la page";
+$locale["no page specified"] = "aucune page indiquée";
+$locale["not affected"] = "non affectée";
+$locale["not authenticated"] = "non authentifié";
+$locale["not yet"] = "pas encore";
+$locale["older than the existing page."] = "plus vieux que la page existante.";
+$locale["only %d pages displayed"] = "Seulement %d pages affichées";
+$locale["or"] = "ou";
+$locale["outgoing"] = "sortant";
+$locale["page not locked"] = "page déverrouillée";
+$locale["page permission inherited from %s"] = "permissions héritées de %s";
+$locale["plain file %s"] = "fichier brut %s";
+$locale["predecessor to the previous major change"] = "prédécesseur de la modification majeure précédente";
+$locale["previous revision"] = "version précédente";
+$locale["purge this page"] = "purger cette page";
+$locale["really"] = "vraiment";
+$locale["remove this page"] = "supprimer cette page";
+$locale["rename %s to %s"] = "retitrez la page de '%s' à '%s'";
+$locale["rename this page"] = "renommer cette page";
+$locale["renamed from %s"] = "renommée à partir de %s";
+$locale["reverse"] = "inverser";
+$locale["revert to a previous version of this page"] = "revenir à une version précédente de la page";
+$locale["revert to version %d"] = "revenir à la version %d";
+$locale["revision by previous author"] = "version par l'auteur précédent";
+$locale["same content"] = "même contenu";
+$locale["same version page"] = "même version de la page";
+$locale["saved as "] = "enregistré sous ";
+$locale["saved as %s"] = "enregistrée sous %s";
+$locale["sent to %s"] = "envoyé à %s";
+$locale["skipped"] = "ignoré";
+$locale["sortby=mtime not supported with MostPopular"] = "sortby=mtime non supporté avec MostPopular";
+$locale["stddev: %2.3f"] = "écart-type : %2.3f";
+$locale["the file '%s'"] = "le fichier « %s »";
+$locale["the session.save_path directory '%s'"] = "le répertoire 'session.save_path' '%s'";
+$locale["to"] = "à";
+$locale["today"] = "aujourd'hui";
+$locale["total hits: %d"] = "%d visites totales";
+$locale["trailing cruft in plugin args: '%s'"] = "cochonneries terminant les arguments du plugin : '%s'";
+$locale["unknown argument '%s' to SystemInfo"] = "argument inconnu pour SystemInfo (%s)";
+$locale["unknown color %s ignored"] = "couleur %s non valable ignorée";
+$locale["unlock this page"] = "déverrouiller cette page";
+$locale["upload a zip dump"] = "déposer un fichier zip";
+$locale["uploaded %s"] = "Téléchargé %s";
+$locale["use this plugin"] = "utiliser ce greffon";
+$locale["users"] = "utilisateurs";
+$locale["verify the current action"] = "vérifier l'action actuelle";
+$locale["version %d"] = "version %d";
+$locale["version %s"] = "version %s";
+$locale["version <em>%s</em>"] = "version <em>%s</em>";
+$locale["version <em>%s</em> not affected"] = "version <em>%s</em> non affectée";
+$locale["view the source of this page"] = "voir la source de cette page";
+$locale["view this page"] = "voir cette page";
+$locale["weeks"] = "semaines";
 $locale["yesterday"] =
    "hier";
-$locale["|<<"] =
-   "|<<";
 
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: %C3%89diterLesMetaDonn%C3%A9es 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: %C3%89diterLesMetaDonn%C3%A9es 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=%C3%89diterLesMetaDonn%C3%A9es
   flags=PAGE_LOCKED;
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<EditMetaData >>
+<<EditMetaData>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: %C3%89ditionsR%C3%A9centes 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: %C3%89ditionsR%C3%A9centes 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=%C3%89ditionsR%C3%A9centes;
   flags=PAGE_LOCKED;
@@ -8,10 +8,13 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-Voici une liste des pages récemment éditées sur ce wiki. __Toutes__ les 
-modifications __mineures__ sont montrées, et pas uniquement les plus 
+Voici une liste des pages récemment éditées sur ce wiki. **Toutes** les 
+modifications **mineures** sont montrées, et pas uniquement les plus 
 récentes (voir DernièresModifs pour les modifications non-mineures les 
 plus récentes).
 
 --------
-<<RecentChanges days||=3 show_all||=1 show_minor=1 daylist=1,3,7,30,90,0 >>
+<<RecentChanges days||=3 show_all||=1 show_minor=1 daylist=1,3,7,30,90,0>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Fri,  4 Feb 2011 16:36:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AdministrationDePhpWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AdministrationDePhpWiki 7927 2011-02-04 15:37:59Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki;
   flags=PAGE_LOCKED;
@@ -13,7 +13,7 @@
 nom d'administrateur et un mot de passe dans le fichier de configuration de 
 PhpWiki_
 
-<<CreateToc jshide||=1 with_toclink||=1 >>
+<<CreateToc jshide||=1 with_toclink||=1>>
 
 ----
 == Explorateur de pages
@@ -24,14 +24,8 @@
 
 ou appelez directement les actions ~WikiAdmin disponibles :
 
-[/Supprimer] |
-  [/Renommer] |
-    [/Remplacer] |
-      [/DéfinirAcl] |
-        [/Chown] |
-          [/Droits]
+| [[/Supprimer]] | [[/Renommer]] | [[/Remplacer]] | [[/DéfinirAcl]] | [[/Chown]] | [[/Droits]]
 
-----
 == Gestionnaire d'utilisateur
 
 PhpWiki:EmailVerification est habituellement non-strict laissant ainsi des trous possibles qui peuvent être administrés ci-dessous.
@@ -41,14 +35,14 @@
   <<WikiAdminUtils
            action=email-verification
            label="Vérification de l'email"
-   >>
+  >>
 
 Pour prévenir des robots occupant toutes les ressources en un court temps, bloquant depuis certaines adresses IP ou ayant un mauvais comportement, les agents utilisateurs peuvent être définis ci-dessous. Voir PhpWiki:HowToBlockRobots et MeatBall:SurgeProtector. _Note : Pas encore activé._
 
   <<WikiAdminUtils
            action=access-restrictions
            label="Restrictions d'accès"
-   >>
+  >>
 
 ----------
 == Nettoyage
@@ -65,7 +59,7 @@
 
 Ces liens mènent à des fichiers compressés au format ZIP, générés à la volée et contenant toutes les pages de votre Wiki. Le fichier zip sera téléchargé sur votre ordinateur.
 
-Cette __[Sauvegarde ZIP | phpwiki:?action=zip]__ ne contient que la dernière version de chaque page, tandis que cet __[Archivage ZIP | phpwiki:?action=zip&include=all]__ contient toutes les versions archivées.
+Cette **[Sauvegarde ZIP | phpwiki:?action=zip]** ne contient que la dernière version de chaque page, tandis que cet **[Archivage ZIP | phpwiki:?action=zip&include=all]** contient toutes les versions archivées.
 
 Si le PhpWiki est configuré pour le permettre, n'importe qui peut télécharger un fichier zip.
 
@@ -111,11 +105,11 @@
 
 === Anciens formats
 
-__Fichiers sérialisés__
+**Fichiers sérialisés**
 
 La commande de sauvegarde dans un répertoire récupérait les pages en tant que chaînes php ''serialized()''. Cela rendait les fichiers très difficiles à lire pour les humains, et presque impossibles à éditer.
 
-__Fichiers simples__
+**Fichiers simples**
 
 Avant cela, le texte des pages était simplement enregistré dans un fichier -- ce qui signifie que toutes les métadonnées des pages étaient perdues. Notez que lorsqu'on charge des ''fichiers simples'', le nom de la page est déduit du nom du fichier.
 
@@ -129,7 +123,7 @@
 
 Ceci génèrera un répertoire de pages statiques convenables pour une distribution sur disque où des serveurs web ne sont pas disponible. Les liens variés pour les fonctions d'édition et de navigation sont enlevés de ces pages.
 
-La collection de fichiers XHTML peut aussi être téléchargée comme une __[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]__.
+La collection de fichiers XHTML peut aussi être téléchargée comme une **[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]**.
 
 ----
 
@@ -149,7 +143,7 @@
   <<WikiAdminUtils
            action=purge-cache
            label="Purge du cache"
-   >>
+  >>
 
 === Suppression des pages vides et non référencées
 
@@ -159,7 +153,7 @@
  <<WikiAdminUtils
            action=purge-empty-pages
            label="Purge all empty unreferenced pages"
-   >>
+  >>
 
 === Suppression des pages indésirables dans la base des données wiki
 
@@ -169,7 +163,7 @@
   <<WikiAdminUtils
            action=purge-bad-pagenames
            label="Nettoyage de WikiDB"
-   >>
+  >>
 
 ----
 [[DocumentationDePhpWiki]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AdministrationDePhpWiki%2FChown 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AdministrationDePhpWiki%2FChown 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki%2FChown;
   flags=PAGE_LOCKED;
@@ -8,5 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<WikiAdminChown >>
+<<WikiAdminChown>>
 
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AdministrationDePhpWiki%2FD%C3%A9finirAcl 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AdministrationDePhpWiki%2FD%C3%A9finirAcl 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki%2FD%C3%A9finirAcl;
   flags=PAGE_LOCKED;
@@ -8,5 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<WikiAdminSetAcl >>
+<<WikiAdminSetAcl>>
 
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AdministrationDePhpWiki%2FDroits 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AdministrationDePhpWiki%2FDroits 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki%2FDroits;
   flags=PAGE_LOCKED;
@@ -8,5 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<WikiAdminChmod >>
+<<WikiAdminChmod>>
 
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id: AdministrationDePhpWiki%2FRechercherRemplacer$
 Content-Type: application/x-phpwiki;
@@ -9,3 +9,6 @@
 Content-Transfer-Encoding: binary
 
 <<WikiAdminSearchReplace>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AdministrationDePhpWiki%2FRenommer 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AdministrationDePhpWiki%2FRenommer 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki%2FRenommer;
   flags=PAGE_LOCKED;
@@ -8,5 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<WikiAdminRename >>
+<<WikiAdminRename>>
 
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AdministrationDePhpWiki%2FSupprimer 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AdministrationDePhpWiki%2FSupprimer 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AdministrationDePhpWiki%2FSupprimer;
   flags=PAGE_LOCKED;
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<WikiAdminRemove >>
+<<WikiAdminRemove>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:32:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 Content-Type: application/x-phpwiki;
   pagename=Aide;
@@ -6,4 +6,11 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<ListSubpages >>
+Les **pages d'aide** suivantes sont disponibles.
+
+<<ListSubpages cols||=3 sortby||=pagename noheader||=1 limit=1000 >>
+
+<noinclude>
+----
+[[PhpWikiDocumentation]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FAjouterDesPages
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FAjouterDesPages	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FAjouterDesPages	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 10:22:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FAjouterDesPages 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FAjouterDesPages 7915 2011-01-27 09:24:46Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FAjouterDesPages;
   flags="";
@@ -28,5 +28,8 @@
 
 Notez qu'il existe une fonctionnalité que votre administrateur système peut valider 
 pour autoriser le HTML incorporé, mais cela implique des risques de sécurité.
+
+<noinclude>
 ----
 [[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue,  4 Jan 2011 11:58:32 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FAnciennesR%C3%A8glesDeFormatage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FAnciennesR%C3%A8glesDeFormatage 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FAnciennesR%C3%A8glesDeFormatage;
   flags=PAGE_LOCKED;
@@ -9,13 +9,13 @@
 
 ! Description
 
-__Emphases :__ '____' pour ''italiques'', _''''_ pour __gras__, '____'_''''_ pour ''__les deux__''.%%%
-__Listes :__ * pour les listes pointées, # pour les listes numérotées, ''__;__ terme __:__ définition'' pour les listes de définition.%%%
-__Références :__ !CollerLesMotsAvecMajuscules ou utiliser les crochets pour une [[page liée] ou une URL [[!http://cool.wiki.int/].%%%
-__Notes de bas de page :__ Utiliser [[1],[[2],[[3],...%%%
-__Empêcher les liens :__ Préfixez avec "!" : !!NePasLier, nom de lien tel que [[[[texte | URL] (doubler sur le "[").%%%
-__Divers :__ "!", "!!", "!!!" créer des en-têtes, "%%''''%" change de ligne, "-''''-''''-''''-" fait un trait horizontal.%%%
-__Tables:__ »|« comme premier caractère, »|« pour plus de colonnes, »|>« aligne à droite, »|<« aligne à gauche, »|^« centre (par défaut), »||« développe des colonnes, »|v« développe des lignes
+**Emphases :** '****' pour ''italiques'', _''''_ pour **gras**, '****'_''''_ pour ''**les deux**''.%%%
+**Listes :** * pour les listes pointées, # pour les listes numérotées, ''**;** terme **:** définition'' pour les listes de définition.%%%
+**Références :** !CollerLesMotsAvecMajuscules ou utiliser les crochets pour une [[page liée] ou une URL [[!http://cool.wiki.int/].%%%
+**Notes de bas de page :** Utiliser [[1],[[2],[[3],...%%%
+**Empêcher les liens :** Préfixez avec "!" : !!NePasLier, nom de lien tel que [[[[texte | URL] (doubler sur le "[").%%%
+**Divers :** "!", "!!", "!!!" créer des en-têtes, "%%''''%" change de ligne, "-''''-''''-''''-" fait un trait horizontal.%%%
+**Tables:** »|« comme premier caractère, »|« pour plus de colonnes, »|>« aligne à droite, »|<« aligne à gauche, »|^« centre (par défaut), »||« développe des colonnes, »|v« développe des lignes
 
 ! Paragraphes
 
@@ -57,9 +57,9 @@
 
 ! Emphases
 
-* utiliser des apostrohes simples doublés ('____') pour l'emphase (habituellement ''italique'')
-* utiliser des underscores doublés (_''''_) pour l'emphase forte (habituellement __gras__)
-* mélanger les deux donne : __''italique gras''__
+* utiliser des apostrohes simples doublés ('****') pour l'emphase (habituellement ''italique'')
+* utiliser des underscores doublés (_''''_) pour l'emphase forte (habituellement **gras**)
+* mélanger les deux donne : **''italique gras''**
 * les emphases peut être utilisé plusieurs fois dans une ligne mais ne fonctionnent pas sur plusieurs lignes :
 
 ''ceci
@@ -79,20 +79,20 @@
 
 ! Tableaux
 
-* Les tableaux simples sont disponibles. Un ligne est introduite par __|__ dans la première colonne. C'est mieux décrit par un exemple :
+* Les tableaux simples sont disponibles. Un ligne est introduite par **|** dans la première colonne. C'est mieux décrit par un exemple :
         ||^  *Identité*            |v *Prix*       |v *Notes*
         | *Prénom*     | *Nom*
         |> Jeff        |< Dairiki   |^ Bon marché   |< Sans valeur
         |> Marco       |< Polo      |  Moins cher   |< Pas disponible
 ;: donnera
 
-||^  __Identité__             |v __Prix__       |v __Notes__
-| __Prénom__     | __Nom__
+||^  **Identité**             |v **Prix**       |v **Notes**
+| **Prénom**     | **Nom**
 |> Jeff        |< Dairiki   |^ Bon marché   |< Sans valeur
 |> Marco       |< Polo      |  Moins cher   |< Pas disponible
 
 
-;: Remarquez que plusieurs __|__ conduisent à des colonnes étendues et que des __v__ peuvent être utilisés pour étendre des lignes. Un __>__ engendre une colonne justifiée à droite, __<__ une colonne justifiée à gauche et __^__ une colonne centrée (position par défaut).
+;: Remarquez que plusieurs **|** conduisent à des colonnes étendues et que des **v** peuvent être utilisés pour étendre des lignes. Un **>** engendre une colonne justifiée à droite, **<** une colonne justifiée à gauche et **^** une colonne centrée (position par défaut).
 ;: Avec les nouvelles RèglesDeFormatageDesTextes, vous devez utiliser PluginTableauAncienStyle pour insérer un tableau de l'ancien style.
 
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 10:22:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FCommentUtiliserUnWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FCommentUtiliserUnWiki 7915 2011-01-27 09:24:46Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FCommentUtiliserUnWiki;
   flags="";
@@ -9,12 +9,12 @@
 
 ''"Wiki wiki"'' signifie "vite" en hawaïien.
 
-__Ce qu'il est suffisant de savoir :__
+**Ce qu'il est suffisant de savoir :**
 
 * Pour éditer n'importe quelle page autorisée, cliquez sur le lien Éditer au bas de la page. Vous devriez faire cela tout de suite et lire le code source de cette page, cela aura plus de sens.
 * Vous obtenez de l'italique en encadrant les mots par des paires d'apostrophes ''comme ceci''.
-* Vous obtenez du __texte en gras__ en utilisant deux symboles souligné (underscore) de chaque côté.
-* Et l'__''italique gras''__ en combinant les deux.
+* Vous obtenez du **texte en gras** en utilisant deux symboles souligné (underscore) de chaque côté.
+* Et l'**''italique gras''** en combinant les deux.
 * Vous aurez des puces en utilisant un astérisque * en début de ligne.
 * Pour avoir une police à chasse fixe, indentez avec une espace :
 
@@ -34,12 +34,15 @@
 ---------
 * Pour créer des hyperliens, vous n'avez qu'à capitaliser les initiales des mots et les coller ensemble. Supposons que vous voulez créer une page sur la façon dont Steve Wainstead mange des vers, alors vous mettez les initiales en majuscules et collez les mots ensemble comme ceci : SteveWainsteadMangeDesVersVivants. Si la page n'existe pas encore, un point d'interrogation apparaît après le lien, vous invitant à créer cette page : CettePageNeDevraitPasExister (et s'il-vous-plaît, ne détruisez pas l'exemple en la créant).
 * Pour lier des pages hors du Wiki, vous pouvez simplement taper l'URL et Wiki créera le lien pour vous : http://www.lemonde.fr/
-* Pour insérer des images, fournissez juste le lien entre crochets comme ceci : __[[!http://www.votremachine.votredomaine/images/photo.png]__. Les URL d'image qui ne sont pas entre crochets apparaissent juste comme des hyperliens vers l'image.
-* Maintenant vous êtes prêt pour AjouterDesPages.
+* Pour insérer des images, fournissez juste le lien entre crochets comme ceci : **[[!http://www.votremachine.votredomaine/images/photo.png]**. Les URL d'image qui ne sont pas entre crochets apparaissent juste comme des hyperliens vers l'image.
+* Maintenant vous êtes prêt pour [[Aide:AjouterDesPages|AjouterDesPages]].
 
 ----
-Un WikiWikiWeb est conçu pour être édité vite et facilement. Il dispose d'un marquage très simple décrit dans RèglesDeFormatageDesTextes.
+Un [[Aide:WikiWikiWeb|WikiWikiWeb]] est conçu pour être édité vite et facilement. Il dispose d'un marquage très simple décrit dans [[Aide:RèglesDeFormatageDesTextes|RèglesDeFormatageDesTextes]].
 ----
-Si vous n'aimez pas la taille de la fenêtre d'édition de texte que vous obtenez, vous pouvez la changer. Voir PréférencesUtilisateurs.
+Si vous n'aimez pas la taille de la fenêtre d'édition de texte que vous obtenez, vous pouvez la changer. Voir [[PréférencesUtilisateurs]].
+
+<noinclude>
 ----
 [[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPhpWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPhpWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPhpWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 10:22:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id: Aide%2FPhpWiki$
 Content-Type: application/x-phpwiki;
@@ -8,11 +8,13 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-Vous utilisez PhpWiki en ce moment même. Incroyable, n'est-ce pas ?
+Vous utilisez ~PhpWiki en ce moment même. Incroyable, n'est-ce pas ?
 
-Visitez notre page d'accueil (en anglais) sur http://phpwiki.sourceforge.net/
-et voyez PhpWiki en action sur http://phpwiki.sourceforge.net/phpwiki/
+Visitez notre page d'accueil (en anglais) sur [[http://phpwiki.sourceforge.net/]]
+et voyez ~PhpWiki en action sur [[http://phpwiki.sourceforge.net/phpwiki/]]
 (et bien sûr, ici aussi :-)).
 
+<noinclude>
 ----
 [[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPlugin%C3%89diterMetaData 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPlugin%C3%89diterMetaData 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPlugin%C3%89diterMetaData;
   flags="";
@@ -15,8 +15,13 @@
 
 Éditer les métadonnées pour la page d'accueil devrait ressembler à :
 ------
-<<EditMetaData page="PageAccueil" >>
+<<EditMetaData page="PageAccueil">>
 ------
 Sans argument, la page par défaut est la page courante :
 ------
-<<EditMetaData >>
+<<EditMetaData>>
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 17:50:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginAlbumPhotos 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginAlbumPhotos 7879 2011-01-25 17:01:33Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginAlbumPhotos;
   flags="";
@@ -32,7 +32,7 @@
 
 ''='src'= est le seul paramètre obligatoire.''
 
-__src__:
+**src**:
   Url ou chemin local pour un fichier CSV où chaque ligne est un nom de 
   fichier de photo et une description de la photo. Les photos sont dans le 
   même répertoire que le fichier. Les descriptions sont facultatives. Si
@@ -40,25 +40,25 @@
   principal est dans PHPWIKI_DIR, alors la localisation des fichiers ne 
   doit pas être donnée et toutes les images du répertoire sont affichées.
 
-__weblocation__:
+**weblocation**:
   Chemin optionnel si les sources pointent vers un répertoire local et 
   que les liens vers les photos ne fonctionnent pas.
 
-__mode__:
+**mode**:
   Spécifie comment les images sont rangées : ='column'= signifie 
   verticalement, ='row'= signifie horizontalement . Par défaut : ='row'=.
 
-__align__:
+**align**:
   Seulement applicable au mode colonne. Par défaut : ='center'=.
 
-__desc__:
+**desc**:
   Affiche les descriptions données dans le fichier. Vrai par défaut.
 
-__sort__:
+**sort**:
   Tri les images par nom de fichier. Par défaut, c'est l'ordre dans le 
   fichier texte qui est suivi.
 
-__height__, __width__:
+**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%").
@@ -90,5 +90,7 @@
 
 [Ted Vinke|mailto:teddy at jouwfeestje.com] <teddy at jouwfeestje.com>
 
+<noinclude>
 ----
-[[DocumentationDePhpWiki]] [[CategoryPluginWiki]]
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginBeauTableau
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginBeauTableau	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginBeauTableau	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 17:50:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginBeauTableau 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginBeauTableau 7879 2011-01-25 17:01:33Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginBeauTableau;
   flags="";
@@ -116,5 +116,7 @@
 
 http://www.it.iitb.ac.in/~sameerds/phpwiki/index.php/RichTablePlugin
 
+<noinclude>
 ----
-[[CategoryPluginWiki]]
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginBonjourLeMonde 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginBonjourLeMonde 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginBonjourLeMonde;
   flags="";
@@ -10,12 +10,12 @@
 
 Un simple exemple de plugin :
 
-<<HelloWorld salutation="Bonjour," name="UtilisateurWiki" >>
+<<HelloWorld salutation="Bonjour," name="UtilisateurWiki">>
 
 Depuis la source de cette page :
 
 {{{
-<<HelloWorld salutation="Bonjour," name="UtilisateurWiki" >>
+<<HelloWorld salutation="Bonjour," name="UtilisateurWiki">>
 }}}
 
 -----
@@ -78,6 +78,7 @@
 };
 >>
 
+<noinclude>
 ----
-
-[[CategoryPluginWiki]]
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCalendrier
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCalendrier	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCalendrier	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginCalendrier 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginCalendrier 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginCalendrier;
   flags=PAGE_LOCKED;
@@ -28,11 +28,11 @@
 
 === Sélection du Mois
 
-__year__ |
+**year** |
   spécifie l'année du calendrier (l'année actuelle par défaut)
-__month__ |
+**month** |
   spécifie le mois du calendrier (le mois actuel par défaut)
-__month_offset__ |
+**month_offset** |
   ajouté au ''mois''. Peut être utilisé pour inclure l'équivalent de plusieurs mois sur une seule page du wiki.
 
 Le calendrier suivant affiche systématiquement le mois suivant le mois courant :
@@ -41,27 +41,29 @@
 
 === Nom de la "Page du Jour"
 
-__date_format__ |
+**date_format** |
   [Strftime| php-function:strftime] format de la chaîne utilisée pour générer le nom des pages pour les "pages du jour". La valeur par défaut est =%Y-%m-%d=.
-__prefix__ | 
+**prefix** | 
   Préfixe pour la date (formatée par ''date_format'') pour générer les noms des "pages du jour". La valeur par défaut est =~[pagename]/=.
 
 === Apparence
 
-__month_format__ |
+**month_format** |
   [Strftime| php-function:strftime] format de la chaîne utilisée pour générer le titre du calendrier. La valeur par défaut est =%B, %Y=.
-__wday_format__ |
+**wday_format** |
   [Strftime| php-function:strftime] format de la chaîne utilisée pour générer le nom des jours de la semaine au-dessus du calendrier.
-__start_wday__ |
+**start_wday** |
   Le premier jour de la semaine. Il doit être spécifié par un entier de zéro (dimanche) à six (samedi) inclus.
 
 Par exemple, le calendrier suivant commence les semaines le lundi :
 
-<<Calendar start_wday=1 >>
+<<Calendar start_wday=1>>
 
 == Auteur
 
 Cette fonctionnalité a été inspirée par [Manila|http://manila.userland.com/], et a été tout d'abord implémentée par Gary Benson. Elle fut par la suite implémentée sous forme de PluginWiki par JeffDairiki.
 
+<noinclude>
 ----
-[[DocumentationDePhpWiki]] [[CategoryPluginWiki]]
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginColorationPhp
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginColorationPhp	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginColorationPhp	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 17:50:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginColorationPhp 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginColorationPhp 7879 2011-01-25 17:01:33Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginColorationPhp;
   flags="";
@@ -108,5 +108,7 @@
 Martin Geisler mailto:gimpster at gimpster.com et Carsten Klapp
 mailto:carstenklapp at users.sourceforge.net.
 
+<noinclude>
 ----
-[[CategoryPluginWiki]]
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCommenter
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCommenter	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCommenter	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 17:50:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginCommenter 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginCommenter 7879 2011-01-25 17:01:33Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginCommenter;
   flags="";
@@ -43,5 +43,7 @@
 
 >>
 
+<noinclude>
 ----
-[[CategoryPluginWiki]]
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 17:50:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginCr%C3%A9erUnePage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginCr%C3%A9erUnePage 7879 2011-01-25 17:01:33Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginCr%C3%A9erUnePage;
   flags="";
@@ -27,11 +27,11 @@
 }}}
 
 ===Arguments
-__s__: |
+**s**: |
   Le nom de la page qui sera passé au plugin. Par défaut : ""
-__initial_content__:  |
+**initial_content**:  |
   La nouvelle page sera pré-remplie avec ce contenu. Par défaut : "" 
-__template__:  |
+**template**:  |
   La nouvelle page sera pré-remplie avec ce contenu de cette page. Par défaut : "" 
 
 
@@ -49,3 +49,8 @@
 <?plugin-form CreatePage s=MaPagePersonnelle ?>
 
 Voir aussi PhpWiki:EasilyCreateNewPages
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginCr%C3%A9erUneTdm 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginCr%C3%A9erUneTdm 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginCr%C3%A9erUneTdm;
   flags="";
@@ -8,7 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<CreateToc jshide||=1 >>
+<<CreateToc jshide||=1>>
 
 ===Descrition
 
@@ -18,25 +18,25 @@
 ===Usage
 
 {{{
-     <<CreateToc >>
-     <<CreateToc jshide||=1 with_toclink||=1 >>
+     <<CreateToc>>
+     <<CreateToc jshide||=1 with_toclink||=1>>
 }}}
 
 ===Arguments
 
-__jshide__: |
+**jshide**: |
   Booléen si la table doit être initialement cachée puis montrée par un clique. Par défaut : 0
-__with_toclink__:  |
+**with_toclink**:  |
   Booléen si les en-têtes doivent être liés à la table. Par défaut : 0
-__headers__:  |
+**headers**:  |
   Quels en-têtes inclure. Par défaut : ==,===,!    1,2,3 également permis
-__noheader__:  |
+**noheader**:  |
   Booléen si le titre h2 "Table des matières" doit être omis. Par défaut : 0
-__liststyle__:  |
+**liststyle**:  |
   dl ou ol ou ul. Par défaut : dl
-__indentstr__:  |
+**indentstr**:  |
   Par défaut :   
-__pagename__:  |
+**pagename**:  |
   Table pour quelle page ? Par défaut : page courante.
 
 ===Problèmes connus
@@ -47,3 +47,8 @@
 ===Exemples
 
 Voir par exemple PhpWikiDemo:en/TextFormattingRules
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginHistoriqueAuteur 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginHistoriqueAuteur 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginHistoriqueAuteur;
   flags="";
@@ -12,11 +12,16 @@
 Vous pouvez aussi bien spécifier le nom de la page (page courante par défaut).
 
 {{{
-<<AuthorHistory user="test" >>
+<<AuthorHistory user="test">>
 
-<<AuthorHistory page=HomePage >>
+<<AuthorHistory page=HomePage>>
 }}}
 
 Le second exemple aura la page courante par défaut. Nous ne pouvons vous fournir 
 d'autres exemples puisque nous ne connaissons par les noms d'utilisateurs potentiels
 de votre wiki.
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginHtmlPur
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginHtmlPur	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginHtmlPur	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 17:50:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginHtmlPur 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginHtmlPur 7879 2011-01-25 17:01:33Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginHtmlPur;
   flags="";
@@ -48,3 +48,8 @@
 </tr>
 </table>
 >>
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginInclureUnCadre 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginInclureUnCadre 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginInclureUnCadre;
   flags="";
@@ -19,17 +19,20 @@
 Exemples: pour inclure une page depuis un autre site, utilisez l'argument <b>src</b> :
 
 {{{
-<<FrameInclude src="http://phpwiki.org/" >>
+<<FrameInclude src="http://phpwiki.org/">>
 }}}
 
 Pour inclure une page depuis ce wiki, utilisez l'argument <b>page</b> :
 
 {{{
-<<FrameInclude page=PageAccueil >>
+<<FrameInclude page=PageAccueil>>
 }}}
 
 Pour plus d'informations sur ce plugin, lisez s'il vous plaît, la source
 PHP dans le répertoire /lib/plugin.
 
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>
 
-

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnePage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnePage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnePage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 18:00:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginInclureUnePage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginInclureUnePage 7919 2011-01-27 17:02:14Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginInclureUnePage;
   flags="";
@@ -14,13 +14,18 @@
 PluginInclureUnCadre. Par exemple, les lignes suivantes :
 
 {{{
-<<IncludePage page="PageAccueil" >>
+<<IncludePage page="PageAccueil">>
 
-<<IncludePage page="WabiSabi" >>
+<<IncludePage page="Aide/WabiSabi">>
 }}}
 
 donne :
 
-<<IncludePage page="PageAccueil" >>
+<<IncludePage page="PageAccueil">>
 
-<<IncludePage page="WabiSabi" >>
+<<IncludePage page="Aide/WabiSabi">>
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginInfosSyst%C3%A8me 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginInfosSyst%C3%A8me 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginInfosSyst%C3%A8me;
   flags="";
@@ -16,14 +16,19 @@
 ===Usage
 
 {{{
- Usage:  <<SystemInfo all >>
-      ou <<SystemInfo pagestats cachestats discspace hitstats >>
-      ou <<SystemInfo version >>
-      ou <<SystemInfo current_theme >>
-      ou <<SystemInfo PHPWIKI_DIR >>
+ Usage:  <<SystemInfo all>>
+      ou <<SystemInfo pagestats cachestats discspace hitstats>>
+      ou <<SystemInfo version>>
+      ou <<SystemInfo current_theme>>
+      ou <<SystemInfo PHPWIKI_DIR>>
 }}}
 
 
 ===Exemple
 
-<<SystemInfo all >>
+<<SystemInfo all>>
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginIns%C3%A9rer 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginIns%C3%A9rer 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginIns%C3%A9rer;
   flags="";
@@ -42,9 +42,14 @@
 ==== Exemple
 
 {{{
-<<Transclude src="http://phpwiki.sourceforge.net/demo/ChangeLog" >>
+<<Transclude src="http://phpwiki.sourceforge.net/demo/ChangeLog">>
 }}}
 
 donne
 
-<<Transclude src="http://phpwiki.sourceforge.net/demo/ChangeLog" >>
+<<Transclude src="http://phpwiki.sourceforge.net/demo/ChangeLog">>
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginListeDesSousPages 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginListeDesSousPages 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginListeDesSousPages;
   flags="";
@@ -24,49 +24,49 @@
 === Usage
 
 {{{
-     <<UnfoldSubpages >>
-  ou <<UnfoldSubpages sortby=-mtime words=50 maxpages=5 >>
-  ou <<UnfoldSubpages quiet=1 smalltitle=1 >>
-  ou <<UnfoldSubpages sections=2 words=100 >>
-  ou <<UnfoldSubpages lines=3 >>
+     <<UnfoldSubpages>>
+  ou <<UnfoldSubpages sortby=-mtime words=50 maxpages=5>>
+  ou <<UnfoldSubpages quiet=1 smalltitle=1>>
+  ou <<UnfoldSubpages sections=2 words=100>>
+  ou <<UnfoldSubpages lines=3>>
   ou <<UnfoldSubpages pagename="AdministrationDePhpWiki" 
-              section="Arguments" sectionhead=1 >>
+              section="Arguments" sectionhead=1>>
 }}}
 
 ===Arguments
 
-__pagename__:
+**pagename**:
   Un nom de page ou le page courante lorsque le nom est vide : Par défaut : ""
-__quiet__:
+**quiet**:
   N'affiche pas d'en-tête. Par défaut : false
-__sortby__:
+**sortby**:
   Trier par + (ASC) ou - (DESC) et sur une colonne. Multiples colonnes comme 
   sortby="-hits,-mtime" pas encore implémenté. colonnes acceptées : 
   ~[+|-]pagename, ~[+|-]mtime, ~[+|-]hits. Par défaut : "pagename"
-__maxpages__:
+**maxpages**:
   Nombre maximum de pages à inclure ou toutes lorsque ce n'est précisé. Par 
   défaut : false
-__sections__:
+**sections**:
   Nombre maximum de parties par pages à inclure toutes lorsque ce n'est précisé.
   Par défaut : false
-__section__:
+**section**:
   Inclure cette section par page seulement lorsque c'est défini. Par défaut : false
-__sectionhead__:
+**sectionhead**:
   Montre l'en-tête lorsqu'on inclus une partie nommée. Par défaut : false
-__smalltitle__:
+**smalltitle**:
   Si c'est validé, cache le titre d'importation, affiche seulement un petit lien
   au début de la page. Par défaut : false
-__words__:
+**words**:
   Nombre maximum de mots par pages à inclure. Par défaut : false
-__lines__:
+**lines**:
   Nombre maximum de lignes par pages à inclure. Par défaut : false
-__bytes__:
+**bytes**:
   Nombre maximum d'octets par pages à inclure. Par défaut : false
 
 ===Arguments obsolètes
-__pages__:
+**pages**:
   obsolète, renommé en maxpages
-__sort__:
+**sort**:
   'asc' ou 'desc'. Obsolète : utiliser "+" ou "-" avant le nom de la 
   colonne avec sortby.
 
@@ -75,10 +75,14 @@
 La ligne
 
 {{{
-<<UnfoldSubpages pagename=AdministrationDePhpWiki >>
+<<UnfoldSubpages pagename=AdministrationDePhpWiki>>
 }}}
 
 affiche toutes les pages qui dépendent de AdministrationDePhpWiki :
 
-<<UnfoldSubpages pagename=AdministrationDePhpWiki >>
+<<UnfoldSubpages pagename=AdministrationDePhpWiki>>
 
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginListeDuCalendrier 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginListeDuCalendrier 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginListeDuCalendrier;
   flags="";
@@ -20,20 +20,19 @@
 sous le calendrier.
 
 {{{
-<<Calendar >>
-<<CalendarList >>
+<<Calendar>>
+<<CalendarList>>
 }}}
 
 ===Exemple
 
 Cliquez sur une date, éditer puis revenir sur cette page :
 
-<<Calendar >>
+<<Calendar>>
 
-<<CalendarList >>
+<<CalendarList>>
 
+<noinclude>
 ----
-
-[[CategoryPluginWiki]]
-
-
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginM%C3%A9t%C3%A9oPhp 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginM%C3%A9t%C3%A9oPhp 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginM%C3%A9t%C3%A9oPhp;
   flags="";
@@ -14,57 +14,57 @@
 pour afficher un bout de texte avec la météo actuelle pour n'importe quel aéroport
 dans le monde. Cela ressemble à ça :
 
-<<PhpWeather menu=true >>
+<<PhpWeather menu=true>>
 
 ===Arguments 
 
-__menu__:
+**menu**:
   Mettre ceci sur =true= pour que le plugin affiche un menu après le 
   rapport. L'utilisateur pourra sélectionner un pays à partir de ce menu
   et, après ça, un aéroport et une langue. La valeur par défaut est 
   <tt>false</tt>.  
 
-__icao__:
+**icao**:
   Utilisez ceci pour pré-sélectionner un aéroport spécifique à la place
   de l'aéroport par défaut qui est <tt>EKAH</tt>. Si vous voulez que
   l'utilisateur puisse changer la station en utilisant le menu alors
   lancer le plugin comme ceci : 
   {{{
-  <<PhpWeather menu=true icao||=EKYT >>
+  <<PhpWeather menu=true icao||=EKYT>>
   }}}
   de telle sorte que la valeur peut être ré-écrite lorsque l'utilisateur
   soumet le formulaire. Si vous mettez seulement :
   {{{
-  <<PhpWeather menu=true icao=EKYT >>
+  <<PhpWeather menu=true icao=EKYT>>
   }}}
   alors rien ne se produira lorsque l'utilisateur sélectionnera une autre 
   station depuis la liste.
  
-__cc__:
+**cc**:
   Spécifie le code du pays (country code). Vous pouvez l'utiliser si vous 
   souhaitez pré-sélectionner un pays différent de celui spécifié dans le 
   ICAO. Ainsi :  
   {{{
-  <<PhpWeather menu=true cc||=GB icao||=KTTS >>
+  <<PhpWeather menu=true cc||=GB icao||=KTTS>>
   }}}
   affichera la météo courante à NASA Shuttle Facility, États-Unis
   (<tt>KTTS</tt>) et en même temps donnera à l'utilisateur une liste des 
   stations du Royaume Uni. Comme l'exemple le montre vous devriez utiliser
-  <tt>cc||=XX</tt> en le combinant avec __menu__ mis sur <tt>true</tt>.
+  <tt>cc||=XX</tt> en le combinant avec **menu** mis sur <tt>true</tt>.
 
-__language__:
-  La langue par défaut. Quand vous combinez __language__ avec __menu__
+**language**:
+  La langue par défaut. Quand vous combinez **language** avec **menu**
   mis sur <tt>true</tt> alors souvenez-vous d'utiliser la forme 
   <code>language||=xx</code>.
 
-__units__:
+**units**:
   Vous pouvez spécifer le manière dont les unités seront affichées. Le choix
   se fait sur la possibilité d'avoir les deux unités (métriques ou impériales)
-  ou juste l'un d'entres elles. Mettant __units__ sur =both_metric= affichera
+  ou juste l'un d'entres elles. Mettant **units** sur =both_metric= affichera
   la valeur métrique d'abord et ensuite l'impériale entre parenthèses.
-   __units__ sur =both_imperial= fait exactement l'inverse.
+   **units** sur =both_imperial= fait exactement l'inverse.
 
-  Si vous voulez l'une ou l'autre seulement alors mettez  __units__ sur 
+  Si vous voulez l'une ou l'autre seulement alors mettez  **units** sur 
   =only_metric= ou =only_imperial= et ça le fera.
 
 ===Exemple
@@ -78,5 +78,7 @@
 et qui est actuellement :
 <<PhpWeather cc=FR icao=LFRN language=fr units=only_metric>>
 
+<noinclude>
 ----
-[[CategoryPluginWiki]]
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRechercheExterne
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRechercheExterne	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRechercheExterne	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 18:00:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginRechercheExterne 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginRechercheExterne 7919 2011-01-27 17:02:14Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginRechercheExterne;
   flags=PAGE_LOCKED;
@@ -8,11 +8,9 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-=== Descrition
+Le plugin **~RechercheExterne** crée un formulaire pour interroger les
+~InterWikis ou autres sites Internet.
 
-Le PluginRechercheExterne crée un formulaire pour interroger les
-InterWiki~s ou autres sites Internet.
-
 === Usage
 
 {{{
@@ -24,21 +22,21 @@
 
 
 === Arguments
-__url__:
-  Spécifie un wiki depuis la CarteInterWiki ou une url. N'importe quel
+**url**:
+  Spécifie un wiki depuis la [[CarteInterWiki]] ou une URL. N'importe quel
   texte saisi par l'utilisateur sera ajouté à l'url de recherche. La 
-  chaîne '__=%s=__' peut être utilisée pour insérer une requête de 
+  chaîne '**=%s=**' peut être utilisée pour insérer une requête de 
   recherche dans l'url plutôt que de l'ajouter.
 
-__name__:
+**name**:
   Texte à afficher dans le bouton de validation. Pour les sites 
-  InterWiki, c'est le nom wiki par défaut. Pour les autres url, 
+  ~InterWiki, c'est le nom wiki par défaut. Pour les autres url, 
   c'est le texte "External Search" par défaut.
 
-__formsize__:
+**formsize**:
   Spécifie la taille de la zone de saisie (30 caractères par défaut)
 
-__debug__:
+**debug**:
   Ne redirige pas réellement vers le site externe mais affiche juste 
   l'url vers lequel il devrait l'être.
 
@@ -53,18 +51,21 @@
 }}}
 
 Effectue une recherche en texte intégral sur les wiki multiples :
-<<ExternalSearch url="http://sunir.org/apps/meta.pl?" name="Recherche Metawiki" >>
+<<ExternalSearch url="http://sunir.org/apps/meta.pl?" name="Recherche Metawiki">>
 
 Effectue une recherche en texte intégral sur [MeatBall|MeatBall:SiteSearch] wiki:
-<<ExternalSearch url="http://www.usemod.com/cgi-bin/mb.pl?" name="Recherche MeatBall" >>
+<<ExternalSearch url="http://www.usemod.com/cgi-bin/mb.pl?" name="Recherche MeatBall">>
 
 Recherche sur le site web PHP pour une fonction :
-<<ExternalSearch url=php-lookup >>
+<<ExternalSearch url=php-lookup>>
 
 Entre le nom d'une fonction PHP pour voir la page de documentation :
-<<ExternalSearch url=php-function >>
+<<ExternalSearch url=php-function>>
 
 Entre n'importe quel nom de page sur PhpWiki pour arriver sur cette page :
-<<ExternalSearch url=PhpWiki >>
+<<ExternalSearch url=PhpWiki>>
+
+<noinclude>
 ----
-[[DocumentationDePhpWiki]] [[CategoryPluginWiki]]
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRedirection
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRedirection	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRedirection	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginRedirection 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginRedirection 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginRedirection;
   flags="";
@@ -35,9 +35,12 @@
 ce code en haut :
 
 {{{
-<<RedirectTo page="PageAccueil" >>
+<<RedirectTo page="PageAccueil">>
 }}}
 
 Pour voir cet exemple en action, visitez AliasAccueil.
------
-[[DocumentationDePhpWiki]]
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRessourcesRss	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginRessourcesRss	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginRessourcesRss 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginRessourcesRss 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginRessourcesRss;
   flags="";
@@ -21,7 +21,7 @@
 
 {{{
   <<RssFeed>>
-  <<RssFeed url=http://somesite.tld/linktofeed.rss >>
+  <<RssFeed url=http://somesite.tld/linktofeed.rss>>
 }}}
 
 === Arguments
@@ -54,12 +54,12 @@
 * sources ~PhpWikiRss pour PhpWiki:RecentChanges :
 {{{
   <<RssFeed feed=PhpWikiRss description="PhpWiki:RecentChanges"
-	           url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss >>
+	           url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
 }}}
 
 * [PhpWikiDemo:sidebar/]  _Exemple barre verticale_
 
--------------
-
-[[CategoryPluginWiki]]
-
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 17:50:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginTableauAncienStyle 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginTableauAncienStyle 7879 2011-01-25 17:01:33Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginTableauAncienStyle;
   flags="";
@@ -33,31 +33,31 @@
 |> Marco       |< Polo      |  Moins cher   |< Pas disponible
 >>
 
-Remarquez que de multiple __|__ conduisent à des colonnes étendus
-et que des__v__ peuvent être utilisé pour étendre des lignes. Un 
-__>__ engendre une colonne justifiée à droite, __<__ une colonne 
-justifiée à gauche et __^__ une colonne centrée (position par 
+Remarquez que de multiple **|** conduisent à des colonnes étendus
+et que des**v** peuvent être utilisé pour étendre des lignes. Un 
+**>** engendre une colonne justifiée à droite, **<** une colonne 
+justifiée à gauche et **^** une colonne centrée (position par 
 défaut).
 
 ===Arguments
 
-__caption__:
+**caption**:
 
   une chaîne. Par défaut : ""
 
-__border__:
+**border**:
 
   un nombre. Par défaut : 1
 
-__cellspacing__:
+**cellspacing**:
 
   un nombre. Par défaut : 1
 
-__cellpadding__:
+**cellpadding**:
 
   un nombre. Par défaut : 1
 
-__summary__:
+**summary**:
 
   une chaîne. Par défaut : ""
 
@@ -70,3 +70,8 @@
 Utiliser l'ancien style ne devrait pas avoir beaucoup plus de sens puisqu'on 
 ne peut pas inclure d'appels de plugin sur plusieurs lignes en utilisant
 les anciennes règles.
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginTeX2png
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginTeX2png	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginTeX2png	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginTeX2png 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginTeX2png 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginTeX2png;
   flags="";
@@ -16,12 +16,12 @@
 ===Usage
 
 {{{
-<<TeX2png text="$$(a+b)^n=\sum_{k=0}^n{n\choose k}a^k b^{n-k}$$" >>
+<<TeX2png text="$$(a+b)^n=\sum_{k=0}^n{n\choose k}a^k b^{n-k}$$">>
 }}}
 
 donne
 
-<<TeX2png text="$$(a+b)^n=\sum_{k=0}^n{n\choose k}a^k b^{n-k}$$" >>
+<<TeX2png text="$$(a+b)^n=\sum_{k=0}^n{n\choose k}a^k b^{n-k}$$">>
 
 ===Arguments
 
@@ -38,10 +38,10 @@
 expression (comme du texte simple) est refusée : une expression qui n'est
 pas encadrée de dollar n'est pas validée. Elle est remplacée à l'affichage
 par le texte en rouge. Il est malgré tout possible d'afficher du texte
-comme <<TeX2png text="$\textrm{\LaTeX}$" >> en utilisant :
+comme <<TeX2png text="$\textrm{\LaTeX}$">> en utilisant :
 
 {{{
-<<TeX2png text="$\textrm{\LaTeX}$" >>
+<<TeX2png text="$\textrm{\LaTeX}$">>
 }}}
 
 
@@ -50,20 +50,21 @@
 
 ===Exemples
 
-Quelques lettres grecques : <<TeX2png text="$\alpha$" >>, <<TeX2png text="$\beta$" >>, ... et une formule <<TeX2png text="$\sum_{i=1}^n \frac1{i^2}=\frac{\pi^2}{6}$" >> pour tester l'affichage en ligne.
+Quelques lettres grecques : <<TeX2png text="$\alpha$">>, <<TeX2png text="$\beta$">>, ... et une formule <<TeX2png text="$\sum_{i=1}^n \frac1{i^2}=\frac{\pi^2}{6}$">> pour tester l'affichage en ligne.
 
-*Exercice 1* On considère <<TeX2png text="$$f(x)=(x^2-4x+3)^{1/2}$$" >>
+*Exercice 1* On considère <<TeX2png text="$$f(x)=(x^2-4x+3)^{1/2}$$">>
 
 #Déterminer le domaine de définition de f.
-#Déterminer un domaine sur lequel f est bijective. Déterminer la réciproque <<TeX2png text="$f^{-1}(x)$" >> de f sur ce domaine.
+#Déterminer un domaine sur lequel f est bijective. Déterminer la réciproque <<TeX2png text="$f^{-1}(x)$">> de f sur ce domaine.
 #Calculer la dérivée f'(x).
 
 *Exercice 2* On considère la fonction suivante :
 
-<<TeX2png text="$$f(x) = \int_0^x e^{-t^2}\,dt, x\in\mathbb R$$" >>
-#Montrer que pour tout r positif, on a <<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$$" >> *Indication* : passer en coordonnées polaires.
-#En déduire la limite de <<TeX2png text="$f(x)$" >> lorsque x tend <<TeX2png text="vers $\infty$" >>.
+<<TeX2png text="$$f(x) = \int_0^x e^{-t^2}\,dt, x\in\mathbb R$$">>
+#Montrer que pour tout r positif, on a <<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$$">> *Indication* : passer en coordonnées polaires.
+#En déduire la limite de <<TeX2png text="$f(x)$">> lorsque x tend <<TeX2png text="vers $\infty$">>.
 
------
-
-[[DocumentationDePhpWiki]] [[CategoryPluginWiki]]
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 18:00:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginWiki 7919 2011-01-27 17:02:14Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginWiki;
   flags="";
@@ -8,6 +8,21 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
+PhpWiki vous permet d'étendre PhpWiki avec de nouvelles fonctionnalités via
+un mécanisme de plugins. Pour faire bref, vous étendez une classe PHP
+que nous fournissons et vous la personnalisez pour qu'elle affiche le
+contenu que vous voulez. Pour plus d'informations, voyez PluginWiki, 
+PluginBonjourLeMonde, et regardez les sources des fichiers dans lib/plugin.
+
+S'il n'y a pas d'exemple de page pour ce plugin ou que vous souhaitez plus 
+d'informations, le meilleur endroit est la source de ce plugin. Sous le 
+répertoire racine de votre wiki, le dossier lib/plugin contient tous les
+fichiers PHP des plugins.
+
+Certains plugins nécessitent des bibliothèques externes non fournies 
+avec PhpWiki ou PHP comme par exemple la librairie GD pour les 
+graphiques.
+
 PhpWiki supporte les plugins depuis 1.3.x
 
 ~Les plugins Wiki permettent à chacun d'ajouter un nouveau type de contenu
@@ -15,7 +30,7 @@
 dans ce wiki, les DernièresModifs, RétroLiens, PagesSemblables et la plupart
 des autres pages indexées sont toutes implémentées en utilisant les plugins.
 
-À plus ou moins court terme, l'ancien style phpwiki [URLMagiquesPhpWiki] sera
+À plus ou moins court terme, l'ancien style phpwiki [[URLMagiquesPhpWiki]] sera
 remplacé par des plugins également.
 
 == Exemple
@@ -41,7 +56,7 @@
 
 # L'appel du plugin peut spécifier la valeur d'un argument comme ceci :
   {{{
-  <<BackLinks page=OtherPage >>
+  <<BackLinks page=OtherPage>>
   }}}
 
 # L'arguement peut être spécifié via l'argument d'une requête HTTP. Ceci ne 
@@ -49,13 +64,13 @@
   mentionné dans l'appel du plugin : 
 
   {{{
-  <<BackLinks page >>
+  <<BackLinks page>>
   }}}
 
 # Valeurs par défaut spécifiées dans l'appel du plugin :
 
   {{{
-  <<BackLinks page||=OtherPage >>
+  <<BackLinks page||=OtherPage>>
   }}}
 
 # Le plugin remplace les valeurs par défaut pour chaque argument utilisé
@@ -77,7 +92,7 @@
    comme argument par défaut.
 
 {{{
-<<PluginName [args...] >>
+<<PluginName [args...]>>
 }}}
 
 {{{
@@ -98,6 +113,7 @@
 * RechercheEnTexteIntégral : ChercherUnePage
 * RechercheParTitre : PagesSemblables (match_head, match_tail).
 
------
-
-[[DocumentationDePhpWiki]]
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginWikiBlog
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginWikiBlog	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginWikiBlog	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FPluginWikiBlog 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FPluginWikiBlog 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FPluginWikiBlog;
   flags="";
@@ -19,4 +19,9 @@
 une page. Essayez quelques entrées puis jeter un coup d'oeil sur les DernièresModifs
 pour vous faire une idée de la façon dont ça fonctionne.
 
-<<WikiBlog >>
+<<WikiBlog>>
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 18:00:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FR%C3%A8glesDeFormatageDesTextes 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FR%C3%A8glesDeFormatageDesTextes 7919 2011-01-27 17:02:14Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FR%C3%A8glesDeFormatageDesTextes;
   flags=PAGE_LOCKED;
@@ -189,21 +189,22 @@
 
 !!! Créer toute sorte de liens spéciaux
 
-* Voir [URLMagiquesPhpWiki] pour obtenir des détails gores sur la façon d'écrire 
+* Voir [[URLMagiquesPhpWiki]] pour obtenir des détails gores sur la façon d'écrire 
   divers types de liens de maintenance du wiki.
 
 !!! Insérer des plugins
 
 * quelques plugins embarqués dans les pages ajoutent des possibilités au Wiki. Par exemple,
   <verbatim>
-  <<BackLinks page=PageAccueil info=hits >>
+  <<BackLinks page=PageAccueil info=hits>>
   </verbatim>
   donne
-  <<BackLinks page=PageAccueil info=hits >>
+  <<BackLinks page=PageAccueil info=hits>>
 
 * pour plus d'informations sur les plugins, voir PluginWiki, et GestionPlugin pour 
   la liste des plugins.
 
+<noinclude>
 ----
-
 [[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FStyleCorrect
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FStyleCorrect	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FStyleCorrect	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 18:00:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FStyleCorrect 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FStyleCorrect 7919 2011-01-27 17:02:14Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FStyleCorrect;
   flags="";
@@ -12,8 +12,11 @@
 
 --Strunk et White, "Les Éléments du Style"
 
-''Et ainsi un manuel américain, lecture typiquement requise auprès d'étudiants de 10e niveau en anglais, exalte sans le savoir certaines vertus du WabiSabi''
+''Et ainsi un manuel américain, lecture typiquement requise auprès d'étudiants de 10e niveau en anglais, exalte sans le savoir certaines vertus du [[Aide:WabiSabi|WabiSabi]]''
 
 --scummings
+
+<noinclude>
 ----
 [[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 10:22:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FURLMagiquesPhpWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FURLMagiquesPhpWiki 7915 2011-01-27 09:24:46Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FURLMagiquesPhpWiki;
   flags=PAGE_LOCKED;
@@ -16,40 +16,40 @@
 La syntaxe de base d'un URL phpwiki est :
 
 <pre>
-__phpwiki:__''nomdelapage''__?__''arguments''
+**phpwiki:**''nomdelapage''**?**''arguments''
 </pre>
 
 * si ''nomdelapage'' est omis, sa valeur par défaut est la page courante.
 * ''arguments'' doit être un ensemble de paramètres au format standard HTTP GET.
 
 Le paramètre "action=''x''" doit presque toujours être donné. Il peut valoir
-__browse__, __info__, __diff__, __search__, __edit__,
-__zip__, __dumpserial__, __loadserial__,
-__remove__, __lock__, __unlock__,
-__login__, __logout__, __setprefs__ ou __save__.
-L'action par défaut est __browse__.
+**browse**, **info**, **diff**, **search**, **edit**,
+**zip**, **dumpserial**, **loadserial**,
+**remove**, **lock**, **unlock**,
+**login**, **logout**, **setprefs** ou **save**.
+L'action par défaut est **browse**.
 
 Certaines actions acceptent d'autres paramètres :
 
-__!FullTextSearch__, __!TitleSearch__:
+**!FullTextSearch**, **!TitleSearch**:
 
-  accepte __s__=terme à rechercher, et __size__=taille de l'entrée.
+  accepte **s**=terme à rechercher, et **size**=taille de l'entrée.
 
-__edit__: 
+**edit**: 
 
-  accepte __version__.
+  accepte **version**.
 
-__remove__: 
+**remove**: 
 
-  accepte __verify__.
+  accepte **verify**.
 
-__save__: 
+**save**: 
 
-  accepte __editversion__, __minor_edit__, et  __content__.
+  accepte **editversion**, **minor_edit**, et  **content**.
 
-__setprefs__: 
+**setprefs**: 
 
-  accepte __edit_area_width__, __edit_area_height__.
+  accepte **edit_area_width**, **edit_area_height**.
 
 
 === Rédiger des liens Magiques dans les pages du Wiki
@@ -62,7 +62,7 @@
 
 La partie ''texte'' est optionnelle mais est habituellement recommandée.
 S'il est donné, il fournira le label du lien. L' ''url-phpwiki'' est 
-un URL __phpwiki:__ comme décrit plus haut.
+un URL **phpwiki:** comme décrit plus haut.
 
 ===Exemples
 
@@ -80,7 +80,7 @@
 
 === Insertion de Formulaires Magiques dans les Pages du Wiki
 
-''__Note__: L'ancienne syntaxe des formulaires magiques n'est plus supportée. 
+''**Note**: L'ancienne syntaxe des formulaires magiques n'est plus supportée. 
 Ils ont été remplacés par =<?plugin-form>=.''
 
 Si le plugin est appelé en utilisant *<?plugin-form* au lieu de *<?plugin* et
@@ -100,12 +100,12 @@
 insère simplement le résultat de la recherche du plugin :
 
 {{{
-<<TitleSearch s=wiki noheader=true >>
+<<TitleSearch s=wiki noheader=true>>
 }}}
 
 Résultats de recherche pour les pages dont le titre contient 'wiki' :
 
-<<TitleSearch s=wiki noheader=true >>
+<<TitleSearch s=wiki noheader=true>>
 
 {{{
 <?plugin-form FullTextSearch ?>
@@ -125,6 +125,7 @@
 
 <?plugin-form TitleSearch formsize=12 ?>
 
+<noinclude>
 ----
-
 [[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FWabiSabi
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FWabiSabi	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FWabiSabi	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 10:22:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Aide%2FWabiSabi 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Aide%2FWabiSabi 7915 2011-01-27 09:24:46Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Aide%2FWabiSabi;
   flags="";
@@ -30,3 +30,8 @@
 * simple
 * adorable
 Pour plus de détails sur le wabi-sabi, voir http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm.
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FWikiWikiWeb
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FWikiWikiWeb	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FWikiWikiWeb	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 18:00:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id: Aide%2FWikiWikiWeb$
 Content-Type: application/x-phpwiki;
@@ -8,19 +8,21 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-Un WikiWikiWeb est un site sur lequel tout le monde peut collaborer au contenu. Le Wiki le plus connu et le plus largement utilisé est le Portland Pattern Repository à http://c2.com/cgi-bin/wiki?WikiWikiWeb.
+Un ~WikiWikiWeb est un site sur lequel tout le monde peut collaborer au contenu. Le Wiki le plus connu et le plus largement utilisé est le Portland Pattern Repository à [[http://c2.com/cgi-bin/wiki?WikiWikiWeb]].
 
 Vous et moi pourrons trouver là-bas ces déclarations particulièrement pertinentes :
 
  ''Le tout est de rendre l'édition simple et la recherche ChercherUnePage rapide.''
 
- ''En plus d'être rapide, ce site aspire aussi aux idéaux du Zen généralement réunis sous le nom de WabiSabi. Le Zen trouve la beauté dans l'imparfait et l'éphémère. Lorsque vous y parvenez, vous n'avez besoin de rien d'autre.''
+ ''En plus d'être rapide, ce site aspire aussi aux idéaux du Zen généralement réunis sous le nom de [[Aide:WabiSabi|WabiSabi]]. Le Zen trouve la beauté dans l'imparfait et l'éphémère. Lorsque vous y parvenez, vous n'avez besoin de rien d'autre.''
 
  ''L'Univers tend vers le chaos. L'Univers tend vers Wiki.''
 
-Vous pouvez dire bonjour sur DerniersVisiteurs, ou en lire plus sur CommentUtiliserUnWiki et comment AjouterDesPages. Pour le moment ce Wiki n'a pas de thème de discussion, alors allez-y, jouez avec et amusez-vous !!
+Vous pouvez dire bonjour sur [[DerniersVisiteurs]], ou en lire plus sur [[Aide:CommentUtiliserUnWiki|CommentUtiliserUnWiki]] et comment [[Aide:AjouterDesPages|AjouterDesPages]]. Pour le moment ce Wiki n'a pas de thème de discussion, alors allez-y, jouez avec et amusez-vous !!
 
---SteveWainstead.
+--[[SteveWainstead]].
 
+<noinclude>
 ----
 [[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AliasAccueil
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AliasAccueil	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/AliasAccueil	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AliasAccueil 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AliasAccueil 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AliasAccueil;
   flags="";
@@ -8,6 +8,6 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<RedirectTo page=PageAccueil >>
+<<RedirectTo page=PageAccueil>>
 
 (C'est une démonstration du PluginRedirection.)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9gorieGroupes
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9gorieGroupes	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9gorieGroupes	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:02:52 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Cat%C3%A9gorieGroupes 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Cat%C3%A9gorieGroupes 7892 2011-01-25 20:04:24Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Cat%C3%A9gorieGroupes;
   flags="";
@@ -15,3 +15,6 @@
 un lien vers cette page tous les quatre items.
 
 * [Administrateurs]
+
+----
+[[CatégorieCatégorie]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Cat%C3%A9goriePagesAccueil 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Cat%C3%A9goriePagesAccueil 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Cat%C3%A9goriePagesAccueil;
   flags="";
@@ -8,10 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<AllUsers include_empty=0 >>
+<<AllUsers include_empty=0>>
 
 ----
-
-CatégorieCatégorie
-
-
+[[CatégorieCatégorie]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,13 +1,13 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Cat%C3%A9goriePluginWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Cat%C3%A9goriePluginWiki 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
-  pagename=Cat%C3%A9goriePluginWiki;
+  pagename=CatégoriePluginWiki;
   markup=2;
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<BackLinks info||=pagename,mtime,hits,author sortby||=pagename >>
+<<BackLinks info||=pagename,mtime,hits,author sortby||=pagename>>
 
 ----
 [[CatégorieCatégorie]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ChangementsLi%C3%A9s
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ChangementsLi%C3%A9s	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ChangementsLi%C3%A9s	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ChangementsLi%C3%A9s 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: ChangementsLi%C3%A9s 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ChangementsLi%C3%A9s;
   flags=PAGE_LOCKED;
@@ -8,4 +8,4 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0 >>
+<<RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ChercherUnePage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ChercherUnePage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ChercherUnePage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Wed, 26 Jan 2011 15:38:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ChercherUnePage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: ChercherUnePage 7904 2011-01-26 14:39:55Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ChercherUnePage;
   flags=PAGE_LOCKED;
@@ -9,7 +9,7 @@
 
 Voici quelques bons points de départ pour la navigation.
 
-* CommentUtiliserUnWiki vous donne quelques informations rapides sur le marquage Wiki.
+* [[Aide:CommentUtiliserUnWiki|CommentUtiliserUnWiki]] vous donne quelques informations rapides sur le marquage Wiki.
 * Les DernièresModifs sont enregistrées automatiquement.
 * DétailsTechniques sur la navigation et l'édition sur ce serveur.
 
@@ -29,7 +29,7 @@
 ------
 ==== Trucs
 Séparez les mots par des espaces.
-__Tous__ les mots doivent correspondre (c'est le ET logique)%%%
+**Tous** les mots doivent correspondre (c'est le ET logique)%%%
 Pour exclure un mot, faites-le précéder d'un '-'.%%%
 Exemple : 'wiki text -php' recherche toutes les pages contenant les mots 'wiki'
-__et__ 'text', mais ne contenant __pas__ le mot 'php'.
+**et** 'text', mais ne contenant **pas** le mot 'php'.

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ClassezLa
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ClassezLa	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ClassezLa	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ClassezLa 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: ClassezLa 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ClassezLa;
   flags="";
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<RateIt show=ratings >>
+<<RateIt show=ratings>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/CommentairesR%C3%A9cents
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/CommentairesR%C3%A9cents	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/CommentairesR%C3%A9cents	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: CommentairesR%C3%A9cents 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: CommentairesR%C3%A9cents 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=CommentairesR%C3%A9cents;
   flags=PAGE_LOCKED;
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<RecentComments days||=7 daylist=1,3,7,30,90,0 >>
+<<RecentComments days||=7 daylist=1,3,7,30,90,0>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cr%C3%A9erUnePage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cr%C3%A9erUnePage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Cr%C3%A9erUnePage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Cr%C3%A9erUnePage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Cr%C3%A9erUnePage 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Cr%C3%A9erUnePage;
   flags="";
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<CreatePage >>
+<<CreatePage>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/D%C3%A9poserUnFichier
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/D%C3%A9poserUnFichier	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/D%C3%A9poserUnFichier	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: D%C3%A9poserUnFichier 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: D%C3%A9poserUnFichier 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=D%C3%A9poserUnFichier;
   flags="";
@@ -8,11 +8,12 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-__Télécharger un fichier qui sera accessible avec la syntaxe:__
+**Télécharger un fichier qui sera accessible avec la syntaxe:**
 {{{
 Upload:num_rev/nom_fichier
 }}}
 ----
-<<UpLoad >>
+<<UpLoad>>
+
 ----
-[[CategoryPluginWiki]]
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Derni%C3%A8resModifs
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Derni%C3%A8resModifs	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Derni%C3%A8resModifs	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Derni%C3%A8resModifs 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Derni%C3%A8resModifs 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Derni%C3%A8resModifs;
   flags=PAGE_LOCKED;
@@ -12,4 +12,7 @@
 pour obtenir la liste des modifications mineures).
 
 --------
-<<RecentChanges days||=7 daylist=1,3,7,30,90,0 >>
+<<RecentChanges days||=7 daylist=1,3,7,30,90,0>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Derni%C3%A8resModifsCompl%C3%A8tes 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Derni%C3%A8resModifsCompl%C3%A8tes 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Derni%C3%A8resModifsCompl%C3%A8tes;
   flags=PAGE_LOCKED;
@@ -8,9 +8,12 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-Voici une liste de __toutes__ les pages modifiées récemment sur ce wiki, et non 
+Voici une liste de **toutes** les pages modifiées récemment sur ce wiki, et non 
 pas seulement des plus récentes comme dans DernièresModifs (Voir ÉditionsRécentes 
 pour toutes les modifications mineures récentes).
 
 --------
-<<RecentChanges days||=3 show_all=1 daylist=1,3,7,30,90,-1 >>
+<<RecentChanges days||=3 show_all=1 daylist=1,3,7,30,90,-1>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/GestionDesPlugins
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/GestionDesPlugins	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/GestionDesPlugins	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 18:44:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: GestionDesPlugins 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: GestionDesPlugins 7890 2011-01-25 17:45:08Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=GestionDesPlugins;
   flags=PAGE_LOCKED;
@@ -8,21 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-PhpWiki vous permet d'étendre PhpWiki avec de nouvelles fonctionnalités via
-un mécanisme de plugins. Pour faire bref, vous étendez une classe PHP
-que nous fournissons et vous la personnalisez pour qu'elle affiche le
-contenu que vous voulez. Pour plus d'informations, voyez PluginWiki, 
-PluginBonjourLeMonde, et regardez les sources des fichiers dans lib/plugin.
-
-S'il n'y a pas d'exemple de page pour ce plugin ou que vous souhaitez plus 
-d'informations, le meilleur endroit est la source de ce plugin. Sous le 
-répertoire racine de votre wiki, le dossier lib/plugin contient tous les
-fichiers PHP des plugins.
-
-Certains plugins nécessitent des bibliothèques externes non fournies 
-avec PhpWiki ou PHP comme par exemple la librairie GD pour les 
-graphiques.
------
 <<PluginManager>>
+
 ----
-[[DocumentationDePhpWiki]] [[CategoryPluginWiki]]
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/HistoriqueDeLaPage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/HistoriqueDeLaPage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/HistoriqueDeLaPage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: HistoriqueDeLaPage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: HistoriqueDeLaPage 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=HistoriqueDeLaPage;
   flags=PAGE_LOCKED;
@@ -9,3 +9,6 @@
 Content-Transfer-Encoding: binary
 
 <<PageHistory>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosAuthentification
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosAuthentification	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosAuthentification	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: InfosAuthentification 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: InfosAuthentification 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=InfosAuthentification;
   flags=LOCKED;
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<_AuthInfo >>
+<<_AuthInfo>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosDeD%C3%A9bogage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosDeD%C3%A9bogage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosDeD%C3%A9bogage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id: InfosDeD%C3%A9bogage$
 Content-Type: application/x-phpwiki;
@@ -11,4 +11,7 @@
 Vue détaillée d'une page, ce qui est probablement plus utile que n'importe 
 quoi d'autre pour le débogage.
 
-<<_BackendInfo page||='' >>
+<<_BackendInfo page||=''>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosSurLaPage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosSurLaPage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/InfosSurLaPage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: InfosSurLaPage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: InfosSurLaPage 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=InfosSurLaPage;
   flags=PAGE_LOCKED;
@@ -9,3 +9,6 @@
 Content-Transfer-Encoding: binary
 
 <<PageInfo>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/LesPlusVisit%C3%A9es
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/LesPlusVisit%C3%A9es	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/LesPlusVisit%C3%A9es	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: LesPlusVisit%C3%A9es 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: LesPlusVisit%C3%A9es 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=LesPlusVisit%C3%A9es;
   flags=PAGE_LOCKED;
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<MostPopular limit||=20 >>
+<<MostPopular limit||=20>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ListeDePages
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ListeDePages	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ListeDePages	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ListeDePages 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: ListeDePages 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ListeDePages;
   flags="";
@@ -11,4 +11,7 @@
 Ein einfaches Beispiel für das PluginListeDePages. Hauptsächlich für ein wikilens Thema benutzt, 
 um Ratings Info anzuzeigen.
 
-<<ListPages pages=HomePage,FindPage,WikiWikiWeb >>
+<<ListPages pages=HomePage,FindPage,WikiWikiWeb>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ModifsR%C3%A9centesPhpWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: ModifsR%C3%A9centesPhpWiki 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ModifsR%C3%A9centesPhpWiki;
   flags="";
@@ -9,4 +9,4 @@
 Content-Transfer-Encoding: binary
 
 <<RssFeed feed=PhpWikiRecentChanges description="PhpWiki:RecentChanges"
-	         url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss >>
+	         url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/NotesDeVersion
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/NotesDeVersion	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/NotesDeVersion	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Wed, 26 Jan 2011 17:24:07 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: NotesDeVersion 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: NotesDeVersion 7907 2011-01-26 16:25:11Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=NotesDeVersion;
   flags=PAGE_LOCKED;
@@ -8,331 +8,4 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-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
-
-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 Große)
-* 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 at 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
-
-----
-
-[[DocumentationDePhpWiki]]
+Voir [[ReleaseNotes]] (en anglais).

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PageAccueil
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PageAccueil	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PageAccueil	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Wed, 26 Jan 2011 17:12:31 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PageAccueil 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PageAccueil 7906 2011-01-26 16:13:30Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PageAccueil;
   flags="";
@@ -8,11 +8,11 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-* Qu'est-ce qu'un WikiWikiWeb ? Description courte de cette application.
-* Apprenez CommentUtiliserUnWiki et comment AjouterDesPages.
-* Le [BacÀSable] est là pour jouer et expérimenter.
-* Signez la page des DerniersVisiteurs.
-* Visitez DernièresModifs pour voir les additions et les modifications les plus récentes.
-* Découvrez quelles pages sont LesPlusVisitées.
-* Lisez les NotesDeVersion.
-* Ce Wiki est géré par l'intermédiaire de la page d'AdministrationDePhpWiki.
+* Qu'est-ce qu'un [[Aide:WikiWikiWeb|WikiWikiWeb]] ? Description courte de cette application.
+* Apprenez [[Aide:CommentUtiliserUnWiki|CommentUtiliserUnWiki]] et comment [[Aide:AjouterDesPages|AjouterDesPages]].
+* Le [[BacÀSable]] est là pour jouer et expérimenter.
+* Signez la page des [[DerniersVisiteurs]].
+* Visitez [[DernièresModifs]] pour voir les additions et les modifications les plus récentes.
+* Découvrez quelles pages sont [[LesPlusVisitées]].
+* Lisez les [[NotesDeVersion]].
+* Ce Wiki est géré par l'intermédiaire de la page d'[[AdministrationDePhpWiki]].

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PageAl%C3%A9atoire
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PageAl%C3%A9atoire	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PageAl%C3%A9atoire	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PageAl%C3%A9atoire 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PageAl%C3%A9atoire 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PageAl%C3%A9atoire;
   flags=PAGE_LOCKED;
@@ -12,3 +12,6 @@
 
 ----
 <<RandomPage pages||=10 info||=''>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesFloues
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesFloues	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesFloues	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PagesFloues 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PagesFloues 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PagesFloues;
   flags=PAGE_LOCKED;
@@ -20,7 +20,7 @@
 
 ----
 
-<<FullTextSearch >>
+<<FullTextSearch>>
 
 
 Recherche supplémentaires :
@@ -31,4 +31,4 @@
 
 ----
 
-<<IncludePage page=ChercherUnePage quiet=1 section=Trucs sectionhead=1 >>
+<<IncludePage page=ChercherUnePage quiet=1 section=Trucs sectionhead=1>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesOrphelines
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesOrphelines	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesOrphelines	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PagesOrphelines 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PagesOrphelines 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PagesOrphelines;
   flags=PAGE_LOCKED;
@@ -13,3 +13,6 @@
 ----
 
 <<OrphanedPages info||=hits,pagename,mtime>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesRecherch%C3%A9es
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesRecherch%C3%A9es	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesRecherch%C3%A9es	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PagesRecherch%C3%A9es 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PagesRecherch%C3%A9es 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PagesRecherch%C3%A9es;
   flags="";
@@ -21,3 +21,6 @@
 ----
 
 <<WantedPages>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesSemblables
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesSemblables	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/PagesSemblables	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PagesSemblables 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PagesSemblables 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PagesSemblables;
   flags=PAGE_LOCKED;
@@ -11,4 +11,7 @@
 Les PagesSemblables sont des pages qui partagent un mot initial ou 
 final avec cette page (voir aussi Wiki:LikePages et MeatBall:LikePages).
 ----
-<<LikePages >>
+<<LikePages>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Pr%C3%A9f%C3%A9rencesUtilisateurs 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Pr%C3%A9f%C3%A9rencesUtilisateurs 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Pr%C3%A9f%C3%A9rencesUtilisateurs;
   flags=PAGE_LOCKED;
@@ -13,4 +13,7 @@
 cookie (vous devez donc avoir validé les cookies pour pouvoir 
 utiliser cette fonctionnalité).
 
-<<UserPreferences >>
+<<UserPreferences>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/QuiEstEnLigne
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/QuiEstEnLigne	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/QuiEstEnLigne	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: QuiEstEnLigne 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: QuiEstEnLigne 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=QuiEstEnLigne;
   flags="";
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<WhoIsOnline allow_detail=1 >>
+<<WhoIsOnline allow_detail=1>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: R%C3%A9cup%C3%A9rationDeLaPage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: R%C3%A9cup%C3%A9rationDeLaPage 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=R%C3%A9cup%C3%A9rationDeLaPage;
   flags=PAGE_LOCKED;
@@ -20,3 +20,6 @@
 
 RechercheParTitre :
 <?plugin-form TitleSearch?>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/R%C3%A9troLiens
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/R%C3%A9troLiens	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/R%C3%A9troLiens	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: R%C3%A9troLiens 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: R%C3%A9troLiens 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=R%C3%A9troLiens;
   flags=PAGE_LOCKED;
@@ -13,4 +13,7 @@
 titre de cette page ?"
 
 ----
-<<BackLinks exclude||='' include_self||=1 noheader||=0 page||='' info||='' >>
+<<BackLinks exclude||='' include_self||=1 noheader||=0 page||='' info||=''>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: RechercheEnTexteInt%C3%A9gral 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: RechercheEnTexteInt%C3%A9gral 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=RechercheEnTexteInt%C3%A9gral;
   flags=PAGE_LOCKED;
@@ -8,7 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<FullTextSearch >>
+<<FullTextSearch>>
 
 ----
 
@@ -19,4 +19,7 @@
 
 ----
 
-<<IncludePage page=ChercherUnePage quiet=1 section=Trucs sectionhead=1 >>
+<<IncludePage page=ChercherUnePage quiet=1 section=Trucs sectionhead=1>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheInterWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheInterWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheInterWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 18:16:42 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: RechercheInterWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: RechercheInterWiki 7884 2011-01-25 17:17:11Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=RechercheInterWiki;
   flags="";
@@ -8,12 +8,13 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-Interroge chaque Wiki apparaissant dans la CarteInterWiki en entrant 
+Interroge chaque Wiki apparaissant dans la [[CarteInterWiki]] en entrant 
 un nom de page souhaité ci-dessous.
 
 Pour ajouter une de ces recherches à une autre page, utiliser 
-PluginRechercheExterne.
+le greffon [[Aide:PluginRechercheExterne|RechercheExterne]].
 
 <<InterWikiSearch>>
+
 ----
-[[CategoryPluginWiki]]
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheParTitre
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheParTitre	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/RechercheParTitre	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: RechercheParTitre 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: RechercheParTitre 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=RechercheParTitre;
   flags=PAGE_LOCKED;
@@ -8,7 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<TitleSearch >>
+<<TitleSearch>>
 ----
 Recherches supplémentaires :
 <?plugin-form TitleSearch auto_redirect=0?>
@@ -17,4 +17,7 @@
 
 ----
 
-<<IncludePage page=ChercherUnePage quiet=1 section=Trucs sectionhead=1 >>
+<<IncludePage page=ChercherUnePage quiet=1 section=Trucs sectionhead=1>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SommaireDuProjet
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SommaireDuProjet	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SommaireDuProjet	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: SommaireDuProjet 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: SommaireDuProjet 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SommaireDuProjet;
   flags=PAGE_LOCKED;
@@ -8,4 +8,4 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<RssFeed url=http://sourceforge.net/export/rss2_projsummary.php?group_id=6121 >>
+<<RssFeed url=http://sourceforge.net/export/rss2_projsummary.php?group_id=6121>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SondagePhpWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SondagePhpWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SondagePhpWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: SondagePhpWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: SondagePhpWiki 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SondagePhpWiki;
   flags=PAGE_LOCKED;
@@ -8,7 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<NoCache >>
+<<NoCache>>
 <<WikiPoll require_all=0 require_least=2
            question[1]="Appréciez-vous PhpWiki ?"
              answer[1][1]="Oui" answer[1][2]="Sans opinion" answer[1][3]="Non"

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SteveWainstead
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SteveWainstead	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/SteveWainstead	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Thu, 27 Jan 2011 10:22:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: SteveWainstead 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: SteveWainstead 7915 2011-01-27 09:24:46Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SteveWainstead;
   flags="";
@@ -8,7 +8,12 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-Salut. J'ai démarré la construction de ce WikiWikiWeb mais beaucoup
-d'autres m'aident maintenant. Je suis à [http://www.panix.com/~swain/].
+Salut. J'ai démarré la construction de ce [[Aide:WikiWikiWeb|WikiWikiWeb]] mais beaucoup
+d'autres m'aident maintenant. Je suis à [[http://www.panix.com/~swain/]].
 
-S'il vous plait, rapportez les bugs à [mailto:phpwiki-talk at lists.sourceforge.net].
+S'il vous plait, rapportez les bugs à [[mailto:phpwiki-talk at lists.sourceforge.net]].
+
+<noinclude>
+----
+[[DocumentationDePhpWiki]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/TousLesUtilisateurs
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/TousLesUtilisateurs	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/TousLesUtilisateurs	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 18:08:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: TousLesUtilisateurs 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: TousLesUtilisateurs 7880 2011-01-25 17:08:47Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=TousLesUtilisateurs;
   flags=PAGE_LOCKED;
@@ -12,5 +12,6 @@
 ont créé leur page personnelle et ont définis des préférences. 
 ----
 <<AllUsers>>
+
 ----
-[[CategoryPluginWiki]]
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ToutesLesPages
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ToutesLesPages	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/ToutesLesPages	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:17:11 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ToutesLesPages 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: ToutesLesPages 7894 2011-01-25 20:18:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ToutesLesPages;
   flags=PAGE_LOCKED;
@@ -12,3 +12,6 @@
 PagesOrphelines qui seraient autrement inaccessibles.
 
 <<AllPages>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/TraduireUnTexte
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/TraduireUnTexte	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/TraduireUnTexte	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: TraduireUnTexte 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: TraduireUnTexte 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=TraduireUnTexte;
   flags=PAGE_LOCKED; 
@@ -8,4 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<TranslateText >>
+<<TranslateText>>
+
+----
+[[CatégoriePageDAction]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/VersionsR%C3%A9centes
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/VersionsR%C3%A9centes	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/fr/pgsrc/VersionsR%C3%A9centes	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:45 +0000
+Date: Tue, 25 Jan 2011 21:26:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: VersionsR%C3%A9centes 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: VersionsR%C3%A9centes 7896 2011-01-25 20:27:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=VersionsR%C3%A9centes;
   flags=PAGE_LOCKED;
@@ -8,4 +8,4 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-<<RssFeed url=http://sourceforge.net/export/rss2_projnews.php?group_id=6121&rss_fulltext=1 maxitem=10 >>
+<<RssFeed url=http://sourceforge.net/export/rss2_projnews.php?group_id=6121&rss_fulltext=1 maxitem=10>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/it/LC_MESSAGES/phpwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,459 +1,235 @@
 <?php
 
-$locale[" ... first %d bytes"] =
-   " ... i primi %d byte";
-$locale[" Sorry, cannot merge."] =
-   " Spiacente, non può fondersi.";
-$locale["%4d  %s\n"] =
-   "%4d  %s\n";
-$locale["%d best incoming links: "] =
-   "%d migliori link in entrata: ";
-$locale["%d best outgoing links: "] =
-   "%d migliori link in uscita: ";
-$locale["%d most popular nearby: "] =
-   "%d più popolari: ";
-$locale["%s Kb (%s bytes)"] =
-   "%s Kb (%s byte)";
-$locale["%s at %s"] =
-   "%s a %s";
-$locale["%s bytes"] =
-   "%s byte";
-$locale["%s days"] =
-   "%s giorni";
-$locale["%s not defined"] =
-   "%s: non definito";
-$locale["%s not found"] =
-   "%s non trovato";
-$locale["%s of this page"] =
-   "%s di questa pagina";
-$locale["%s on %s:"] =
-   "%s a %s:";
-$locale["%s: %s"] =
-   "%s: %s";
-$locale["%s: file not found"] =
-   "%s: file non trovato";
-$locale["%s: not defined"] =
-   "%s: non definito";
-$locale["'%s': corrupt file"] =
-   "'%s': file corrotto";
-$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] =
-   "(Copia le tue modifiche nella clipboard. Potete provare a modificare un'altra pagina o registra il vostro testo in un editor di testo.)";
-$locale["(diff)"] =
-   "(diff)";
-$locale[", Memory: %s"] =
-   ", RAM: %s";
-$locale["- saved to database as version %d"] =
-   "- salvata a base di dati a versione %d";
-$locale["- version %d saved to database as version %d"] =
-   "- versione %d salvata a base di dati a versione %d";
-$locale["... copied to %s"] =
-   "... copia di %s";
-$locale["... not copied to %s"] =
-   "... nonc opia di %s";
-$locale["... not found"] =
-   "... non trovato";
-$locale["1 day"] =
-   "1 giorno";
-$locale["<no matches>"] =
-   "<nessuna corrispondenza>";
-$locale["<none>"] =
-   "<nessun>";
-$locale["<unknown>"] =
-   "<sconosciuto>";
-$locale["AddCategory"] =
-   "InsertoCategoria";
-$locale["AddPlugin"] =
-   "InsertoPlugin";
-$locale["AddTemplate"] =
-   "AggiungaLaMascherina";
-$locale["Administrators"] =
-   "Coordinatori";
-$locale["Anonymous Users"] =
-   "Utenti Anonimi";
-$locale["Authenticated Users"] =
-   "Utenti Autenticati";
-$locale["Authenticated as %s"] =
-   "Utente corrente: %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"] =
-   "ListaCalendario";
-$locale["CalendarListPlugin"] =
-   "CalendarioListPlugin";
-$locale["CalendarPlugin"] =
-   "CalendarioPlugin";
-$locale["Cancel"] =
-   "Annulla";
-$locale["Category"] =
-   "Categoria";
-$locale["CategoryGroup"] =
-   "CategoriaGruppo";
-$locale["CategoryPage"] =
-   "CategoriaPagina";
-$locale["Columns: %s."] =
-   "Caratteri: %s.";
-$locale["Comment"] =
-   "Commentario";
-$locale["Conflicting Edits!"] =
-   "Il Conflitto Pubblica!";
-$locale["Content"] =
-   "Indice";
-$locale["Contents"] =
-   "Indice";
-$locale["Convert"] =
-   "Convertito";
-$locale["Couldn't connect to %s"] =
-   "Non riesco a stabilire una connessione col database: %s";
-$locale["Create: %s"] =
-   "Salvata: %s";
-$locale["Date Format"] =
-   "Formato della Data";
-$locale["DebugInfo"] =
-   "InfoDebug";
-$locale["Deleted"] =
-   "Rimossa";
-$locale["Describe %s here."] =
-   "Inserire qui il testo della pagina %s.";
-$locale["Diff"] =
-   "Differenze";
-$locale["Diff: %s"] =
-   "Differenza di: %s";
-$locale["Differences between %s and %s of %s."] =
-   "Differenze tra %s e %s di %s.";
-$locale["Edit"] =
-   "Modifica";
-$locale["Edit %s"] =
-   "Modifica %s";
-$locale["Edit: %s"] =
-   "Modifica: %s";
-$locale["EditText"] =
-   "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"] =
-   "TrovaPagina";
-$locale["First"] =
-   "Prima";
-$locale["Full text search results for '%s'"] =
-   "Risultati della ricerca su tutto il testo per '%s'";
-$locale["FullTextSearch"] =
-   "RicercaDelTesto";
-$locale["Go"] =
-   "Vai";
-$locale["GoTo"] =
-   "Vai";
-$locale["H"] =
-   "A";
-$locale["Height"] =
-   "Altezza";
-$locale["Home"] =
-   "Principale";
-$locale["HomePage"] =
-   "PaginaPrincipale";
-$locale["HomePageAlias"] =
-   "AliasPaginaPrincipale";
-$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["IncludePage"] =
-   "InserireLaPagina";
-$locale["IncludePagePlugin"] =
-   "InserireLaPaginaPlugin";
-$locale["IncludePages"] =
-   "InserirePaginas";
-$locale["Included from %s"] =
-   "Inserire dalla %s";
-$locale["Included from %s:"] =
-   "Inserire dalla %s:";
-$locale["Insert"] =
-   "Inserto";
-$locale["Insufficient permissions."] =
-   "Permessi insufficienti.";
-$locale["Invalid password or userid."] =
-   "Password o nome utente errati.";
-$locale["JabberPresence"] =
-   "JabberPresenca";
-$locale["Last"] =
-   "Ultima";
-$locale["Last Author"] =
-   "Ultimo Autore";
-$locale["Last Modified"] =
-   "Ultima Modifica";
-$locale["Last Summary"] =
-   "Ultimo Commenti";
-$locale["Last edited %s"] =
-   "Ultima modifica %s";
-$locale["Last edited on %s"] =
-   "Ultima modifica %s";
-$locale["LdapSearch"] =
-   "LdapRicerca";
-$locale["LikePages"] =
-   "PagineSimili";
-$locale["LiveSearch"] =
-   "RicercaLive";
-$locale["Lock"] =
-   "Bloccata";
-$locale["Lock Page"] =
-   "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"] =
-   "Moderno";
-$locale["Modified"] =
-   "Modifica";
-$locale["MostPopular"] =
-   "PiùPopolari";
-$locale["Name"] =
-   "Nome";
-$locale["New page"] =
-   "Nuova pagina";
-$locale["Newer page:"] =
-   "Nuova pagina:";
-$locale["Next"] =
-   "Seguente";
-$locale["None"] =
-   "Nessuno";
-$locale["Note:"] =
-   "Nota:";
-$locale["Optimizing database"] =
-   "Base di dati d'ottimizzazione";
-$locale["Other diffs:"] =
-   "Altre differenze:";
-$locale["Other version"] =
-   "Altra versione";
-$locale["Overwrite All"] =
-   "Scriva sopra Tutti";
-$locale["Owner"] =
-   "Proprietario";
-$locale["Owner: %s"] =
-   "Owner: %s";
-$locale["Page %s not found."] =
-   "%s: pagina non trovato.";
-$locale["Page Locked"] =
-   "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 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["PageHistory"] =
-   "StoricoPagina";
-$locale["PageInfo"] =
-   "InfoPagina";
-$locale["PhpWikiAdministration/Markup"] =
-   "AmministrazioneDiPhpWiki/Disposizione";
-$locale["PhpWikiAdministration/Remove"] =
-   "AmministrazioneDiPhpWiki/Rimuovi";
-$locale["Please check it through before saving."] =
-   "Si prega di controllarla nel dettaglio prima di salvare.";
-$locale["Plugin %s disabled."] =
-   "Plugin '%s' inabiliti.";
-$locale["Plugin %s failed."] =
-   "Plugin '%s' fallito.";
-$locale["Plugin %s: undefined"] =
-   "Plugin '%s': non definito";
-$locale["PreferenceApp"] =
-   "PreferenzeApp";
-$locale["Preferences"] =
-   "Preferenze";
-$locale["PreferencesInfo"] =
-   "PreferenzeInfo";
-$locale["PrevNext"] =
-   "Seguente";
-$locale["Preview"] =
-   "Anteprima";
-$locale["Previous"] =
-   "Precedente";
-$locale["Previous Author"] =
-   "Precedente Author";
-$locale["Previous Revision"] =
-   "Precedente";
-$locale["Printer"] =
-   "Stampante";
-$locale["PurgeHtmlCache"] =
-   "RimuoviDallaCacheHtml";
-$locale["RecentChanges"] =
-   "ModificheRecenti";
-$locale["Related Changes"] =
-   "Modifiche Correlate";
-$locale["Related Links"] =
-   "Collegamenti Relativi";
-$locale["Remove"] =
-   "Cancella";
-$locale["Remove Page"] =
-   "Cancella la Pagina";
-$locale["Remove this page"] =
-   "Rimuovi la pagina";
-$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"] =
-   "Salvata: %s";
-$locale["Search"] =
-   "Ricerca";
-$locale["See %s tips for editing."] =
-   "Vedere %s consigli per le modifiche.";
-$locale["Sign In"] =
-   "Login";
-$locale["Sign Out"] =
-   "Logout";
-$locale["Sign in as:"] =
-   "Username di login:";
-$locale["Signed Users"] =
-   "Utenti Firmati";
-$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."] =
-   "Scusa per l'inconveniente.";
-$locale["Sort by %s"] =
-   "Ordina per %s";
-$locale["String \"%s\" not found."] =
-   "\"%s\" non trovato.";
-$locale["Summary"] =
-   "Commenti";
-$locale["Synopsis"] =
-   "Sommario";
-$locale["TextFormattingRules"] =
-   "RegoleFormattazioneTesto";
-$locale["Thank you for editing %s."] =
-   "La pagina %s <E8> stata modificata.";
-$locale["Thanks for adding this translation!"] =
-   "Grazie per la translatione!";
-$locale["The %d most popular pages of this wiki:"] =
-   "Le %d pagine più popolari di questo wiki sono:";
-$locale["This page has been locked by the administrator so your changes can not be saved."] =
-   "Spiacente, ma questa pagina è stata bloccata dall'amministratore,quindi le tue modifiche non possono essere salvate.";
-$locale["Time Zone"] =
-   "Fuso Orario";
-$locale["Title Search"] =
-   "Ricerca per Titolo";
-$locale["Title search results for '%s'"] =
-   "Risultati della ricerca su tutto il testo per '%s'";
-$locale["TitleSearch"] =
-   "RicercaPerTitolo";
-$locale["Today"] =
-   "Oggi";
-$locale["Transcluded from %s"] =
-   "Inserire dalla %s";
-$locale["Unlock"] =
-   "Sblocca";
-$locale["Unlock Page"] =
-   "Sblocca la Pagina";
-$locale["Unlocking pages"] =
-   "Sblocca la Pagina";
-$locale["UserPreferences"] =
-   "Preferenze";
-$locale["Version"] =
-   "Versione";
-$locale["Version %d"] =
-   "Versione %d";
-$locale["Version %s"] =
-   "Versione %s";
-$locale["Version %s, saved %s"] =
-   "Versione %s, salvata %s";
-$locale["Version %s, saved on %s"] =
-   "Versione %s, salvata su %s";
-$locale["Versions are identical"] =
-   "Le versioni sono identiche";
-$locale["View Source: %s"] =
-   "Vedi il Sorgente: %s";
-$locale["View the current version"] =
-   "Mostra il versione corrente";
-$locale["W"] =
-   "L";
-$locale["Warning:"] =
-   "Avvertimento:";
-$locale["Width"] =
-   "Larghezza";
-$locale["Wiki Name"] =
-   "Wiki Nome";
-$locale["WikiAdminMarkup"] =
-   "WikiAmministrazioneDisposizione";
-$locale["Yes"] =
-   "Si";
-$locale["You are signed in as %s"] =
-   "Utente corrente: %s";
-$locale["Your careful attention to detail is much appreciated."] =
-   "Si prega di controllare che le modifiche siano quelle volute. Grazie.";
-$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"] =
-   "La versione corrente";
-$locale["authenticated"] =
-   "autenticato";
-$locale["by %s"] =
-   "di %s";
-$locale["current version"] =
-   "versione corrente";
-$locale["days"] =
-   "giorni";
-$locale["diff"] =
-   "diff";
-$locale["from %s"] =
-   "dalla %s";
-$locale["locked"] =
-   "bloccata";
-$locale["not authenticated"] =
-   "non autenticato";
-$locale["plain file %s"] =
-   "archivio del testo %s";
-$locale["saved as "] =
-   "salvata a ";
-$locale["saved as %s"] =
-   "salvata a %s";
-$locale["today"] =
-   "oggi";
-$locale["version %d"] =
-   "versione %d";
-$locale["version %s"] =
-   "versione %s";
-$locale["version <em>%s</em>"] =
-   "versione <em>%s</em>";
+$locale[" ... first %d bytes"] = " ... i primi %d byte";
+$locale[" Sorry, cannot merge."] = " Spiacente, non può fondersi.";
+$locale["%4d  %s\n"] = "%4d  %s\n";
+$locale["%d best incoming links: "] = "%d migliori link in entrata: ";
+$locale["%d best outgoing links: "] = "%d migliori link in uscita: ";
+$locale["%d most popular nearby: "] = "%d più popolari: ";
+$locale["%s at %s"] = "%s a %s";
+$locale["%s bytes"] = "%s byte";
+$locale["%s days"] = "%s giorni";
+$locale["%s not defined"] = "%s: non definito";
+$locale["%s not found"] = "%s non trovato";
+$locale["%s of this page"] = "%s di questa pagina";
+$locale["%s on %s:"] = "%s a %s:";
+$locale["%s: %s"] = "%s: %s";
+$locale["%s: file not found"] = "%s: file non trovato";
+$locale["%s: not defined"] = "%s: non definito";
+$locale["'%s': corrupt file"] = "'%s': file corrotto";
+$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(Copia le tue modifiche nella clipboard. Potete provare a modificare un'altra pagina o registra il vostro testo in un editor di testo.)";
+$locale["(diff)"] = "(diff)";
+$locale[", Memory: %s"] = ", RAM: %s";
+$locale["- saved to database as version %d"] = "- salvata a base di dati a versione %d";
+$locale["- version %d saved to database as version %d"] = "- versione %d salvata a base di dati a versione %d";
+$locale["... copied to %s"] = "... copia di %s";
+$locale["... not copied to %s"] = "... nonc opia di %s";
+$locale["... not found"] = "... non trovato";
+$locale["1 day"] = "1 giorno";
+$locale["<no matches>"] = "<nessuna corrispondenza>";
+$locale["<none>"] = "<nessun>";
+$locale["<unknown>"] = "<sconosciuto>";
+$locale["AddCategory"] = "InsertoCategoria";
+$locale["AddPlugin"] = "InsertoPlugin";
+$locale["AddTemplate"] = "AggiungaLaMascherina";
+$locale["Administrators"] = "Coordinatori";
+$locale["Anonymous Users"] = "Utenti Anonimi";
+$locale["Authenticated Users"] = "Utenti Autenticati";
+$locale["Authenticated as %s"] = "Utente corrente: %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"] = "ListaCalendario";
+$locale["Cancel"] = "Annulla";
+$locale["Category"] = "Categoria";
+$locale["CategoryGroup"] = "CategoriaGruppo";
+$locale["CategoryPage"] = "CategoriaPagina";
+$locale["Columns: %s."] = "Caratteri: %s.";
+$locale["Comment"] = "Commentario";
+$locale["Conflicting Edits!"] = "Il Conflitto Pubblica!";
+$locale["Content"] = "Indice";
+$locale["Contents"] = "Indice";
+$locale["Convert"] = "Convertito";
+$locale["Couldn't connect to %s"] = "Non riesco a stabilire una connessione col database: %s";
+$locale["Create: %s"] = "Salvata: %s";
+$locale["Date Format"] = "Formato della Data";
+$locale["DebugInfo"] = "InfoDebug";
+$locale["Deleted"] = "Rimossa";
+$locale["Describe %s here."] = "Inserire qui il testo della pagina %s.";
+$locale["Diff"] = "Differenze";
+$locale["Diff: %s"] = "Differenza di: %s";
+$locale["Differences between %s and %s of %s."] = "Differenze tra %s e %s di %s.";
+$locale["Edit"] = "Modifica";
+$locale["Edit %s"] = "Modifica %s";
+$locale["Edit: %s"] = "Modifica: %s";
+$locale["EditText"] = "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"] = "TrovaPagina";
+$locale["First"] = "Prima";
+$locale["Full text search results for '%s'"] = "Risultati della ricerca su tutto il testo per '%s'";
+$locale["FullTextSearch"] = "RicercaDelTesto";
+$locale["Go"] = "Vai";
+$locale["GoTo"] = "Vai";
+$locale["H"] = "A";
+$locale["Height"] = "Altezza";
+$locale["Help"] = "Aiuto";
+$locale["Help/CalendarListPlugin"] = "Aiuto/CalendarioListPlugin";
+$locale["Help/CalendarPlugin"] = "Aiuto/CalendarioPlugin";
+$locale["Help/GoodStyle"] = "Aiuto/BuonStile";
+$locale["Help/IncludePagePlugin"] = "Aiuto/InserireLaPaginaPlugin";
+$locale["Help/OldTextFormattingRules"] = "Aiuto/RegoleFormattazioneTesto";
+$locale["Help/TextFormattingRules"] = "Aiuto/RegoleFormattazioneTesto";
+$locale["Home"] = "Principale";
+$locale["HomePage"] = "PaginaPrincipale";
+$locale["HomePageAlias"] = "AliasPaginaPrincipale";
+$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["IncludePage"] = "InserireLaPagina";
+$locale["IncludePages"] = "InserirePaginas";
+$locale["Included from %s"] = "Inserire dalla %s";
+$locale["Included from %s:"] = "Inserire dalla %s:";
+$locale["Insert"] = "Inserto";
+$locale["Insufficient permissions."] = "Permessi insufficienti.";
+$locale["Invalid password or userid."] = "Password o nome utente errati.";
+$locale["JabberPresence"] = "JabberPresenca";
+$locale["Last"] = "Ultima";
+$locale["Last Author"] = "Ultimo Autore";
+$locale["Last Modified"] = "Ultima Modifica";
+$locale["Last Summary"] = "Ultimo Commenti";
+$locale["Last edited %s"] = "Ultima modifica %s";
+$locale["Last edited on %s"] = "Ultima modifica %s";
+$locale["LdapSearch"] = "LdapRicerca";
+$locale["LikePages"] = "PagineSimili";
+$locale["LiveSearch"] = "RicercaLive";
+$locale["Lock"] = "Bloccata";
+$locale["Lock Page"] = "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"] = "Moderno";
+$locale["Modified"] = "Modifica";
+$locale["MostPopular"] = "PiùPopolari";
+$locale["Name"] = "Nome";
+$locale["New page"] = "Nuova pagina";
+$locale["Newer page:"] = "Nuova pagina:";
+$locale["Next"] = "Seguente";
+$locale["None"] = "Nessuno";
+$locale["Note:"] = "Nota:";
+$locale["Optimizing database"] = "Base di dati d'ottimizzazione";
+$locale["Other diffs:"] = "Altre differenze:";
+$locale["Other version"] = "Altra versione";
+$locale["Overwrite All"] = "Scriva sopra Tutti";
+$locale["Owner"] = "Proprietario";
+$locale["Owner: %s"] = "Owner: %s";
+$locale["Page %s not found."] = "%s: pagina non trovato.";
+$locale["Page Locked"] = "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 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["PageHistory"] = "StoricoPagina";
+$locale["PageInfo"] = "InfoPagina";
+$locale["PhpWikiAdministration/Markup"] = "AmministrazioneDiPhpWiki/Disposizione";
+$locale["PhpWikiAdministration/Remove"] = "AmministrazioneDiPhpWiki/Rimuovi";
+$locale["Please check it through before saving."] = "Si prega di controllarla nel dettaglio prima di salvare.";
+$locale["Plugin %s disabled."] = "Plugin '%s' inabiliti.";
+$locale["Plugin %s failed."] = "Plugin '%s' fallito.";
+$locale["Plugin %s: undefined"] = "Plugin '%s': non definito";
+$locale["PreferenceApp"] = "PreferenzeApp";
+$locale["Preferences"] = "Preferenze";
+$locale["PreferencesInfo"] = "PreferenzeInfo";
+$locale["PrevNext"] = "Seguente";
+$locale["Preview"] = "Anteprima";
+$locale["Previous"] = "Precedente";
+$locale["Previous Author"] = "Precedente Author";
+$locale["Previous Revision"] = "Precedente";
+$locale["Printer"] = "Stampante";
+$locale["PurgeHtmlCache"] = "RimuoviDallaCacheHtml";
+$locale["RecentChanges"] = "ModificheRecenti";
+$locale["RecentVisitors"] = "VisitatoriRecenti";
+$locale["Related Changes"] = "Modifiche Correlate";
+$locale["Related Links"] = "Collegamenti Relativi";
+$locale["Remove"] = "Cancella";
+$locale["Remove Page"] = "Cancella la Pagina";
+$locale["Remove this page"] = "Rimuovi la pagina";
+$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"] = "Salvata: %s";
+$locale["Search"] = "Ricerca";
+$locale["See %s tips for editing."] = "Vedere %s consigli per le modifiche.";
+$locale["Sign In"] = "Login";
+$locale["Sign Out"] = "Logout";
+$locale["Sign in as:"] = "Username di login:";
+$locale["Signed Users"] = "Utenti Firmati";
+$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."] = "Scusa per l'inconveniente.";
+$locale["Sort by %s"] = "Ordina per %s";
+$locale["String \"%s\" not found."] = "\"%s\" non trovato.";
+$locale["Summary"] = "Commenti";
+$locale["Synopsis"] = "Sommario";
+$locale["TextFormattingRules"] = "RegoleFormattazioneTesto";
+$locale["Thank you for editing %s."] = "La pagina %s <E8> stata modificata.";
+$locale["Thanks for adding this translation!"] = "Grazie per la translatione!";
+$locale["The %d most popular pages of this wiki:"] = "Le %d pagine più popolari di questo wiki sono:";
+$locale["This page has been locked by the administrator so your changes can not be saved."] = "Spiacente, ma questa pagina è stata bloccata dall'amministratore,quindi le tue modifiche non possono essere salvate.";
+$locale["Time Zone"] = "Fuso Orario";
+$locale["Title Search"] = "Ricerca per Titolo";
+$locale["Title search results for '%s'"] = "Risultati della ricerca su tutto il testo per '%s'";
+$locale["TitleSearch"] = "RicercaPerTitolo";
+$locale["Today"] = "Oggi";
+$locale["Transcluded from %s"] = "Inserire dalla %s";
+$locale["Unlock"] = "Sblocca";
+$locale["Unlock Page"] = "Sblocca la Pagina";
+$locale["Unlocking pages"] = "Sblocca la Pagina";
+$locale["UserPreferences"] = "Preferenze";
+$locale["Version"] = "Versione";
+$locale["Version %d"] = "Versione %d";
+$locale["Version %s"] = "Versione %s";
+$locale["Version %s, saved on %s"] = "Versione %s, salvata su %s";
+$locale["Versions are identical"] = "Le versioni sono identiche";
+$locale["View Source: %s"] = "Vedi il Sorgente: %s";
+$locale["View the current version"] = "Mostra il versione corrente";
+$locale["W"] = "L";
+$locale["Warning:"] = "Avvertimento:";
+$locale["Width"] = "Larghezza";
+$locale["Wiki Name"] = "Wiki Nome";
+$locale["WikiAdminMarkup"] = "WikiAmministrazioneDisposizione";
+$locale["Yes"] = "Si";
+$locale["You are signed in as %s"] = "Utente corrente: %s";
+$locale["Your careful attention to detail is much appreciated."] = "Si prega di controllare che le modifiche siano quelle volute. Grazie.";
+$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"] = "La versione corrente";
+$locale["authenticated"] = "autenticato";
+$locale["by %s"] = "di %s";
+$locale["current version"] = "versione corrente";
+$locale["days"] = "giorni";
+$locale["diff"] = "diff";
+$locale["from %s"] = "dalla %s";
+$locale["locked"] = "bloccata";
+$locale["not authenticated"] = "non autenticato";
+$locale["plain file %s"] = "archivio del testo %s";
+$locale["saved as "] = "salvata a ";
+$locale["saved as %s"] = "salvata a %s";
+$locale["today"] = "oggi";
+$locale["version %d"] = "versione %d";
+$locale["version %s"] = "versione %s";
+$locale["version <em>%s</em>"] = "versione <em>%s</em>";
 $locale["yesterday"] =
    "ieri";
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/AmministrazioneDiPhpWiki
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/AmministrazioneDiPhpWiki	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/AmministrazioneDiPhpWiki	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:47 +0000
+Date: Fri,  4 Feb 2011 16:36:44 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AmministrazioneDiPhpWiki 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AmministrazioneDiPhpWiki 7927 2011-02-04 15:37:59Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AmministrazioneDiPhpWiki;
   flags=PAGE_LOCKED;
@@ -14,7 +14,6 @@
 
 <<CreateToc jshide||=1 with_toclink||=1 >>
 
-----
 == Page Explorer
 
 First select pages and then define the action:
@@ -23,14 +22,8 @@
 
 or call the available ~WikiAdmin actions directly:
 
-[/Rimuovi] |
-  [/Rename] |
-    [/Replace] |
-      [/SetAcl] |
-        [/Chmod] |
-          [/Chown]
+| [[/Rimuovi]] | [[/Rename]] | [[/Replace]] | [[/SetAcl]] | [[/Chmod]] | [[/Chown]]
 
-----
 == User Management
 
 PhpWiki:EmailVerification is currently non-strict, leaving some possible holes, which can be administrated below.
@@ -67,9 +60,9 @@
 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.
+  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.)
@@ -136,13 +129,13 @@
 
 === Old Formats
 
-__Serialized Files__
+**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__
+**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'',
@@ -163,7 +156,7 @@
 pages.
 
   The XHTML file collection can also be downloaded as an
-  __[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]__.
+  **[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]**.
 
 ----
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/PaginaDiProva
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/PaginaDiProva	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/PaginaDiProva	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:47 +0000
+Date: Tue,  4 Jan 2011 11:58:08 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PaginaDiProva 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PaginaDiProva 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PaginaDiProva;
   flags=PAGE_LOCKED;
@@ -72,7 +72,7 @@
 this is a plain paragraph again
 	# number
 ----
-__Link tests__
+**Link tests**
 # normal: FrontPage
 # in brackets: [FrontPage] -- named: [the front page|FrontPage]
 # Link in brackets: [http://phpwiki.sourceforge.net/]
@@ -94,13 +94,13 @@
 ----
 Markup tests:
 
-__underscores for bold__
+**underscores for bold**
 
 '''quotes for bold'''
 
 ''quotes for italic''
 
-__''underscores bold italic''__
+**''underscores bold italic''**
 
 '''''five quotes bold italic'''''
 
@@ -126,10 +126,10 @@
 ----
 Usage in preformatted text:
  
- __underscores for bold__
+ **underscores for bold**
  '''quotes for bold'''
  ''quotes for italic''
- __''underscores bold italic''__
+ **''underscores bold italic''**
  '''''five quotes bold italic'''''
  ''''''six quotes''''''
  !!! h1

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/TrovaPagina
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/TrovaPagina	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/it/pgsrc/TrovaPagina	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:47 +0000
+Date: Tue,  4 Jan 2011 11:58:08 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: TrovaPagina 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: TrovaPagina 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=TrovaPagina;
   flags=PAGE_LOCKED;
@@ -24,4 +24,4 @@
 ------
 Separa le parole con uno spazio. Tutte le parole devono corrispondere.
 %%%Per escludere delle parole falle precedere dal segno di '-'.
-%%%Esempio: 'wiki text -php' cerca per tutte le pagine contenenti la parola wiki __e__ il testo 'text', ma __non__  quelle contenenti 'php'
+%%%Esempio: 'wiki text -php' cerca per tutte le pagine contenenti la parola wiki **e** il testo 'text', ma **non**  quelle contenenti 'php'

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/ja/LC_MESSAGES/phpwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,473 +1,237 @@
 <?php
 
-$locale["%s Kb (%s bytes)"] =
-   "%s キロバイト(%s バイト)";
-$locale["%s bytes"] =
-   "%s バイト";
-$locale["%s bytes written"] =
-   "%s  バイト書き込みました。";
-$locale["%s is empty."] =
-   "%s が空です。";
-$locale["%s: Bad action"] =
-   "%s: 正しくない操作です。";
-$locale["%s: Can't open dba database"] =
-   "%s: dba データベースをオープン出来ません。";
-$locale["%s: file not found"] =
-   "%s: ファイルが見つかりません。";
-$locale["%s: not defined"] =
-   "%s: 未定義でした。";
-$locale["'%s': Bad page name"] =
-   "'%s': ページ名が正しくありません";
-$locale["(diff)"] =
-   "(差分)";
-$locale["<no matches>"] =
-   "<一致しません>";
-$locale["<none>"] =
-   "<なし>";
-$locale["<system language>"] =
-   "<システム言語>";
-$locale["<system theme>"] =
-   "<システムテーマ>";
-$locale["Action page"] =
-   "操作ページ";
-$locale["Adjust"] =
-   "調整";
-$locale["Admin"] =
-   "管理";
-$locale["AllPages"] =
-   "全ページ";
-$locale["AllUsers"] =
-   "全ユーザー";
-$locale["Allowed protocols"] =
-   "許可するプロトコル一覧";
-$locale["Appearance"] =
-   "外観";
-$locale["Application name"] =
-   "アプリケーション名";
-$locale["Application size: %d Kb"] =
-   "アプリケーションサイズ: %d キロバイト";
-$locale["Arguments"] =
-   "引数一覧";
-$locale["Auth Level"] =
-   "認証レベル";
-$locale["Auth Method"] =
-   "認証方法";
-$locale["Available plugins"] =
-   "有効なプラグイン一覧";
-$locale["Bad Version"] =
-   "バージョンが正しくありません。";
-$locale["Blog page"] =
-   "Blogページ";
-$locale["Browsing pages"] =
-   "ページを閲覧中です。";
-$locale["Cache statistics"] =
-   "キャッシュ統計";
-$locale["Calendar"] =
-   "カレンダー";
-$locale["Cannot create directory '%s'"] =
-   "ディレクトリ '%s' を作成出来ません。";
-$locale["Change Password"] =
-   "パスワード変更";
-$locale["Change country"] =
-   "国名変更";
-$locale["Comment"] =
-   "コメント";
-$locale["Complete."] =
-   "完了しました。";
-$locale["Contents"] =
-   "コンテンツ";
-$locale["Count"] =
-   "カウント";
-$locale["Create: %s"] =
-   "作成: %s";
-$locale["Creating pages"] =
-   "ページを作成しています。";
-$locale["Current Language"] =
-   "現在の言語";
-$locale["Current language: '%s'"] =
-   "現在の言語: %s";
-$locale["Current theme: '%s'"] =
-   "現在のテーマ: %s";
-$locale["Date Format"] =
-   "データフォーマット";
-$locale["DebugInfo"] =
-   "デバグ情報";
-$locale["Default theme: '%s'"] =
-   "デフォルトテーマ: %s";
-$locale["Describe %s here."] =
-   "ここに%sを記述します。";
-$locale["Description"] =
-   "説明";
-$locale["Dialog"] =
-   "ダイアログ";
-$locale["Diff"] =
-   "差分";
-$locale["Diff: %s"] =
-   "差分: %s";
-$locale["Diffing pages"] =
-   "ページの差分を出力しています。";
-$locale["Dump Pages as XHTML"] =
-   "XHTMLで出力";
-$locale["Dumping html pages"] =
-   "HTMLページを出力しています。";
-$locale["Dumping serial pages"] =
-   "シリアライズページを出力しています。";
-$locale["E-Mail"] =
-   "メール";
-$locale["Edit"] =
-   "編集";
-$locale["Edit %s"] =
-   "%s を編集";
-$locale["Edit Area Size"] =
-   "編集エリアのサイズ";
-$locale["Edit Old Revision"] =
-   "古いリビジョンを編集する";
-$locale["Edit aborted."] =
-   "編集を中断しました。";
-$locale["Edit metadata for %s"] =
-   "%s のMETAデータの編集";
-$locale["Edit: %s"] =
-   "編集: %s";
-$locale["EditMetaData"] =
-   "METAデータの編集";
-$locale["Editing pages"] =
-   "ページを編集しています。";
-$locale["Email not yet verified."] =
-   "メールアドレスを確認出来ませんでした。";
-$locale["Email verified."] =
-   "メールアドレスを確認出来ました。";
-$locale["Empty pagename!"] =
-   "ページ名が未指定です!";
-$locale["Enter your UserId to sign in"] =
-   "ユーザーIDを入力してサインインしてください。";
-$locale["Fatal PhpWiki Error"] =
-   "致命的なPhpWikiのエラーです。";
-$locale["FindPage"] =
-   "ページ検索";
-$locale["First"] =
-   "最初へ";
-$locale["FullTextSearch"] =
-   "全文検索";
-$locale["H"] =
-   "高さ";
-$locale["Height"] =
-   "高さ";
-$locale["History of changes."] =
-   "変更履歴";
-$locale["Hit statistics"] =
-   "ヒット統計";
-$locale["Hits"] =
-   "ヒット";
-$locale["Hits:"] =
-   "ヒット数:";
-$locale["HomePage"] =
-   "ホームページ";
-$locale["Included from %s"] =
-   "%s から読込まれました。";
-$locale["Index"] =
-   "インデックス";
-$locale["Inline images"] =
-   "インライン画像一覧";
-$locale["InterWiki Address"] =
-   "InterWikiアドレス";
-$locale["InterWikiSearch"] =
-   "InterWiki検索";
-$locale["Invalid password or userid."] =
-   "ユーザーIDかパスワードが無効です。";
-$locale["Language"] =
-   "言語";
-$locale["Last"] =
-   "最後へ";
-$locale["Last Author"] =
-   "最終編集者";
-$locale["Last Modified"] =
-   "最終更新日時";
-$locale["Last Summary"] =
-   "最終要約";
-$locale["List PageHistory for %s"] =
-   "%s のページ履歴一覧";
-$locale["Load File"] =
-   "ファイル読込み";
-$locale["Loading '%s'"] =
-   "'%s' を読込み中です。";
-$locale["Loading files"] =
-   "ファイルを読込み中です。";
-$locale["Lock Page"] =
-   "ページロック";
-$locale["Locked"] =
-   "ロックしました";
-$locale["Locking pages"] =
-   "ページをロック中です。";
-$locale["Login"] =
-   "ログイン";
-$locale["MIME file %s"] =
-   "MIMEファイル %s";
-$locale["Markup"] =
-   "マークアップ";
-$locale["Markup cache purged!"] =
-   "マークアップキャッシュを破棄しました!";
-$locale["Markup:"] =
-   "マークアップ:";
-$locale["Name"] =
-   "名称";
-$locale["New comment."] =
-   "新規コメント";
-$locale["New password"] =
-   "新規パスワード";
-$locale["Next"] =
-   "次へ";
-$locale["Next Month"] =
-   "次の月";
-$locale["No changes found"] =
-   "変更点が見つかりませんでした。";
-$locale["No changes."] =
-   "変更しませんでした。";
-$locale["No revisions found"] =
-   "リビジョンが見つかりません。";
-$locale["None"] =
-   "なし";
-$locale["Note:"] =
-   "ノート:";
-$locale["Okay"] =
-   "おっけー";
-$locale["OldStyleTable"] =
-   "旧スタイルのテーブル";
-$locale["PHP syntax highlighting"] =
-   "PHP構文ハイライト";
-$locale["Page Locked"] =
-   "ページをロックしました。";
-$locale["Page Name"] =
-   "ページ名";
-$locale["Page Type:"] =
-   "ページの種類<:";
-$locale["Page Version:"] =
-   "ページバージョン:";
-$locale["Page now locked."] =
-   "ページはロック中です。";
-$locale["Page now unlocked."] =
-   "ページはロック解除中です。";
-$locale["Page statistics"] =
-   "ページ統計";
-$locale["PageGroup"] =
-   "ページグループ";
-$locale["PageHistory"] =
-   "ページ履歴";
-$locale["PageHistory for %s"] =
-   "%s のページ履歴";
-$locale["PageInfo"] =
-   "ページ情報";
-$locale["Password:"] =
-   "パスワード:";
-$locale["Personal language:"] =
-   "個人言語";
-$locale["Personal theme:"] =
-   "個人テーマ";
-$locale["PhotoAlbum"] =
-   "フォトアルバム";
-$locale["PhpHighlight"] =
-   "PHPハイライト";
-$locale["Please continue editing.  (You'll find your %s at the bottom of the page.)"] =
-   "編集を続けて下さい。 (%s のページの下部も見てください)";
-$locale["Plugin"] =
-   "プラグイン";
-$locale["Plugin %s disabled."] =
-   "プラグイン %s は無効になっています。";
-$locale["Plugin %s failed."] =
-   "プラグイン %s が失敗しました。";
-$locale["PluginManager"] =
-   "プラグイン管理";
-$locale["Plugins"] =
-   "プラグイン一覧";
-$locale["PrevNext"] =
-   "前後";
-$locale["Preview"] =
-   "プレビューする";
-$locale["Preview only!  Changes not saved."] =
-   "プレビューしているだけです! まだ保存はされていません。";
-$locale["Previous"] =
-   "前へ";
-$locale["Previous Author"] =
-   "前の編集者";
-$locale["Previous Month"] =
-   "前の月";
-$locale["Previous Revision"] =
-   "前のリビジョン";
-$locale["Printer"] =
-   "プリンター";
-$locale["Purge Markup Cache"] =
-   "マークアップキャッシュの破棄";
-$locale["RandomPage"] =
-   "ランダムページ";
-$locale["Raw HTML"] =
-   "生のHTML";
-$locale["RecentChanges"] =
-   "変更履歴";
-$locale["Redirect"] =
-   "転送";
-$locale["References"] =
-   "参照一覧";
-$locale["Remove Page"] =
-   "ページ削除";
-$locale["Remove selected pages"] =
-   "選択ページを全て削除";
-$locale["Removing pages"] =
-   "ページを削除中です。";
-$locale["Return to %s"] =
-   "%s に戻る";
-$locale["Revision Not Found"] =
-   "リビジョンが見つかりません";
-$locale["Save"] =
-   "保存する";
-$locale["Score"] =
-   "スコア";
-$locale["Search"] =
-   "検索";
-$locale["See %s"] =
-   "%s を参照";
-$locale["See: %s"] =
-   "参照: %s";
-$locale["Select: "] =
-   "選択:";
-$locale["Serialized file %s"] =
-   "シリアライズファイル %s";
-$locale["Sidebar"] =
-   "スライドバー";
-$locale["Sign In"] =
-   "サインイン";
-$locale["Sign Out"] =
-   "サインサウト";
-$locale["SiteMap"] =
-   "サイトマップ";
-$locale["Size:"] =
-   "サイズ:";
-$locale["Sort by %s"] =
-   "%sでソートします。";
-$locale["Sound Score"] =
-   "サウンドスコア";
-$locale["Status:"] =
-   "状況:";
-$locale["Submit"] =
-   "送信";
-$locale["Submit country"] =
-   "国名送信";
-$locale["Submit location"] =
-   "所在地変更";
-$locale["Subpage"] =
-   "サブページ";
-$locale["Summary"] =
-   "要約";
-$locale["Supported languages"] =
-   "サポート言語一覧";
-$locale["Supported themes"] =
-   "サポートテーマ一覧";
-$locale["Synopsis"] =
-   "要約";
-$locale["SystemInfo"] =
-   "システム情報";
-$locale["Theme"] =
-   "テーマ";
-$locale["Time Zone"] =
-   "タイムゾーン";
-$locale["Title Search"] =
-   "タイトル検索";
-$locale["TitleSearch"] =
-   "タイトル検索";
-$locale["Today"] =
-   "今日";
-$locale["Top & bottom toolbars"] =
-   "上部と下部のツールバー";
-$locale["Total %d plugins: "] =
-   "合計 %d プラグイン";
-$locale["Total of %d themes: "] =
-   "総テーマ数: %d";
-$locale["Type it again"] =
-   "もう一度入力";
-$locale["Unlock Page"] =
-   "ページロック解除";
-$locale["Unlocking pages"] =
-   "ページのロックを解除中です。";
-$locale["Update Preferences"] =
-   "設定を更新しました";
-$locale["Upload"] =
-   "アップロード";
-$locale["Uploading %s"] =
-   "%s をアップロード中です。";
-$locale["Use old markup"] =
-   "古いマークアップを使用";
-$locale["User page"] =
-   "ユーザーページ";
-$locale["User statistics"] =
-   "ユーザー統計";
-$locale["UserId"] =
-   "ユーザーID";
-$locale["UserId:"] =
-   "ユーザーID:";
-$locale["UserPreferences"] =
-   "ユーザー設定";
-$locale["Using directory '%s'"] =
-   "ディレクトリ '%s' を使用しています。";
-$locale["Version"] =
-   "バージョン";
-$locale["Version %d"] =
-   "バージョン %d";
-$locale["Version %s"] =
-   "バージョン %s";
-$locale["View Source"] =
-   "ソースを見る";
-$locale["View Source: %s"] =
-   "ソースを見る: %s";
-$locale["View the current version"] =
-   "現在のバージョンを表示する";
-$locale["W"] =
-   "幅";
-$locale["Warning: You are editing an old revision."] =
-   "警告: あなたは古いリビジョンを編集しています。";
-$locale["Width"] =
-   "幅";
-$locale["Wiki Name"] =
-   "Wiki名";
-$locale["WikiForm: %s: unknown action"] =
-   "WikiForm: '%s' は未知の操作です。";
-$locale["Your E-Mail:"] =
-   "あなたのメールアドレス:";
-$locale["cached pagedata:"] =
-   "ページデータをキャッシュ:";
-$locale["cached versiondata:"] =
-   "バージョンデータをキャッシュ:";
-$locale["compare revisions"] =
-   "リビジョン比較";
-$locale["current version"] =
-   "現在のバージョン";
-$locale["diff"] =
-   "差分";
-$locale["edit area"] =
-   "編集エリア";
-$locale["from %s"] =
-   "%s から";
-$locale["home page"] =
-   "ホームページ";
-$locale["locked"] =
-   "ロックしました";
-$locale["max: %d"] =
-   "最大: %d";
-$locale["no cache used"] =
-   "キャッシュを使いません";
-$locale["plain file %s"] =
-   "プレインファイル %s";
-$locale["previous revision"] =
-   "前のリビジョン";
-$locale["saved as %s"] =
-   "%s を保存しました。";
-$locale["today"] =
-   "今日";
-$locale["too long"] =
-   "長すぎます。";
-$locale["use this plugin"] =
-   "このプラグインを使う";
-$locale["version %d"] =
-   "バージョン %d";
-$locale["version %s"] =
-   "バージョン %s";
+$locale["%s bytes"] = "%s バイト";
+$locale["%s bytes written"] = "%s  バイト書き込みました。";
+$locale["%s is empty."] = "%s が空です。";
+$locale["%s: Bad action"] = "%s: 正しくない操作です。";
+$locale["%s: Can't open dba database"] = "%s: dba データベースをオープン出来ません。";
+$locale["%s: file not found"] = "%s: ファイルが見つかりません。";
+$locale["%s: not defined"] = "%s: 未定義でした。";
+$locale["'%s': Bad page name"] = "'%s': ページ名が正しくありません";
+$locale["(diff)"] = "(差分)";
+$locale["<no matches>"] = "<一致しません>";
+$locale["<none>"] = "<なし>";
+$locale["<system language>"] = "<システム言語>";
+$locale["<system theme>"] = "<システムテーマ>";
+$locale["Action page"] = "操作ページ";
+$locale["Adjust"] = "調整";
+$locale["Admin"] = "管理";
+$locale["AllPages"] = "全ページ";
+$locale["AllUsers"] = "全ユーザー";
+$locale["Allowed protocols"] = "許可するプロトコル一覧";
+$locale["Appearance"] = "外観";
+$locale["Application name"] = "アプリケーション名";
+$locale["Arguments"] = "引数一覧";
+$locale["Auth Level"] = "認証レベル";
+$locale["Auth Method"] = "認証方法";
+$locale["Available plugins"] = "有効なプラグイン一覧";
+$locale["Bad Version"] = "バージョンが正しくありません。";
+$locale["Blog page"] = "Blogページ";
+$locale["Browsing pages"] = "ページを閲覧中です。";
+$locale["Cache statistics"] = "キャッシュ統計";
+$locale["Calendar"] = "カレンダー";
+$locale["Cannot create directory '%s'"] = "ディレクトリ '%s' を作成出来ません。";
+$locale["Change Password"] = "パスワード変更";
+$locale["Change country"] = "国名変更";
+$locale["Comment"] = "コメント";
+$locale["Complete."] = "完了しました。";
+$locale["Contents"] = "コンテンツ";
+$locale["Count"] = "カウント";
+$locale["Create: %s"] = "作成: %s";
+$locale["Creating pages"] = "ページを作成しています。";
+$locale["Current Language"] = "現在の言語";
+$locale["Current language: '%s'"] = "現在の言語: %s";
+$locale["Current theme: '%s'"] = "現在のテーマ: %s";
+$locale["Date Format"] = "データフォーマット";
+$locale["DebugInfo"] = "デバグ情報";
+$locale["Default theme: '%s'"] = "デフォルトテーマ: %s";
+$locale["Describe %s here."] = "ここに%sを記述します。";
+$locale["Description"] = "説明";
+$locale["Dialog"] = "ダイアログ";
+$locale["Diff"] = "差分";
+$locale["Diff: %s"] = "差分: %s";
+$locale["Diffing pages"] = "ページの差分を出力しています。";
+$locale["Dump Pages as XHTML"] = "XHTMLで出力";
+$locale["Dumping html pages"] = "HTMLページを出力しています。";
+$locale["Dumping serial pages"] = "シリアライズページを出力しています。";
+$locale["E-Mail"] = "メール";
+$locale["Edit"] = "編集";
+$locale["Edit %s"] = "%s を編集";
+$locale["Edit Area Size"] = "編集エリアのサイズ";
+$locale["Edit Old Revision"] = "古いリビジョンを編集する";
+$locale["Edit aborted."] = "編集を中断しました。";
+$locale["Edit metadata for %s"] = "%s のMETAデータの編集";
+$locale["Edit: %s"] = "編集: %s";
+$locale["EditMetaData"] = "METAデータの編集";
+$locale["Editing pages"] = "ページを編集しています。";
+$locale["Email not yet verified."] = "メールアドレスを確認出来ませんでした。";
+$locale["Email verified."] = "メールアドレスを確認出来ました。";
+$locale["Empty pagename!"] = "ページ名が未指定です!";
+$locale["Enter your UserId to sign in"] = "ユーザーIDを入力してサインインしてください。";
+$locale["Fatal PhpWiki Error"] = "致命的なPhpWikiのエラーです。";
+$locale["FindPage"] = "ページ検索";
+$locale["First"] = "最初へ";
+$locale["FullTextSearch"] = "全文検索";
+$locale["H"] = "高さ";
+$locale["Height"] = "高さ";
+$locale["History of changes."] = "変更履歴";
+$locale["Hit statistics"] = "ヒット統計";
+$locale["Hits"] = "ヒット";
+$locale["Hits:"] = "ヒット数:";
+$locale["HomePage"] = "ホームページ";
+$locale["Included from %s"] = "%s から読込まれました。";
+$locale["Index"] = "インデックス";
+$locale["Inline images"] = "インライン画像一覧";
+$locale["InterWiki Address"] = "InterWikiアドレス";
+$locale["InterWikiSearch"] = "InterWiki検索";
+$locale["Invalid password or userid."] = "ユーザーIDかパスワードが無効です。";
+$locale["Language"] = "言語";
+$locale["Last"] = "最後へ";
+$locale["Last Author"] = "最終編集者";
+$locale["Last Modified"] = "最終更新日時";
+$locale["Last Summary"] = "最終要約";
+$locale["List PageHistory for %s"] = "%s のページ履歴一覧";
+$locale["Load File"] = "ファイル読込み";
+$locale["Loading '%s'"] = "'%s' を読込み中です。";
+$locale["Loading files"] = "ファイルを読込み中です。";
+$locale["Lock Page"] = "ページロック";
+$locale["Locked"] = "ロックしました";
+$locale["Locking pages"] = "ページをロック中です。";
+$locale["Login"] = "ログイン";
+$locale["MIME file %s"] = "MIMEファイル %s";
+$locale["Markup"] = "マークアップ";
+$locale["Markup cache purged!"] = "マークアップキャッシュを破棄しました!";
+$locale["Markup:"] = "マークアップ:";
+$locale["Name"] = "名称";
+$locale["New comment."] = "新規コメント";
+$locale["New password"] = "新規パスワード";
+$locale["Next"] = "次へ";
+$locale["Next Month"] = "次の月";
+$locale["No changes found"] = "変更点が見つかりませんでした。";
+$locale["No changes."] = "変更しませんでした。";
+$locale["No revisions found"] = "リビジョンが見つかりません。";
+$locale["None"] = "なし";
+$locale["Note:"] = "ノート:";
+$locale["Okay"] = "おっけー";
+$locale["OldStyleTable"] = "旧スタイルのテーブル";
+$locale["PHP syntax highlighting"] = "PHP構文ハイライト";
+$locale["Page Locked"] = "ページをロックしました。";
+$locale["Page Name"] = "ページ名";
+$locale["Page Type:"] = "ページの種類<:";
+$locale["Page Version:"] = "ページバージョン:";
+$locale["Page now locked."] = "ページはロック中です。";
+$locale["Page now unlocked."] = "ページはロック解除中です。";
+$locale["Page statistics"] = "ページ統計";
+$locale["PageGroup"] = "ページグループ";
+$locale["PageHistory"] = "ページ履歴";
+$locale["PageHistory for %s"] = "%s のページ履歴";
+$locale["PageInfo"] = "ページ情報";
+$locale["Password:"] = "パスワード:";
+$locale["Personal language:"] = "個人言語";
+$locale["Personal theme:"] = "個人テーマ";
+$locale["PhotoAlbum"] = "フォトアルバム";
+$locale["PhpHighlight"] = "PHPハイライト";
+$locale["Please continue editing.  (You'll find your %s at the bottom of the page.)"] = "編集を続けて下さい。 (%s のページの下部も見てください)";
+$locale["Plugin"] = "プラグイン";
+$locale["Plugin %s disabled."] = "プラグイン %s は無効になっています。";
+$locale["Plugin %s failed."] = "プラグイン %s が失敗しました。";
+$locale["PluginManager"] = "プラグイン管理";
+$locale["Plugins"] = "プラグイン一覧";
+$locale["PrevNext"] = "前後";
+$locale["Preview"] = "プレビューする";
+$locale["Preview only!  Changes not saved."] = "プレビューしているだけです! まだ保存はされていません。";
+$locale["Previous"] = "前へ";
+$locale["Previous Author"] = "前の編集者";
+$locale["Previous Month"] = "前の月";
+$locale["Previous Revision"] = "前のリビジョン";
+$locale["Printer"] = "プリンター";
+$locale["Purge Markup Cache"] = "マークアップキャッシュの破棄";
+$locale["RandomPage"] = "ランダムページ";
+$locale["Raw HTML"] = "生のHTML";
+$locale["RecentChanges"] = "変更履歴";
+$locale["Redirect"] = "転送";
+$locale["References"] = "参照一覧";
+$locale["Remove Page"] = "ページ削除";
+$locale["Remove selected pages"] = "選択ページを全て削除";
+$locale["Removing pages"] = "ページを削除中です。";
+$locale["Return to %s"] = "%s に戻る";
+$locale["Revision Not Found"] = "リビジョンが見つかりません";
+$locale["Save"] = "保存する";
+$locale["Score"] = "スコア";
+$locale["Search"] = "検索";
+$locale["See %s"] = "%s を参照";
+$locale["See: %s"] = "参照: %s";
+$locale["Select: "] = "選択:";
+$locale["Serialized file %s"] = "シリアライズファイル %s";
+$locale["Sidebar"] = "スライドバー";
+$locale["Sign In"] = "サインイン";
+$locale["Sign Out"] = "サインサウト";
+$locale["SiteMap"] = "サイトマップ";
+$locale["Size:"] = "サイズ:";
+$locale["Sort by %s"] = "%sでソートします。";
+$locale["Sound Score"] = "サウンドスコア";
+$locale["Status:"] = "状況:";
+$locale["Submit"] = "送信";
+$locale["Submit country"] = "国名送信";
+$locale["Submit location"] = "所在地変更";
+$locale["Subpage"] = "サブページ";
+$locale["Summary"] = "要約";
+$locale["Supported languages"] = "サポート言語一覧";
+$locale["Supported themes"] = "サポートテーマ一覧";
+$locale["Synopsis"] = "要約";
+$locale["SystemInfo"] = "システム情報";
+$locale["Theme"] = "テーマ";
+$locale["Time Zone"] = "タイムゾーン";
+$locale["Title Search"] = "タイトル検索";
+$locale["TitleSearch"] = "タイトル検索";
+$locale["Today"] = "今日";
+$locale["Top & bottom toolbars"] = "上部と下部のツールバー";
+$locale["Total %d plugins: "] = "合計 %d プラグイン";
+$locale["Total of %d themes: "] = "総テーマ数: %d";
+$locale["Type it again"] = "もう一度入力";
+$locale["Unlock Page"] = "ページロック解除";
+$locale["Unlocking pages"] = "ページのロックを解除中です。";
+$locale["Update Preferences"] = "設定を更新しました";
+$locale["Upload"] = "アップロード";
+$locale["Uploading %s"] = "%s をアップロード中です。";
+$locale["Use old markup"] = "古いマークアップを使用";
+$locale["User page"] = "ユーザーページ";
+$locale["User statistics"] = "ユーザー統計";
+$locale["UserId"] = "ユーザーID";
+$locale["UserId:"] = "ユーザーID:";
+$locale["UserPreferences"] = "ユーザー設定";
+$locale["Using directory '%s'"] = "ディレクトリ '%s' を使用しています。";
+$locale["Version"] = "バージョン";
+$locale["Version %d"] = "バージョン %d";
+$locale["Version %s"] = "バージョン %s";
+$locale["View Source"] = "ソースを見る";
+$locale["View Source: %s"] = "ソースを見る: %s";
+$locale["View the current version"] = "現在のバージョンを表示する";
+$locale["W"] = "幅";
+$locale["Warning: You are editing an old revision."] = "警告: あなたは古いリビジョンを編集しています。";
+$locale["Width"] = "幅";
+$locale["Wiki Name"] = "Wiki名";
+$locale["WikiForm: %s: unknown action"] = "WikiForm: '%s' は未知の操作です。";
+$locale["Your E-Mail:"] = "あなたのメールアドレス:";
+$locale["cached pagedata:"] = "ページデータをキャッシュ:";
+$locale["cached versiondata:"] = "バージョンデータをキャッシュ:";
+$locale["compare revisions"] = "リビジョン比較";
+$locale["current version"] = "現在のバージョン";
+$locale["diff"] = "差分";
+$locale["edit area"] = "編集エリア";
+$locale["from %s"] = "%s から";
+$locale["home page"] = "ホームページ";
+$locale["locked"] = "ロックしました";
+$locale["max: %d"] = "最大: %d";
+$locale["no cache used"] = "キャッシュを使いません";
+$locale["plain file %s"] = "プレインファイル %s";
+$locale["previous revision"] = "前のリビジョン";
+$locale["saved as %s"] = "%s を保存しました。";
+$locale["today"] = "今日";
+$locale["too long"] = "長すぎます。";
+$locale["use this plugin"] = "このプラグインを使う";
+$locale["version %d"] = "バージョン %d";
+$locale["version %s"] = "バージョン %s";
 $locale["yesterday"] =
    "昨日";
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/make-php-trans.awk
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/make-php-trans.awk	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/make-php-trans.awk	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-# $Id: make-php-trans.awk 6207 2008-08-26 15:22:07Z vargenau $
+# $Id: make-php-trans.awk 8000 2011-03-16 16:56:03Z vargenau $
 
 BEGIN {
   msgid=""; msgstr="";
@@ -8,7 +8,7 @@
 /^msgid "/ { #"{
   if (msgid && str) {
     gsub(/\$/, "\\$", str);
-    print ("$locale[\"" msgid "\"] =\n   \"" str "\";");
+    print ("$locale[\"" msgid "\"] = \"" str "\";");
   }
   str = substr ($0, 8, length ($0) - 8);
   msgstr="";

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/nl/LC_MESSAGES/phpwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,215 +1,129 @@
 <?php
 
-$locale["%4d  %s\n"] =
-   "%4d  %s\n";
-$locale["%s: %s"] =
-   "%s: %s";
-$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] =
-   "Kopier je veranderingen naar het klipbord of een andere tijdelijke plaats (bijv. een tekst editor).";
-$locale["(diff)"] =
-   "(diff)";
-$locale["- saved to database as version %d"] =
-   "- bewaard in de data base als versie %d";
-$locale["An unnamed PhpWiki"] =
-   "Naamloos PhpWiki";
-$locale["BackLinks"] =
-   "TerugLinks";
-$locale["Cancel"] =
-   "Annuleer";
-$locale["Complete."] =
-   "Klaar.";
-$locale["Couldn't connect to %s"] =
-   "Kan verbinding naar data base %s niet tot stand brengen, geef op.";
-$locale["Describe %s here."] =
-   "Beschrijf %s hier.";
-$locale["Diff"] =
-   "Diff";
-$locale["Diff: %s"] =
-   "Diff van: %s";
-$locale["Edit"] =
-   "Verander";
-$locale["Edit %s"] =
-   "Verander %s";
-$locale["Edit: %s"] =
-   "Verander: %s";
-$locale["EditText"] =
-   "VeranderTekst";
-$locale["Edited by: %s"] =
-   "Verander von: %s";
-$locale["Fatal PhpWiki Error"] =
-   "PhpWiki Fatale Fout";
-$locale["FindPage"] =
-   "ZoekPagina";
-$locale["Full text search results for '%s'"] =
-   "Volledige tekst zoek resultaten naar '%s'";
-$locale["FullTextSearch"] =
-   "VolledigeTekstZoek";
-$locale["H"] =
-   "H";
-$locale["Height"] =
-   "Hoogte";
-$locale["Hits"] =
-   "Teller";
-$locale["Hits:"] =
-   "Teller:";
-$locale["Home"] =
-   "Thuis";
-$locale["HomePage"] =
-   "ThuisPagina";
-$locale["Last Author"] =
-   "Vorige Auteur";
-$locale["Last Modified"] =
-   "meest recente verandering";
-$locale["Last edited %s"] =
-   "Meest recente verandering %s";
-$locale["Last edited on %s"] =
-   "Meest recente verandering op %s";
-$locale["LdapSearch"] =
-   "LdapZoek";
-$locale["Links"] =
-   "Links";
-$locale["LiveSearch"] =
-   "LiveZoek";
-$locale["Loading up virgin wiki"] =
-   "Laden van maagdelijke wiki";
-$locale["Lock Page"] =
-   "Open Pagina";
-$locale["Locked"] =
-   "Låst";
-$locale["MIME file %s"] =
-   "MIME bestand %s";
-$locale["MostPopular"] =
-   "Meestbezochte";
-$locale["New page"] =
-   "Nieuw pagina";
-$locale["Newer page:"] =
-   "Nieuw pagina:";
-$locale["Next"] =
-   "Volgende";
-$locale["None"] =
-   "Geen";
-$locale["Page Locked"] =
-   "Sidan är Låst";
-$locale["Page Name"] =
-   "Pagina Naam";
-$locale["PageHistory"] =
-   "PaginaGeschiedenis";
-$locale["PhpWikiAdministration"] =
-   "PhpWikiBeheer";
-$locale["PhpWikiAdministration/Chmod"] =
-   "PhpWikiBeheer/Chmod";
-$locale["PhpWikiAdministration/Replace"] =
-   "PhpWikiBeheer/Vervangt";
-$locale["PhpWikiDocumentation"] =
-   "PhpWikiDocumentatie";
-$locale["Preview"] =
-   "Voorvertonig";
-$locale["Previous"] =
-   "Vorige";
-$locale["Previous Author"] =
-   "Vorige Auteur";
-$locale["Printer"] =
-   "Drukker";
-$locale["RecentChanges"] =
-   "RecenteVeranderingen";
-$locale["RecentVisitors"] =
-   "RecenteBezoekers";
-$locale["References"] =
-   "Referenties";
-$locale["ReleaseNotes"] =
-   "UitgaveNoten";
-$locale["Remove Page"] =
-   "Verwijder Pagina";
-$locale["Removed page '%s' successfully."] =
-   "Pagina '%s' verwijderd.";
-$locale["Return to %s"] =
-   "Terug naar %s";
-$locale["Save"] =
-   "Bewaar";
-$locale["Saved: %s"] =
-   "Bewaard: %s";
-$locale["Search"] =
-   "Zoek";
-$locale["Search & Replace"] =
-   "Zoek & Vervangt";
-$locale["See %s"] =
-   "Zie %s";
-$locale["See %s tips for editing."] =
-   "%s tips for veranderen.";
-$locale["Serialized file %s"] =
-   "Geserialiseerd bestand %s";
-$locale["Skipping"] =
-   "Overgeslagen";
-$locale["Sorry for the inconvenience."] =
-   "Excuses voor het ongemak.";
-$locale["TextFormattingRules"] =
-   "TekstFormatteringsRegels";
-$locale["Thank you for editing %s."] =
-   "Bedankt voor het veranderen van %s.";
-$locale["The %d most popular pages of this wiki:"] =
-   "De %d meestbezochte pagina's van deze Wiki:";
-$locale["The %d most recent %s are listed below."] =
-   "De %d meest recent %s staan hieronder.";
-$locale["This page has been locked by the administrator so your changes can not be saved."] =
-   "Deze pagina is afgesloten door de beheerder en je veranderingen kan niet bewaar worden.";
-$locale["Title Search"] =
-   "Titel Zoek";
-$locale["Title search results for '%s'"] =
-   "Titel zoek resultaten naar '%s'";
-$locale["TitleSearch"] =
-   "TitelZoek";
-$locale["Unlock Page"] =
-   "Sluit Pagina Af";
-$locale["Update Preferences"] =
-   "Zet Voorkeuren";
-$locale["UserPreferences"] =
-   "GebruikersVoorkeuren";
-$locale["Version"] =
-   "Versie";
-$locale["Version %d"] =
-   "Versie %d";
-$locale["Version %s, saved %s"] =
-   "Versie %s, bewarrd %s";
-$locale["Version %s, saved on %s"] =
-   "Versie %s, bewarrd op %s";
-$locale["Versions are identical"] =
-   "Versies zijn identiek";
-$locale["View Source"] =
-   "Bron Tekst";
-$locale["View Source: %s"] =
-   "Bron tekst: %s";
-$locale["W"] =
-   "B";
-$locale["Width"] =
-   "Breedte";
-$locale["You are about to remove '%s'!"] =
-   "Je staat te verwijderen '%s' op het punt!";
-$locale["You must specify a directory to dump to"] =
-   "Je moet een directory specificeren om in te storten";
-$locale["Your careful attention to detail is much appreciated."] =
-   "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd.";
-$locale["Your home page has not been created yet so your preferences cannot not be saved."] =
-   "Deze pagina is afgesloten door de beheerder en je veranderingen kan niet bewaar worden.";
-$locale["[%d] See [%s]"] =
-   "[%d] Zie [%s]";
-$locale["by %s"] =
-   "door %s";
-$locale["current version"] =
-   "huidige versie";
-$locale["diff"] =
-   "diff";
-$locale["from %s"] =
-   "van %s";
-$locale["locked"] =
-   "låst";
-$locale["plain file %s"] =
-   "plat bestand %s";
-$locale["saved as %s"] =
-   "bewaard als %s";
-$locale["version %d"] =
-   "versie %d";
-$locale["version %s"] =
-   "versie %s";
+$locale["%4d  %s\n"] = "%4d  %s\n";
+$locale["%s: %s"] = "%s: %s";
+$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "Kopier je veranderingen naar het klipbord of een andere tijdelijke plaats (bijv. een tekst editor).";
+$locale["(diff)"] = "(diff)";
+$locale["- saved to database as version %d"] = "- bewaard in de data base als versie %d";
+$locale["Administration"] = "Beheer";
+$locale["An unnamed PhpWiki"] = "Naamloos PhpWiki";
+$locale["Back Links"] = "Terug Links";
+$locale["BackLinks"] = "TerugLinks";
+$locale["Cancel"] = "Annuleer";
+$locale["Changes"] = "Veranderingen";
+$locale["Complete."] = "Klaar.";
+$locale["Couldn't connect to %s"] = "Kan verbinding naar data base %s niet tot stand brengen, geef op.";
+$locale["Describe %s here."] = "Beschrijf %s hier.";
+$locale["Diff"] = "Diff";
+$locale["Diff: %s"] = "Diff van: %s";
+$locale["Edit"] = "Verander";
+$locale["Edit %s"] = "Verander %s";
+$locale["Edit: %s"] = "Verander: %s";
+$locale["EditText"] = "VeranderTekst";
+$locale["Edited by: %s"] = "Verander von: %s";
+$locale["Fatal PhpWiki Error"] = "PhpWiki Fatale Fout";
+$locale["FindPage"] = "ZoekPagina";
+$locale["Full text search results for '%s'"] = "Volledige tekst zoek resultaten naar '%s'";
+$locale["FullTextSearch"] = "VolledigeTekstZoek";
+$locale["H"] = "H";
+$locale["Height"] = "Hoogte";
+$locale["Help"] = "Help";
+$locale["Help/GoodStyle"] = "Help/GoedeStijl";
+$locale["Help/OldTextFormattingRules"] = "Help/OudTekstFormatteringsRegels";
+$locale["Help/TextFormattingRules"] = "Help/TekstFormatteringsRegels";
+$locale["Help/WabiSabi"] = "Help/WabiSabi";
+$locale["Help/WikiWikiWeb"] = "Help/WikiWikiWeb";
+$locale["History"] = "Geschiedenis";
+$locale["Hits"] = "Teller";
+$locale["Hits:"] = "Teller:";
+$locale["Home"] = "Thuis";
+$locale["Home Page"] = "Thuis Pagina";
+$locale["Home page"] = "Thuis Pagina";
+$locale["HomePage"] = "ThuisPagina";
+$locale["Last Author"] = "Vorige Auteur";
+$locale["Last Modified"] = "meest recente verandering";
+$locale["Last edited %s"] = "Meest recente verandering %s";
+$locale["Last edited on %s"] = "Meest recente verandering op %s";
+$locale["LdapSearch"] = "LdapZoek";
+$locale["Links"] = "Links";
+$locale["LiveSearch"] = "LiveZoek";
+$locale["Loading up virgin wiki"] = "Laden van maagdelijke wiki";
+$locale["Lock Page"] = "Open Pagina";
+$locale["Locked"] = "Låst";
+$locale["MIME file %s"] = "MIME bestand %s";
+$locale["MostPopular"] = "MeestBezocht";
+$locale["My Changes"] = "Mijn Veranderingen";
+$locale["MyRecentChanges"] = "MijnRecenteVeranderingen";
+$locale["New page"] = "Nieuw pagina";
+$locale["Newer page:"] = "Nieuw pagina:";
+$locale["Next"] = "Volgende";
+$locale["None"] = "Geen";
+$locale["Page"] = "Pagina";
+$locale["Page Locked"] = "Sidan är Låst";
+$locale["Page Name"] = "Pagina Naam";
+$locale["PageHistory"] = "PaginaGeschiedenis";
+$locale["PhpWikiAdministration"] = "PhpWikiBeheer";
+$locale["PhpWikiAdministration/Chmod"] = "PhpWikiBeheer/Chmod";
+$locale["PhpWikiAdministration/Markup"] = "PhpWikiBeheer/Markup";
+$locale["PhpWikiAdministration/Replace"] = "PhpWikiBeheer/Vervangt";
+$locale["PhpWikiDocumentation"] = "PhpWikiDocumentatie";
+$locale["Preview"] = "Voorvertonig";
+$locale["Previous"] = "Vorige";
+$locale["Previous Author"] = "Vorige Auteur";
+$locale["Printer"] = "Drukker";
+$locale["Recent Changes"] = "Recente Veranderingen";
+$locale["Recent changes"] = "Recente Veranderingen";
+$locale["RecentChanges"] = "RecenteVeranderingen";
+$locale["RecentVisitors"] = "RecenteBezoekers";
+$locale["References"] = "Referenties";
+$locale["ReleaseNotes"] = "UitgaveNoten";
+$locale["Remove Page"] = "Verwijder Pagina";
+$locale["Removed page '%s' successfully."] = "Pagina '%s' verwijderd.";
+$locale["Return to %s"] = "Terug naar %s";
+$locale["SandBox"] = "ZandBak";
+$locale["Save"] = "Bewaar";
+$locale["Saved: %s"] = "Bewaard: %s";
+$locale["Search"] = "Zoek";
+$locale["Search & Replace"] = "Zoek & Vervangt";
+$locale["See %s"] = "Zie %s";
+$locale["See %s tips for editing."] = "%s tips for veranderen.";
+$locale["Serialized file %s"] = "Geserialiseerd bestand %s";
+$locale["Skipping"] = "Overgeslagen";
+$locale["Sorry for the inconvenience."] = "Excuses voor het ongemak.";
+$locale["TextFormattingRules"] = "TekstFormatteringsRegels";
+$locale["Thank you for editing %s."] = "Bedankt voor het veranderen van %s.";
+$locale["The %d most popular pages of this wiki:"] = "De %d meestbezochte pagina's van deze Wiki:";
+$locale["The %d most recent %s are listed below."] = "De %d meest recent %s staan hieronder.";
+$locale["This page has been locked by the administrator so your changes can not be saved."] = "Deze pagina is afgesloten door de beheerder en je veranderingen kan niet bewaar worden.";
+$locale["Title Search"] = "Titel Zoek";
+$locale["Title search results for '%s'"] = "Titel zoek resultaten naar '%s'";
+$locale["TitleSearch"] = "TitelZoek";
+$locale["Unlock Page"] = "Sluit Pagina Af";
+$locale["Update Preferences"] = "Zet Voorkeuren";
+$locale["UserPreferences"] = "GebruikersVoorkeuren";
+$locale["Version"] = "Versie";
+$locale["Version %d"] = "Versie %d";
+$locale["Version %s, saved on %s"] = "Versie %s, bewarrd op %s";
+$locale["Versions are identical"] = "Versies zijn identiek";
+$locale["View Source"] = "Bron Tekst";
+$locale["View Source: %s"] = "Bron tekst: %s";
+$locale["W"] = "B";
+$locale["Width"] = "Breedte";
+$locale["Wiki Admin"] = "PhpWiki Beheer";
+$locale["You are about to remove '%s'!"] = "Je staat te verwijderen '%s' op het punt!";
+$locale["You must specify a directory to dump to"] = "Je moet een directory specificeren om in te storten";
+$locale["Your careful attention to detail is much appreciated."] = "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd.";
+$locale["Your home page has not been created yet so your preferences cannot not be saved."] = "Deze pagina is afgesloten door de beheerder en je veranderingen kan niet bewaar worden.";
+$locale["[%d] See [%s]"] = "[%d] Zie [%s]";
+$locale["by %s"] = "door %s";
+$locale["current version"] = "huidige versie";
+$locale["diff"] = "diff";
+$locale["from %s"] = "van %s";
+$locale["locked"] = "låst";
+$locale["plain file %s"] = "plat bestand %s";
+$locale["saved as %s"] = "bewaard als %s";
+$locale["version %d"] = "versie %d";
+$locale["version %s"] = "versie %s";
 $locale["version <em>%s</em>"] =
    "versie <em>%s</em>";
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/PhpWikiBeheer
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/PhpWikiBeheer	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/PhpWikiBeheer	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
+Date: Fri,  4 Feb 2011 16:36:35 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PhpWikiBeheer 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PhpWikiBeheer 7927 2011-02-04 15:37:59Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiBeheer;
   flags=PAGE_LOCKED;
@@ -14,7 +14,6 @@
 
 <<CreateToc jshide||=1 with_toclink||=1 >>
 
-----
 == Page Explorer
 
 First select pages and then define the action:
@@ -23,14 +22,8 @@
 
 or call the available ~WikiAdmin actions directly:
 
-[/Verwijder] |
-  [/Rename] |
-    [/Vervangt] |
-      [/SetAcl] |
-        [/Chmod] |
-          [/Chown]
+| [[/Verwijder]] | [[/Rename]] | [[/Vervangt]] | [[/SetAcl]] | [[/Chmod]] | [[/Chown]]
 
-----
 == User Management
 
 PhpWiki:EmailVerification is currently non-strict, leaving some possible holes, which can be 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/UitgaveNoten
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/UitgaveNoten	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/UitgaveNoten	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,10 +1,10 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
+Date: Wed, 26 Jan 2011 17:27:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: UitgaveNoten 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: UitgaveNoten 7908 2011-01-26 16:28:16Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=UitgaveNoten;
   flags="";
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-Zie ReleaseNotes.
+Zie [[ReleaseNotes]].

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/ZoekPagina
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/ZoekPagina	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/nl/pgsrc/ZoekPagina	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
+Date: Tue,  4 Jan 2011 11:57:15 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ZoekPagina 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: ZoekPagina 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ZoekPagina;
   flags=PAGE_LOCKED;
@@ -25,6 +25,6 @@
 Scheid woorden met een spatie.  Alle woorden moeten gevonden worden.
 %%%Om woorden uit te zonderen, plak er een '-' voor.
 %%%Voorbeeld: 'wiki tekst -php' zoekt naar alle pagina's die de woorden
-'wiki' __en__ 'tekst' bevatten, maar __niet__ het woord 'php.
+'wiki' **en** 'tekst' bevatten, maar **niet** het woord 'php.
 
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/de.po
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/de.po	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/de.po	2011-05-18 19:36:20 UTC (rev 13355)
@@ -4,16 +4,17 @@
 # ThePhpWikiProgrammingTeam.
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.15\n"
+"Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <rurban at x-ray.at>, Carsten Klapp "
 "<carstenklapp at users.sourceforge.net>, Helmer Pardun <pardunpress at t-online."
 "de>, Arno Hollosi <ahollosi at mail.com>\n"
 "Language-Team: German <de at li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../lib/CachedMarkup.php:536
@@ -47,12 +48,12 @@
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr "Die DBA Methode %s wird nicht unterstützt!"
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr "Unterstützte DBA Methoden sind: %s"
@@ -72,8 +73,8 @@
 msgid "version %s"
 msgstr "Version %s"
 
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr "von %s"
@@ -89,7 +90,7 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr "Leider gibt es keine solche Seite %s."
 
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr "Vergleich von: %s"
@@ -148,48 +149,24 @@
 msgid "Older page:"
 msgstr "Ältere Seite:"
 
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "Speichere Version %d zurück."
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " and "
-msgstr "hinzufügen "
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Versionen sind identisch"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Version"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr "LinkDatenbank"
@@ -197,40 +174,43 @@
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr "NeuesteÄnderungen"
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "Nicht unterstütztes Argument: %s=%s"
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -248,12 +228,12 @@
 msgid "(Redirected from %s)"
 msgstr "(Weitergeleitet von %s)"
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
 msgstr "SandKasten"
 
@@ -308,14 +288,12 @@
 msgstr "Seite jetzt nicht mehr öffentlich freigegeben."
 
 #: ../lib/editpage.php:269
-#, fuzzy
 msgid "Page now external."
-msgstr "Seite jetzt freigegeben."
+msgstr ""
 
 #: ../lib/editpage.php:270
-#, fuzzy
 msgid "Page now not-external."
-msgstr "Seite jetzt freigegeben."
+msgstr ""
 
 #: ../lib/editpage.php:379
 #, php-format
@@ -356,7 +334,7 @@
 msgid "Versions are identical"
 msgstr "Versionen sind identisch"
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr "Seite Gesperrt"
 
@@ -396,19 +374,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr "BenutzerEinstellungen"
@@ -477,8 +455,8 @@
 msgid "Changes"
 msgstr "Änderungen"
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -528,8 +506,8 @@
 msgid "String \"%s\" not found."
 msgstr "Zeichenkette \"%s\" nicht gefunden."
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
 msgstr "Suchen & Ersetzen"
 
@@ -541,8 +519,8 @@
 msgid "Replace with"
 msgstr "Ersetze mit"
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -553,9 +531,9 @@
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr "Schließen"
 
@@ -643,8 +621,8 @@
 msgid "List"
 msgstr "Liste"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
@@ -653,8 +631,8 @@
 msgid "Page Name"
 msgstr "Seitenname"
 
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr "Weiterleiten"
 
@@ -667,89 +645,83 @@
 msgid "Template"
 msgstr "Vorlage"
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 msgid "Undo Search & Replace"
 msgstr "Suchen & Ersetzen rückgängig machen"
 
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 msgid "AddCategory"
 msgstr "NeueKategorie"
 
-#: ../lib/EditToolbar.php:321
-#, fuzzy
+#: ../lib/EditToolbar.php:320
 msgid "Insert Categories"
-msgstr "Kategorie"
+msgstr "Neue Kategorie"
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr "Einfügen"
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 msgid "AddPlugin"
 msgstr "Plugin einfügen"
 
-#: ../lib/EditToolbar.php:371
-#, fuzzy
+#: ../lib/EditToolbar.php:370
 msgid "Insert Plugin"
-msgstr "um diese Zusatzprogramme zu verwenden"
+msgstr "Zusatzprogramme einfügen"
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 msgid "AddPageLink"
 msgstr "SeitenLink einfügen"
 
-#: ../lib/EditToolbar.php:401
-#, fuzzy
+#: ../lib/EditToolbar.php:400
 msgid "Insert PageLink"
-msgstr "SeitenLink einfügen (Doppelklick)"
+msgstr "SeitenLink einfügen"
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
-#, fuzzy
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 msgid "Add Image or Video"
-msgstr "Bild einfügen"
+msgstr "Bild oder Video einfügen"
 
-#: ../lib/EditToolbar.php:439
-#, fuzzy
+#: ../lib/EditToolbar.php:438
 msgid "Insert Image or Video"
-msgstr "Bild einfügen"
+msgstr "Bild oder Video einfügen"
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
 msgstr "NeueVorlage"
 
-#: ../lib/EditToolbar.php:474
-#, fuzzy
+#: ../lib/EditToolbar.php:473
 msgid "Insert Template"
-msgstr "Vorlage"
+msgstr "Vorlage einfügen"
 
 #: ../lib/ErrorManager.php:220
 #, php-format
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
 
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
 
 # (namenlos=unbenannt; depends on interpretation)
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr "Unbenanntes PhpWiki"
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr "StartSeite"
@@ -758,7 +730,23 @@
 msgid "Invalid [] syntax ignored"
 msgstr "Ungültige [] syntax ignoriert"
 
-#: ../lib/InlineParser.php:889
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+msgid ": "
+msgstr ": "
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "unbekannte Farbe %s ignoriert"
@@ -771,7 +759,7 @@
 msgid "Dump to directory"
 msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern"
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 msgid "Upload File"
 msgstr "Datei Hochladen"
 
@@ -789,25 +777,25 @@
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
@@ -815,7 +803,7 @@
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
@@ -847,86 +835,86 @@
 # all revisions of all pages (FullDump), or just the most recent
 # revision of each page (LatestSnapshot).
 # VollständigerSpeicherauszug, VolligerSpeicherauszug oder...?
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr "VollSicherung"
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr "LetzeSicherung"
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr "Sie müssen zum Sichern ein Verzeichnis angeben."
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr "Das Verzeichnis »%s« kann nicht erzeugt werden"
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen..."
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
 msgstr "Das Verzeichnis »%s« wird verwendet"
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr "Die Seiten werden geschrieben"
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr "Ausgelassen."
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr "gespeichert als %s"
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Datei »%s« konnte nicht zum Schreiben geöffnet werden"
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr "%s Bytes geschrieben"
 
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr "... kopiert nach %s"
 
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, php-format
 msgid "... not copied to %s"
 msgstr "... nicht kopiert nach %s"
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 msgid "saved as "
 msgstr "gespeichert als "
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr "... nicht gefunden"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr "Leerer Seitenname!"
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 msgid "Invalid pagename!"
 msgstr "Ungültiger Seitenname!"
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -935,52 +923,52 @@
 msgid "InterWikiMap"
 msgstr "InterWikiListe"
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "von %s"
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Neue Seite"
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 "hat unauflösbare Konflikte beim Speichern - wird ungeprüft überschrieben"
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr "hat unauflösbare Konflikte beim Speichern - übersprungen"
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version "
 "erzeugt"
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME-Datei %s"
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialisierte Datei %s"
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr "Nur-Text-Datei %s"
@@ -988,26 +976,26 @@
 # This translation gives the general idea of the action to be performed, 
 # but the text must be brief enough to fit inside a button:
 # "widersprechende Änderungen Zusammenfügen und die ergebende Seite Bearbeiten"
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr "Zusammenfügen Bearbeiten"
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr "Ungeprüft überschreiben"
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr " Konnte leider nicht automatisch einpflegen."
 
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
@@ -1015,109 +1003,109 @@
 msgid "Revert"
 msgstr "Zurückspeichern"
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr "Parameter version muß angegeben werden"
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 msgid "no page content"
 msgstr "leerer Seiteninalt"
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 msgid "same version page"
 msgstr "selbe Version der Seite"
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr "Ja"
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr "Speichere Version %d zurück."
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1134
 #, php-format
 msgid "Revert: %s"
 msgstr "Zurückspeichern: %s"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: nicht definiert"
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr "Standard-Datei der InterWikiListe nicht geladen."
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr "Übersprungen"
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Ungültiger Dateityp: %s"
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr "»%s« wird geladen"
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr "Lade neue Seiten in das frische Wiki"
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr "Keine Datei zum Hochladen?"
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
@@ -1127,41 +1115,40 @@
 msgid "PageChange Notification of %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s"
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, php-format
 msgid "sent to %s"
 msgstr "an %s gesendet"
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Fehler: Konnte nicht %s an %s senden"
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:288
-#, fuzzy, php-format
+#: ../lib/MailNotify.php:289
+#, php-format
 msgid "Summary: %s"
-msgstr "Zusammenfassung:"
+msgstr "Zusammenfassung: %s"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/MailNotify.php:342
-#, fuzzy, php-format
+#: ../lib/MailNotify.php:343
+#, php-format
 msgid "User %s removed page %s"
-msgstr "Seite gelöscht %s"
+msgstr "Seite gelöscht %s von Benutzer %s"
 
-#: ../lib/MailNotify.php:378
-#, fuzzy
+#: ../lib/MailNotify.php:379
 msgid "E-Mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1176,7 +1163,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
@@ -1407,14 +1394,12 @@
 "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei"
 
 #: ../lib/main.php:769
-#, fuzzy
 msgid "Illegal character '"
-msgstr "Ungültiges Zeichen %s entfernt"
+msgstr "Ungültiges Zeichen"
 
 #: ../lib/main.php:769
-#, fuzzy
 msgid "' in page name."
-msgstr "»%s«: Ungültiger Seitenname"
+msgstr "' in Seitenname."
 
 #: ../lib/main.php:788
 #, php-format
@@ -1447,13 +1432,12 @@
 msgstr "AclSetzen"
 
 #: ../lib/main.php:1092
-#, fuzzy
 msgid "SetAclSimple"
-msgstr "AclSetzen"
+msgstr ""
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -1475,7 +1459,7 @@
 msgstr "VolltextSuche"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1519,8 +1503,8 @@
 msgid "Users will not be able to sign in."
 msgstr "Benutzer werden sich nicht anmelden können."
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
 #: ../lib/PageList.php:93
@@ -1545,7 +1529,7 @@
 msgid "Click to de-/select all pages"
 msgstr "Klicken Sie um alle/keine Seiten auszuwählen"
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... erste %d Bytes"
@@ -1560,21 +1544,20 @@
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "Zugriffsrecht geerbt von %s"
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
-#, fuzzy
 msgid "individual page permission"
 msgstr "individuelles Zugriffsrecht"
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
@@ -1585,17 +1568,17 @@
 msgstr "<nichts gefunden>"
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 msgid "Content"
 msgstr "Inhalt"
 
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 msgid "Permission"
 msgstr "Zugriffsrecht"
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr "ACL"
 
@@ -1656,14 +1639,12 @@
 msgstr "gesperrt"
 
 #: ../lib/PageList.php:1209 ../themes/fusionforge/templates/editpage.tmpl:67
-#, fuzzy
 msgid "External"
-msgstr "Externe Links"
+msgstr "Externe"
 
 #: ../lib/PageList.php:1210
-#, fuzzy
 msgid "external"
-msgstr "Externe Links"
+msgstr "externe"
 
 #: ../lib/PageList.php:1213
 msgid "Minor Edit"
@@ -1678,7 +1659,7 @@
 msgstr "Quelltext"
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
@@ -1688,7 +1669,6 @@
 msgstr "Spalten: %s."
 
 #: ../lib/PagePerm.php:191
-#, fuzzy
 msgid "SearchReplace"
 msgstr "Suchen & Ersetzen"
 
@@ -1747,7 +1727,7 @@
 msgstr "Lö/+"
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1775,12 +1755,14 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr "ACHTUNG: Die InterWikiListe Seite ist ungesperrt. Ignoriert."
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1818,7 +1800,7 @@
 msgid "Click to display all comments"
 msgstr "Klicken um Kommentare anzuzeigen"
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr "Klicken um anzuzeigen"
 
@@ -1836,12 +1818,12 @@
 msgstr "Alle Seiten in diesem Wiki auflisten."
 
 #: ../lib/plugin/AllPages.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "All pages in this wiki (%d total):"
 msgstr "Alle Seiten in diesem Wiki (%d insgesamt):"
 
 #: ../lib/plugin/AllPages.php:75
-#, fuzzy, php-format
+#, php-format
 msgid "List of user-created pages (%d total):"
 msgstr "Liste der Benutzer erzeugten Seiten (%d insgesamt):"
 
@@ -1881,112 +1863,112 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr "Eingetragene Benutzer in diesem Wiki (Gesamt: %d):"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr "Benutzer"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr "Stunden"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr "Tage"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr "Wochen"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr "Zeige Überblick über die Access LOG-Tabelle."
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr "Diese Information ist nur für Administratoren zugänglich."
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr "SQL_ACCESS_LOG ist nicht aktiviert."
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr "Ungültiges Argument 'mode=%s'"
 
 # some empty DB field
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -2014,11 +1996,11 @@
 msgid "AppendText to %s"
 msgstr "TextHinzufügen zu %s"
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
 msgstr "Datei erfolgreich geändert."
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
 msgstr "Gehe zu %s."
@@ -2044,9 +2026,8 @@
 msgstr ""
 
 #: ../lib/plugin/AtomFeed.php:36
-#, fuzzy
 msgid "Atom Aggregator Plugin"
-msgstr "Einfaches RSS Feed Plugin"
+msgstr ""
 
 #: ../lib/plugin/_AuthInfo.php:35
 msgid "AuthInfo"
@@ -2122,10 +2103,10 @@
 #, php-format
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr ""
-"Verlaufsprotokoll aller großen und kleinen Änderungen aller Seiten, die von %"
-"s bearbeitet wurden."
+"Verlaufsprotokoll aller großen und kleinen Änderungen aller Seiten, die von "
+"%s bearbeitet wurden."
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2261,14 +2242,14 @@
 msgstr "Bearbeite %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2318,9 +2299,8 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr "Keine Seite angegeben"
 
@@ -2337,15 +2317,13 @@
 msgstr "Kann Seite mit leerem Namen nicht erzeugen"
 
 #: ../lib/plugin/CreatePage.php:70
-#, fuzzy
 msgid "CreatePage failed"
-msgstr "NeueSeite"
+msgstr ""
 
 #: ../lib/plugin/CreatePage.php:72 ../lib/plugin/CreatePage.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "Do you really want to create the page '%s'?"
 msgstr ""
-"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
 
 #: ../lib/plugin/CreatePage.php:79 ../lib/plugin/CreatePage.php:83
 msgid "The new page you want to create will be a subpage."
@@ -2369,25 +2347,48 @@
 msgid "Created by CreatePage"
 msgstr "Erzeugt von NeueSeite"
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr "InhaltsVerzeichnis"
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+msgid "No page specified."
+msgstr "Keine Seite angegeben."
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, php-format
+msgid "Page '%s' does not exist."
+msgstr "Seite »%s« existiert nicht"
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
-msgstr "InhaltsVerzeichnis deaktiviert für altes Markup"
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
+msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, php-format
+msgid "%s: no such revision %d."
+msgstr "%s(%d): keine solche Version"
+
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
+msgstr "InhaltsVerzeichnis deaktiviert für altes Markup."
+
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr "Klicken um TOC anzuzeigen"
 
@@ -2403,8 +2404,8 @@
 msgid "DeadEndPages"
 msgstr "VerwaisteSeiten"
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "Diff"
 
@@ -2413,32 +2414,49 @@
 msgid "Display differences between revisions"
 msgstr "Zeilenweiser Vergleich der Versionen"
 
+#: ../lib/plugin/Diff.php:182
+msgid "Content of versions "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr " und  "
+
+#: ../lib/plugin/Diff.php:183
+msgid " is identical."
+msgstr " sind identisch."
+
+#: ../lib/plugin/Diff.php:188
+msgid "Version "
+msgstr "Version "
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
 #: ../lib/plugin/DynamicIncludePage.php:35
-#, fuzzy
 msgid "DynamicIncludePage"
-msgstr "SeiteEinfügen"
+msgstr ""
 
 #: ../lib/plugin/DynamicIncludePage.php:39
-#, fuzzy
 msgid "Dynamically include the content from another wiki page."
 msgstr "Text von einer andere Seite einfügen."
 
 #: ../lib/plugin/DynamicIncludePage.php:59
 #: ../lib/plugin/DynamicIncludePage.php:82
-#, fuzzy, php-format
+#, php-format
 msgid " %s :"
-msgstr "%s B"
+msgstr ""
 
 #: ../lib/plugin/DynamicIncludePage.php:77
 #: ../lib/plugin/DynamicIncludePage.php:78
 #: ../lib/plugin/NewPagesPerUser.php:109 ../lib/plugin/NewPagesPerUser.php:110
 #: ../lib/plugin/RecentChanges.php:1362 ../lib/plugin/RecentChanges.php:1363
 #: ../themes/Sidebar/themeinfo.php:58 ../themes/Sidebar/themeinfo.php:59
-#, fuzzy
 msgid "Click to hide/show"
 msgstr "Hier klicken um zu verstecken"
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr "MetaDatenBearbeiten"
 
@@ -2497,7 +2515,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr "Erforderliches Argument »%s« fehlt."
@@ -2565,23 +2583,35 @@
 "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der "
 "Seite. Nur ein Frame ist erlaubt."
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
-#, php-format
-msgid "recursive inclusion of page %s"
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
 msgstr "Fehler beim Einbetten der Seite %s: Rekursiver Selbstaufruf der Seite"
 
 # (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
-#: ../lib/plugin/FrameInclude.php:94
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr "%s oder %s Argument fehlt"
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
-#, php-format
-msgid "recursive inclusion of url %s"
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#, fuzzy, php-format
+msgid "Recursive inclusion of url %s"
 msgstr "Fehler beim Aufruf der Seite %s: Rekursion (sich selbst aufrufend)"
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2705,7 +2735,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, php-format
 msgid "%s is empty"
 msgstr "%s ist leer"
@@ -2770,36 +2800,39 @@
 msgid "Include text from another wiki page."
 msgstr "Text von einer andere Seite einfügen."
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
-#, php-format
-msgid "recursive inclusion of page %s ignored"
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s ignored"
 msgstr "Fehler beim Einfügen der Seite %s: rekursiver Selbstaufruf ignoriert"
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
+#: ../lib/plugin/IncludePage.php:91
 #, fuzzy, php-format
 msgid "Page '%s' does not exist"
 msgstr "Gruppenseite »%s« existiert nicht"
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
 #, fuzzy, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr "Fehler beim Einfügen der Seite %s: rekursiver Selbstaufruf ignoriert"
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "%s(%d): no such revision"
-msgstr "%s(%d): keine solche Version"
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
+msgstr ""
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:157
+#, fuzzy, php-format
+msgid "Included from %s (revision %d)"
+msgstr "Eingefügter Text von %s"
+
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "Eingefügter Text von %s"
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr " ... erste %d Zeilen"
@@ -2851,6 +2884,7 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
@@ -2892,6 +2926,8 @@
 # Or in case "Ä" doesn't work as a WikiWord, then use "VergleichbareSeiten".
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3029,9 +3065,8 @@
 
 # OldTextFormattingRules AlteTextFormatierungsRegeln
 #: ../lib/plugin/MediawikiTable.php:60
-#, fuzzy
 msgid "Layout tables using a Mediawiki-like markup style."
-msgstr "Tabellen mit erweiterter HTML Syntax."
+msgstr "Tabellen mit Mediawiki Syntax."
 
 #: ../lib/plugin/ModeratedPage.php:45
 msgid "Support moderated pages"
@@ -3094,9 +3129,9 @@
 msgstr "Ablehnen"
 
 #: ../lib/plugin/ModeratedPage.php:432 ../lib/plugin/ModeratedPage.php:439
-#, fuzzy, php-format
+#, php-format
 msgid "<<ModeratedPage ... >> not found in first line of %s"
-msgstr "<?plugin ModeratedPage ... ?> nicht in erster Zeile von %s gefunden"
+msgstr "<<ModeratedPage ... >> nicht in erster Zeile von %s gefunden"
 
 #: ../lib/plugin/ModeratedPage.php:435
 #, php-format
@@ -3183,15 +3218,15 @@
 msgstr "Seite %s nicht gefunden."
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
-msgstr "Für CVS herunterladen."
+msgid "Download for Subversion"
+msgstr "Für Subversion herunterladen"
 
 # Admin Button: download page dump of this page as WikiQuelltext which
-# has been reformatted for developer CVS.
+# has been reformatted for developer Subversion.
 # Choice of English text here is poor but it must be concise enough to
 # fit inside a button.
 #
-# msgid "Download for CVS"
+# msgid "Download for Subversion"
 # msgstr ""
 # Admin Button: download page dump of this page as WikiQuelltext
 # formatted for general backup purposes.
@@ -3202,11 +3237,11 @@
 msgstr "Für Backup herunterladen"
 
 # Admin Button: download page dump of this page as WikiQuelltext which
-# has been reformatted for developer CVS.
+# has been reformatted for developer Subversion.
 # Choice of English text here is poor but it must be concise enough to
 # fit inside a button.
 #
-# msgid "Download for CVS"
+# msgid "Download for Subversion"
 # msgstr ""
 # Admin Button: download page dump of this page as WikiQuelltext
 # formatted for general backup purposes.
@@ -3265,7 +3300,7 @@
 #: ../lib/plugin/PageDump.php:215
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
@@ -3288,12 +3323,13 @@
 msgid "Contents"
 msgstr "Inhalt"
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s: unbekannte Sektion>"
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr "Nächste"
 
@@ -3543,7 +3579,8 @@
 #: ../lib/plugin/PhpWeather.php:110
 #, php-format
 msgid "%s does not know about the language '%s', using 'en' instead."
-msgstr "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet."
+msgstr ""
+"%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet."
 
 #: ../lib/plugin/PhpWeather.php:165
 msgid "Submit country"
@@ -3642,7 +3679,7 @@
 msgid "List the most popular tags."
 msgstr "Die meistbesucht Seiten werden aufgelistet."
 
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr "KategorieKategorie"
 
@@ -3692,7 +3729,7 @@
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr "EinstellungenInfo"
 
@@ -3727,8 +3764,8 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr "ZufallsSeite"
@@ -3833,7 +3870,6 @@
 
 #: ../lib/plugin/RecentChanges.php:51 ../lib/plugin/RecentChanges.php:57
 #: ../lib/plugin/RecentChanges.php:532
-#, fuzzy
 msgid "UserContribs"
 msgstr "BenutzerBewertungen"
 
@@ -4013,9 +4049,8 @@
 msgstr "%s Tagen"
 
 #: ../lib/plugin/RecentChanges.php:1432
-#, fuzzy
 msgid "All users"
-msgstr "AlleBenutzer"
+msgstr "Alle Benutzer"
 
 #: ../lib/plugin/RecentChanges.php:1435
 msgid "My modifications only"
@@ -4023,7 +4058,6 @@
 
 #: ../lib/plugin/RecentChanges.php:1452
 #: ../themes/MonoBook/templates/navbar.tmpl:78
-#, fuzzy
 msgid "All pages"
 msgstr "Alle Seiten"
 
@@ -4124,11 +4158,11 @@
 msgid "Recursive redirect to self: '%s'"
 msgstr "Eigenbezogene Selbstrückleitung: »%s«"
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr "Rekursive Redirektion verboten."
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
 msgstr "Zeige Redirekt-Seite."
 
@@ -4332,9 +4366,8 @@
 msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:287
-#, fuzzy
 msgid "Help:SemanticRelations"
-msgstr "SemantischeBeziehungen"
+msgstr "Hilfe:SemantischeBeziehungen"
 
 #: ../lib/plugin/SemanticSearch.php:335
 #, php-format
@@ -4413,77 +4446,77 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
+#: ../lib/plugin/SyncWiki.php:110
 msgid "Syncing this PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
 # ie. no pages found
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 msgid "<unknown>"
 msgstr "<unbekannt>"
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr " ausgelassen"
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
+#: ../lib/plugin/SyncWiki.php:209
 #, fuzzy
 msgid "Now upload all locally newer uploads."
 msgstr "Keine Datei zum Hochladen?"
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
+#: ../lib/plugin/SyncWiki.php:274
 #, fuzzy, php-format
 msgid "%s force"
 msgstr "%s Wörter"
 
-#: ../lib/plugin/SyncWiki.php:276
+#: ../lib/plugin/SyncWiki.php:278
 #, fuzzy, php-format
 msgid "Postponed %s for %s."
 msgstr "Fehlender %s für %s"
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 #, fuzzy
 msgid "skipped"
 msgstr " ausgelassen"
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 #, fuzzy
 msgid "same content"
 msgstr "leerer Seiteninalt"
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr "FEHLER"
@@ -4550,8 +4583,8 @@
 "more than %d unique author revisions."
 msgstr ""
 "Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d Tage "
-"aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als %"
-"d einzelne Autoren Revisionen."
+"aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als "
+"%d einzelne Autoren Revisionen."
 
 #: ../lib/plugin/SystemInfo.php:149
 #, php-format
@@ -4609,13 +4642,13 @@
 msgstr "%d Seite(n) die mehr als %d aufgerufen haben (>%d%%)."
 
 #: ../lib/plugin/SystemInfo.php:400
-#, php-format
-msgid "Application size: %d Kb"
+#, fuzzy, php-format
+msgid "Application size: %d KiB"
 msgstr "Anwendungsplatzbedarf: %d KB"
 
 #: ../lib/plugin/SystemInfo.php:402
-#, php-format
-msgid "Pagedata size: %d Kb"
+#, fuzzy, php-format
+msgid "Pagedata size: %d KiB"
 msgstr "Größe der Seitendaten: %d KB"
 
 #: ../lib/plugin/SystemInfo.php:420
@@ -4722,6 +4755,11 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, fuzzy, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr "Fehler beim Einfügen der Seite %s: rekursiver Selbstaufruf ignoriert"
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr ""
@@ -4815,7 +4853,7 @@
 msgid "Transcluded from %s"
 msgstr "Eingebetteter Text von %s"
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr "ÜbersetzeText"
 
@@ -4904,45 +4942,45 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:179
+#: ../lib/plugin/UpLoad.php:178
 #, fuzzy
 msgid "You cannot upload files."
 msgstr "Die Upload-Logdatei konnte nicht geöffnet worden."
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 #, fuzzy
 msgid "Check you are logged in."
 msgstr "Sie sollten jetzt angemeldet sein."
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr ""
 "ZUGRIFF VERWEIGERT: Bitte melden Sie sich erst an, um Dateien hochzuladen."
 
-#: ../lib/plugin/UpLoad.php:213
+#: ../lib/plugin/UpLoad.php:212
 #, fuzzy, php-format
 msgid "ERROR uploading '%s'"
 msgstr "FEHLER beim Hochladen von »%s«: "
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, php-format
 msgid "Files with extension %s are not allowed."
 msgstr "Dateien mit der Endung %s sind nicht erlaubt."
 
-#: ../lib/plugin/UpLoad.php:226
+#: ../lib/plugin/UpLoad.php:225
 #, fuzzy, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr "Nur Dateien mit der Endung HTML sind erlaubt"
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 #, fuzzy
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
@@ -4951,38 +4989,38 @@
 "Dateinamen dürfen nur folgende Zeichen enthalten: alphanumerische Zeichen, "
 "Punkt, Unterstrich und Bindestrich."
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr "Es existiert schon eine gleichnamige, hochgeladene Datei %s."
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
 msgstr "Leider ist diese Datei zu groß."
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
 msgstr "Datei erfolgreich hochgeladen."
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, php-format
 msgid "uploaded %s"
 msgstr "%s wurde hochgeladen"
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 msgid "Uploading failed."
 msgstr "Hochladen fehlgeschlagen."
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:291
+#: ../lib/plugin/UpLoad.php:290
 #, fuzzy
 msgid "The upload logfile exists but is not writable."
 msgstr "Die Upload Logdatei ist nicht schreibbar."
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 msgid "Can't open the upload logfile."
 msgstr "Die Upload-Logdatei konnte nicht geöffnet worden."
 
@@ -5128,7 +5166,6 @@
 msgstr "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden."
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr "PgsrcTranslation"
 
@@ -5167,9 +5204,11 @@
 msgstr "WunschZettelSeiten in diesem Wiki:"
 
 #: ../lib/plugin/WatchPage.php:36
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 msgid "WatchPage"
-msgstr "Breite"
+msgstr "SeiteBeobarten"
 
 #: ../lib/plugin/WatchPage.php:40
 msgid "Manage notifications emails per page."
@@ -5193,15 +5232,15 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "The page %s is already watched!"
-msgstr "Diese Seite existiert bereits"
+msgstr "Diese Seite %s is schon beobachtet"
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -5209,10 +5248,14 @@
 msgid "Edit"
 msgstr "Bearbeiten"
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+msgid "Watch Page"
+msgstr "Seite beobarchten"
+
 #: ../lib/plugin/WatchPage.php:110
-#, fuzzy
 msgid "You must sign in to watch pages."
-msgstr "Sie müssen sich anmelden %s."
+msgstr "Sie müssen sich anmelden um Seiten zu beobarchten."
 
 #: ../lib/plugin/WatchPage.php:121
 msgid "ERROR: No email defined! You need to do this in your "
@@ -5274,43 +5317,47 @@
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
 #, php-format
-msgid "%s pages have been changed."
-msgstr "%s Seiten wurden geändert."
+msgid "%d pages have been changed."
+msgstr "%d Seiten wurden geändert."
 
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 msgid "No pages changed."
 msgstr "Keine Änderungen."
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Select the pages to change:"
 msgstr "Wählen Sie die Seiten zum Ändern:"
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr "Ändere auf Berechtigung:"
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr "Aktiviere Vererbung dieser Zugriffsrechte auf alle Unterseiten?"
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr "(deaktiviere individuelle Zugriffsrechte, aktiviere Vererbung)"
 
@@ -5319,7 +5366,6 @@
 msgstr "WikiAdminChown"
 
 #: ../lib/plugin/WikiAdminChown.php:40
-#, fuzzy
 msgid "Change owner of selected pages."
 msgstr "Den Besitzer ausgewählte Seiten ändern."
 
@@ -5332,53 +5378,49 @@
 msgstr "Zugang verweigert um Seite '%s' zu ändern."
 
 #: ../lib/plugin/WikiAdminChown.php:77
-#, fuzzy, php-format
+#, php-format
 msgid "Change owner of page '%s' to '%s'."
 msgstr "Besitzer der Seite '%s' auf '%s' geändert."
 
 #: ../lib/plugin/WikiAdminChown.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr "Konnte den Besitzer der Seite '%s' nicht in '%s' ändern."
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been changed:"
+msgstr "Eine Seite wird geändert."
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
-#, fuzzy, php-format
-msgid "%s pages have been permanently changed:"
-msgstr "%s Seiten wurden geändert."
+#, php-format
+msgid "%d pages have been changed:"
+msgstr "%d Seiten wurden geändert."
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 msgid "PhpWikiAdministration/Chown"
 msgstr "PhpWikiSystemverwalten/Chown"
 
-#: ../lib/plugin/WikiAdminChown.php:171
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+#: ../lib/plugin/WikiAdminChown.php:173
+msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
-#: ../lib/plugin/WikiAdminChown.php:175
-#, fuzzy
+#: ../lib/plugin/WikiAdminChown.php:177
 msgid "Change owner of selected pages"
 msgstr "Den Besitzer der ausgewählte Seiten ändern"
 
-#: ../lib/plugin/WikiAdminChown.php:176
-#, fuzzy
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Select the pages to change the owner"
 msgstr "Wählen Sie die Seiten zum Ändern:"
 
-#: ../lib/plugin/WikiAdminChown.php:198
-#, fuzzy
-msgid "Change owner"
-msgstr "Land ändern"
+#: ../lib/plugin/WikiAdminChown.php:200
+msgid "Change owner to: "
+msgstr "Besitzer ändern zu:"
 
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
-msgstr "nach"
-
 #: ../lib/plugin/WikiAdminMarkup.php:36
 msgid "WikiAdminMarkup"
 msgstr "WikiAdminFormatierung"
@@ -5388,9 +5430,9 @@
 msgstr "Ändere den Formatierungstyp aller ausgewählte Seiten."
 
 #: ../lib/plugin/WikiAdminMarkup.php:73
-#, fuzzy, php-format
+#, php-format
 msgid "Change markup type from %s to %s"
-msgstr "Ändere Formatierungs-Typ"
+msgstr "Ändere Formatierungs-Typ von %s zu %s"
 
 #: ../lib/plugin/WikiAdminMarkup.php:80
 #, php-format
@@ -5408,73 +5450,72 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr "PhpWikiSystemverwalten/Formatierung"
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+#: ../lib/plugin/WikiAdminMarkup.php:165
+msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
+#: ../lib/plugin/WikiAdminMarkup.php:169
 msgid "Change markup type"
 msgstr "Ändere Formatierungs-Typ"
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
-#, fuzzy
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Select the pages to change the markup type"
 msgstr "Wählen Sie die Seiten zum Ändern:"
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
-msgid "Change markup"
-msgstr "Ändere Formatierung"
+#: ../lib/plugin/WikiAdminMarkup.php:192
+msgid "Change markup to: "
+msgstr "Ändere Formatierung zu:"
 
 #: ../lib/plugin/WikiAdminPurge.php:34
-#, fuzzy
 msgid "WikiAdminPurge"
-msgstr "WikiAdminFormatierung"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminPurge.php:38
-#, fuzzy
 msgid "Permanently purge all selected pages."
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
 
 #: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:53
-#, fuzzy, php-format
+#, php-format
 msgid "Purged page '%s' successfully."
 msgstr "Seite »%s« erfolgreich gelöscht."
 
 #: ../lib/plugin/WikiAdminPurge.php:70
-#, fuzzy, php-format
+#, php-format
 msgid "Didn't purge page '%s'. Access denied."
 msgstr "Seite »%s« wurde nicht gelöscht. Zugriff verweigert."
 
+#: ../lib/plugin/WikiAdminPurge.php:77
+msgid "One page has been permanently purged:"
+msgstr "Eine Seite wird unwiderruflich gelöscht."
+
 #: ../lib/plugin/WikiAdminPurge.php:79
-#, fuzzy, php-format
-msgid "%s pages have been permanently purged:"
+#, php-format
+msgid "%d pages have been permanently purged:"
 msgstr "%d Seiten wurden unwiderruflich gelöscht."
 
+#: ../lib/plugin/WikiAdminPurge.php:85
+msgid "No pages purged."
+msgstr "Keine Änderungen."
+
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
 #: ../lib/plugin/WikiAdminPurge.php:92
-#, fuzzy
 msgid "PhpWikiAdministration/Purge"
-msgstr "PhpWikiSystemverwalten"
+msgstr "PhpWikiSystemverwalten/Purge"
 
-#: ../lib/plugin/WikiAdminPurge.php:144
-#, fuzzy
+#: ../lib/plugin/WikiAdminPurge.php:146
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
-"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
+"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
 
-#: ../lib/plugin/WikiAdminPurge.php:147
-#, fuzzy
+#: ../lib/plugin/WikiAdminPurge.php:149
 msgid "Permanently purge selected pages"
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
 
-#: ../lib/plugin/WikiAdminPurge.php:148
-#, fuzzy
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Select the files to purge"
-msgstr "Wählen Sie die Seiten zum Ändern:"
+msgstr "Wählen Sie die Seiten zum Löschen:"
 
 #: ../lib/plugin/WikiAdminRemove.php:40
 msgid "WikiAdminRemove"
@@ -5490,137 +5531,148 @@
 msgstr "Seite »%s« erfolgreich gelöscht."
 
 #: ../lib/plugin/WikiAdminRemove.php:114
-#, fuzzy, php-format
+#, php-format
 msgid "Didn't remove page '%s'. Access denied."
 msgstr "Seite »%s« wurde nicht gelöscht. Zugriff verweigert."
 
+#: ../lib/plugin/WikiAdminRemove.php:121
+msgid "One page has been removed:"
+msgstr "Eine Seite wird gelöscht:"
+
 #: ../lib/plugin/WikiAdminRemove.php:123
-#, fuzzy, php-format
-msgid "%s pages have been permanently removed:"
-msgstr "%d Seiten wurden unwiderruflich gelöscht."
+#, php-format
+msgid "%d pages have been removed:"
+msgstr "%d Seiten wurden geändert."
 
+#: ../lib/plugin/WikiAdminRemove.php:129
+msgid "No pages removed."
+msgstr "Keine Seiten gelöscht."
+
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
 msgstr "PhpWikiSystemverwalten/Löschen"
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "Löschen"
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+#: ../lib/plugin/WikiAdminRemove.php:199
+msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr "Ausgewählte Seiten löschen"
 
-#: ../lib/plugin/WikiAdminRemove.php:201
-#, fuzzy
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Select the files to remove"
 msgstr "Wähle Seiten zum Umbenennen aus:"
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr "Auch Seiten, die in den letzten %s Tagen gelöscht wurden."
 
-#: ../lib/plugin/WikiAdminRemove.php:211
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRemove.php:213
+#, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
-"(Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits "
-"ausgewählt)"
+"Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt"
 
 #: ../lib/plugin/WikiAdminRename.php:36
 msgid "WikiAdminRename"
 msgstr "WikiAdminUmbenennen"
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 msgid "Rename selected pages"
 msgstr "Ausgewählte Seiten umbenennen"
 
-#: ../lib/plugin/WikiAdminRename.php:79
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRename.php:80
+#, php-format
 msgid "Page '%s' already exists. Ignored."
 msgstr "Seite %s existiert bereits. Ignoriert."
 
-#: ../lib/plugin/WikiAdminRename.php:82
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRename.php:83
+#, php-format
 msgid "Access denied to rename page '%s'."
 msgstr "Zugang verweigert um Seite '%s' zu ändern."
 
-#: ../lib/plugin/WikiAdminRename.php:91
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRename.php:92
+#, php-format
 msgid "Renamed page from '%s' to '%s'"
 msgstr "Seite '%s' auf '%s' umbenannt."
 
-#: ../lib/plugin/WikiAdminRename.php:100
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRename.php:101
+#, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
-msgstr "Seite '%s' auf '%s' umbenannt."
+msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page '%s' to '%s'."
 msgstr "Seite '%s' auf '%s' umbenannt."
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr "Konnte Seite '%s' nicht in '%s' umbenennen."
 
-#: ../lib/plugin/WikiAdminRename.php:126
-#, fuzzy, php-format
-msgid "%s pages have been permanently renamed:"
-msgstr "%s Seiten wurden umbenannt."
+#: ../lib/plugin/WikiAdminRename.php:124
+msgid "One page has been renamed:"
+msgstr "Eine Seite wird geändert."
 
-#: ../lib/plugin/WikiAdminRename.php:132
-#, fuzzy
+#: ../lib/plugin/WikiAdminRename.php:127
+#, php-format
+msgid "%d pages have been renamed:"
+msgstr "%d Seiten wurden geändert."
+
+#: ../lib/plugin/WikiAdminRename.php:133
 msgid "No pages renamed."
 msgstr "Keine Seiten umbenannt."
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr "Umbennen zu"
 
-#: ../lib/plugin/WikiAdminRename.php:209
-#, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
+#: ../lib/plugin/WikiAdminRename.php:211
+msgid "Are you sure you want to rename the selected pages?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
 
-#: ../lib/plugin/WikiAdminRename.php:213
-#, fuzzy
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 msgid "Rename page"
-msgstr "Seite Löschen"
+msgstr "Seite umbenennen"
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
 msgstr "Wähle Seiten zum Umbenennen aus:"
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 msgid "from"
 msgstr "von"
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr "nach"
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 msgid "Regex?"
 msgstr "Regulärer Ausdruck?"
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
 msgstr "Groß-/Kleinschreibung beachten?"
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
 msgstr ""
 
@@ -5633,9 +5685,9 @@
 msgstr "Suche und ersetze Text in den gewählten Seiten."
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:75
-#, fuzzy, php-format
+#, php-format
 msgid "Replace '%s' by '%s'"
-msgstr "Seite '%s' auf '%s' umbenannt."
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:86
 msgid "Error: Empty search string."
@@ -5646,37 +5698,33 @@
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr "'%s' mit '%s' in Seite '%s' ersetzt."
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr "Achtung! Das Suchwort darf nicht leer sein!"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen "
 "wollen?"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#, fuzzy
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 msgid "Select the pages to search and replace"
 msgstr "Seiten auswählen:"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr "Ersetze alle Wörter in den angegebenen Seiten."
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 msgid "Replace"
 msgstr "Ersetze"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr "mit"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
-#, fuzzy
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr "Groß-/Kleinschreibung beachten"
 
@@ -5715,24 +5763,24 @@
 msgstr "ACL für Seite '%s' nicht geändert."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "ACL changed for page '%s'"
 msgstr "ACL für Seite '%s' geändert."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "from '%s'"
 msgstr "von %s"
 
 #: ../lib/plugin/WikiAdminSetAcl.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "to '%s'."
 msgstr "Gehe zu %s."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "ACL changed for page '%s' from '%s' to '%s'."
-msgstr "ACL für Seite '%s' geändert."
+msgstr "ACL für Seite '%s' geändert von '%s' zu '%s'."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:123
 msgid "Invalid ACL"
@@ -5740,69 +5788,64 @@
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 msgid "PhpWikiAdministration/SetAcl"
 msgstr "PhpWikiSystemverwalten/AclSetzen"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 msgid "Change Access Rights"
-msgstr "Zugriff"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 msgid "Select the pages where to change access rights"
 msgstr "Wählen Sie die Seiten zum Ändern:"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 msgid "Selected Pages: "
 msgstr "Ausgewählte Seiten: "
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 msgid "Type"
 msgstr "Typ"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr ""
 "Gesetzte Erlaube Kästchen erlauben Zugriff, ungesetzte Kästchen sperren "
 "Zugriff."
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr "Lösche Zeile mit 'X' um ACL Eintrag zu ignorieren."
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr "Setze '+' um ACL Zeile hinzufügen."
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 msgid "(Currently not working)"
 msgstr "(Funktioniert momentan nicht)"
 
 #: ../lib/plugin/WikiAdminSetExternal.php:35
-#, fuzzy
 msgid "WikiAdminSetExternal"
-msgstr "WikiAdminAclSetzen"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetExternal.php:39
-#, fuzzy
 msgid "Mark selected pages as external."
-msgstr "Wähle Seiten zum Umbenennen aus:"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetExternal.php:71
-#, fuzzy, php-format
+#, php-format
 msgid "change page '%s' to external."
-msgstr "Formatierung der Seite '%s' auf '%s' geändert."
+msgstr ""
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
@@ -5811,12 +5854,12 @@
 msgid "PhpWikiAdministration/SetExternal"
 msgstr "PhpWikiSystemverwalten/AclSetzen"
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 #, fuzzy
 msgid "Set pages to external"
 msgstr "Wähle Seiten zum Umbenennen aus:"
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 #, fuzzy
 msgid "Select the pages to set as external"
 msgstr "Seiten auswählen:"
@@ -5829,123 +5872,121 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr "Verschiedene Dienstfunktionen für den Administrator."
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, fuzzy, php-format
 msgid "Bad action requested: %s"
 msgstr "Edieren abgebrochen: %s"
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 "Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen."
 
-#: ../lib/plugin/WikiAdminUtils.php:100
+#: ../lib/plugin/WikiAdminUtils.php:102
 #, php-format
 msgid "WikiAdminUtils %s returned:"
 msgstr "WikiAdminUtils %s gibt zurück:"
 
-#: ../lib/plugin/WikiAdminUtils.php:102
-#, fuzzy
+#: ../lib/plugin/WikiAdminUtils.php:104
 msgid "Back"
-msgstr "BackLinks"
+msgstr "Zurück"
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr "HTML-Cachedatei Säubern"
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 msgid "Purge all Pages With Invalid Names"
 msgstr "Alle Seiten mit ungültigen Namen endgültig entfernen"
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind."
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr "HTML-Cachedaten entfernt!"
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 msgid "No pages with bad names had to be deleted."
 msgstr "Keine Seiten mit ungültigen Namen mußten gelöscht werden."
 
-#: ../lib/plugin/WikiAdminUtils.php:147
+#: ../lib/plugin/WikiAdminUtils.php:149
 #, php-format
-msgid "Deleted %s pages with invalid names:"
-msgstr "%s Seiten mit ungültigen Namen gelöscht:"
+msgid "Deleted %d pages with invalid names:"
+msgstr "%d Seiten mit ungültigen Namen gelöscht:"
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr "[entfernt]"
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr "[nicht entfernbar]"
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 msgid "No empty, unreferenced pages were found."
 msgstr "Keine leeren, unverlinkten Seiten gefunden."
 
-#: ../lib/plugin/WikiAdminUtils.php:180
+#: ../lib/plugin/WikiAdminUtils.php:182
 #, php-format
-msgid "Deleted %s unreferenced pages:"
-msgstr "%s unverlinkte Seiten entfernt:"
+msgid "Deleted %d unreferenced pages:"
+msgstr "%d unverlinkte Seiten entfernt:"
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, php-format
 msgid "Converted successfully %d pages"
 msgstr "%d Seiten erfolgreich konvertiert"
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr "Bestätigungs-Status"
 
-#: ../lib/plugin/WikiAdminUtils.php:233
-#, fuzzy
+#: ../lib/plugin/WikiAdminUtils.php:235
 msgid "Username"
-msgstr "Umbenennen"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr "Ändere Bestätigungs-Status"
 
@@ -5968,16 +6009,13 @@
 msgstr "%s um %s:"
 
 #: ../lib/plugin/WikicreoleTable.php:55
-#, fuzzy
 msgid "WikicreoleTable"
-msgstr "WikiUmfrage"
+msgstr ""
 
 # OldTextFormattingRules AlteTextFormatierungsRegeln
 #: ../lib/plugin/WikicreoleTable.php:59
-#, fuzzy
 msgid "Layout tables using the Wikicreole syntax."
-msgstr ""
-"Tabellen unter Verwendung traditioneller (alter) Wikitext Formatierung."
+msgstr "Tabellen unter Wikicreole Formatierung."
 
 #: ../lib/plugin/WikiForm.php:34
 msgid "WikiForm"
@@ -6057,319 +6095,254 @@
 msgstr "Danke für die Teilnahme!"
 
 #: ../lib/plugin/_WikiTranslation.php:47
-msgid "AddCommentPlugin"
-msgstr "NeuerKommentarPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:48
-msgid "AddingPages"
-msgstr "SeitenErzeugen"
-
-#: ../lib/plugin/_WikiTranslation.php:49
 msgid "AllPagesCreatedByMe"
 msgstr "AlleSeitenErzeugtVonMir"
 
-#: ../lib/plugin/_WikiTranslation.php:50
+#: ../lib/plugin/_WikiTranslation.php:48
 msgid "AllPagesLastEditedByMe"
 msgstr "AlleSeitenEditiertVonMir"
 
-#: ../lib/plugin/_WikiTranslation.php:51
+#: ../lib/plugin/_WikiTranslation.php:49
 msgid "AllPagesOwnedByMe"
 msgstr "AlleSeitenImBesitzVonMir"
 
 #: ../lib/plugin/_WikiTranslation.php:52
-msgid "AuthorHistoryPlugin"
-msgstr "AutorenProtokollPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:54
-msgid "CalendarListPlugin"
-msgstr "KalenderListePlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:55
-msgid "CalendarPlugin"
-msgstr "KalenderPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:57
 msgid "CategoryHomePages"
 msgstr "KategorieHomepage"
 
-#: ../lib/plugin/_WikiTranslation.php:58
-msgid "CommentPlugin"
-msgstr "KommentarPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:59
-msgid "CreateTocPlugin"
-msgstr "InhaltsVerzeichnisPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:62
-msgid "EditMetaDataPlugin"
-msgstr "MetaDatenBearbeitenPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
-msgstr "FremdSuchePlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
 #: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:30
 #: ../themes/MonoBook/templates/navbar.tmpl:36
 #: ../themes/Portland/templates/navbar.tmpl:6
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/Sidebar/templates/search.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
 #: ../themes/wikilens/templates/navbar.tmpl:19
 msgid "FindPage"
 msgstr "SeiteFinden"
 
-#: ../lib/plugin/_WikiTranslation.php:65
-msgid "FoafViewerPlugin"
-msgstr "FoafViewerPlugin"
-
-# (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit
-# eingeschlossenem Rahmen)
-#: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
-msgstr "FrameEinbettenPlugin"
-
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
-#: ../lib/plugin/_WikiTranslation.php:67
+#: ../lib/plugin/_WikiTranslation.php:56
 msgid "FullRecentChanges"
 msgstr "AlleNeuesteÄnderungen"
 
+#: ../lib/plugin/_WikiTranslation.php:57
+msgid "Help/AddingPages"
+msgstr "Hilfe/SeitenErzeugen"
+
+#: ../lib/plugin/_WikiTranslation.php:58
+msgid "Help/AddCommentPlugin"
+msgstr "Hilfe/NeuerKommentarPlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:59
+msgid "Help/AuthorHistoryPlugin"
+msgstr "Hilfe/AutorenProtokollPlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:60
+msgid "Help/CalendarListPlugin"
+msgstr "Hilfe/KalenderListePlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:61
+msgid "Help/CalendarPlugin"
+msgstr "Hilfe/KalenderPlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:62
+msgid "Help/CommentPlugin"
+msgstr "Hilfe/KommentarPlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:63
+msgid "Help/CreateTocPlugin"
+msgstr "Hilfe/InhaltsVerzeichnisPlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:64
+msgid "Help/EditMetaDataPlugin"
+msgstr "Hilfe/MetaDatenBearbeitenPlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:65
+msgid "Help/ExternalSearchPlugin"
+msgstr "Hilfe/FremdSuchePlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:66
+msgid "Help/FoafViewerPlugin"
+msgstr "Hilfe/FoafViewerPlugin"
+
+# (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit
+# eingeschlossenem Rahmen)
+#: ../lib/plugin/_WikiTranslation.php:67
+msgid "Help/FrameIncludePlugin"
+msgstr "Hilfe/FrameEinbettenPlugin"
+
 #: ../lib/plugin/_WikiTranslation.php:68
-msgid "HelloWorldPlugin"
-msgstr "HalloWeltPlugin"
+msgid "Help/HelloWorldPlugin"
+msgstr "Hilfe/HalloWeltPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:69
-msgid "HomePageAlias"
-msgstr "HomePageAlias"
+msgid "Help/IncludePagePlugin"
+msgstr "Hilfe/SeiteEinfügenPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
-msgstr "SeiteEinfügenPlugin"
+msgid "Help/LinkIcons"
+msgstr "Hilfe/LinksIcons"
 
 #: ../lib/plugin/_WikiTranslation.php:71
-msgid "InterWiki"
-msgstr "InterWiki"
+msgid "Help/MagicPhpWikiURLs"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
-msgstr "LinksIcons"
+msgid "Help/MoreAboutMechanics"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
-msgstr ""
+msgid "Help/OldStyleTablePlugin"
+msgstr "Hilfe/TraditionellerTabellenStilPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
-msgstr ""
+msgid "Help/PhotoAlbumPlugin"
+msgstr "Hilfe/BilderAlbumPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
-msgstr ""
+msgid "Help/PhpHighlightPlugin"
+msgstr "Hilfe/PhpHighlightPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
-msgstr ""
+msgid "Help/PhpWeatherPlugin"
+msgstr "Hilfe/PhpWetterPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:77
-msgid "OldStyleTablePlugin"
-msgstr "TraditionellerTabellenStilPlugin"
+msgid "Help/PhpWiki"
+msgstr "Hilfe/PhpWiki"
 
+#: ../lib/plugin/_WikiTranslation.php:78
+msgid "Help/PloticusPlugin"
+msgstr "Hilfe/PloticusPlugin"
+
 #: ../lib/plugin/_WikiTranslation.php:79
-msgid "PageGroupTest"
-msgstr "SeitenGruppenTest"
+msgid "Help/RawHtmlPlugin"
+msgstr "Hilfe/RawHtmlPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:80
-msgid "PageGroupTest/Four"
-msgstr "SeitenGruppenTest/Vier"
+msgid "Help/RedirectToPlugin"
+msgstr "Hilfe/WeiterLeitenPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:81
-msgid "PageGroupTest/One"
-msgstr "SeitenGruppenTest/Eins"
+msgid "Help/RichTablePlugin"
+msgstr "Hilfe/ErweiterteTabellenPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:82
-msgid "PageGroupTest/Three"
-msgstr "SeitenGruppenTest/Drei"
+msgid "Help/SystemInfoPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:83
-msgid "PageGroupTest/Two"
-msgstr "SeitenGruppenTest/Zwei"
+msgid "Help/TranscludePlugin"
+msgstr "Hilfe/EinbettenPlugin"
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr "Hilfe/UnterseitenEntfaltenPlugin"
+
 #: ../lib/plugin/_WikiTranslation.php:85
-msgid "PhotoAlbumPlugin"
-msgstr "BilderAlbumPlugin"
+msgid "Help/UpLoadPlugin"
+msgstr "Hilfe/HochLadenPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:86
-msgid "PhpHighlightPlugin"
-msgstr "PhpHighlightPlugin"
+msgid "Help/WabiSabi"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
-msgstr "PhpWetterPlugin"
+msgid "Help/WikiBlogPlugin"
+msgstr "Hilfe/WikiBlogPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
-msgstr "PhpWiki"
+msgid "Help/WikiPlugin"
+msgstr "Hilfe/WikiPlugin"
 
+#: ../lib/plugin/_WikiTranslation.php:89
+msgid "Help/WikiWikiWeb"
+msgstr "Hilfe/WikiWikiWeb"
+
+#: ../lib/plugin/_WikiTranslation.php:90
+msgid "HomePageAlias"
+msgstr "HomePageAlias"
+
+#: ../lib/plugin/_WikiTranslation.php:91
+msgid "InterWiki"
+msgstr "InterWiki"
+
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/plugin/_WikiTranslation.php:89
+#: ../lib/plugin/_WikiTranslation.php:93
 msgid "PhpWikiAdministration/Chmod"
 msgstr "PhpWikiSystemverwalten/Chmod"
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/plugin/_WikiTranslation.php:92
+#: ../lib/plugin/_WikiTranslation.php:96
 msgid "PhpWikiAdministration/Rename"
 msgstr "PhpWikiSystemverwalten/Umbenennen"
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/plugin/_WikiTranslation.php:93
+#: ../lib/plugin/_WikiTranslation.php:97
 msgid "PhpWikiAdministration/Replace"
 msgstr "PhpWikiSystemverwalten/SuchenErsetzen"
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/plugin/_WikiTranslation.php:95
+#: ../lib/plugin/_WikiTranslation.php:99
 #: ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "PhpWikiDocumentation"
 msgstr "PhpWikiDokumentation"
 
-#: ../lib/plugin/_WikiTranslation.php:96
+#: ../lib/plugin/_WikiTranslation.php:100
 msgid "PhpWikiPoll"
 msgstr "PhpWikiUmfrage"
 
-#: ../lib/plugin/_WikiTranslation.php:97
-msgid "PloticusPlugin"
-msgstr "PloticusPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:99
-msgid "PgsrcTranslation/de"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:100
-msgid "PgsrcTranslation/fr"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:101
-msgid "PgsrcTranslation/it"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:102
-msgid "PgsrcTranslation/es"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:103
-msgid "PgsrcTranslation/nl"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:104
-msgid "PgsrcTranslation/sv"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:105
-msgid "PgsrcTranslation/ja"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:106
-msgid "PgsrcTranslation/zh"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:107
-msgid "RawHtmlPlugin"
-msgstr "RawHtmlPlugin"
-
 # KleineÄnderungen?
-#: ../lib/plugin/_WikiTranslation.php:108
+#: ../lib/plugin/_WikiTranslation.php:101
 msgid "RecentVisitors"
 msgstr "LetzteBesucher"
 
-#: ../lib/plugin/_WikiTranslation.php:109
-msgid "RedirectToPlugin"
-msgstr "WeiterLeitenPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:110
+#: ../lib/plugin/_WikiTranslation.php:102
 msgid "ReleaseNotes"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:111
-msgid "RichTablePlugin"
-msgstr "ErweiterteTabellenPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:113
+#: ../lib/plugin/_WikiTranslation.php:104
 msgid "SteveWainstead"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:114
-msgid "SystemInfoPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr "EinbettenPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr "UnterseitenEntfaltenPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../lib/plugin/_WikiTranslation.php:106
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "UpLoad"
 msgstr "HochLaden"
 
-#: ../lib/plugin/_WikiTranslation.php:119
-msgid "UpLoadPlugin"
-msgstr "HochLadenPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:121
-msgid "WikiBlogPlugin"
-msgstr "WikiBlogPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:122
-msgid "WikiPlugin"
-msgstr "WikiPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr "WikiWikiWeb"
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr "_WikiÜbersetzung"
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr "Zeige Übersetzungen für verschiedene Wörter oder Seiten"
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr "Definiere die Übersetzung für %s nach %s"
@@ -6383,28 +6356,27 @@
 msgstr ""
 
 #: ../lib/plugin/YouTube.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Required argument %s missing"
-msgstr "Erforderliches Argument »%s« fehlt."
+msgstr "Erforderliches Argument »%s« fehlt"
 
 #: ../lib/plugin/YouTube.php:104 ../lib/plugin/YouTube.php:106
 #: ../lib/plugin/YouTube.php:108 ../lib/plugin/YouTube.php:110
 #: ../lib/plugin/YouTube.php:134 ../lib/plugin/YouTube.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid argument %s"
 msgstr "Ungültiger Parameter %s"
 
 #: ../lib/purgepage.php:18 ../lib/removepage.php:18
-#, fuzzy
 msgid "Sorry, this page does not exist."
-msgstr "Leider, Seite »%s« ist nicht in der Datenbank."
+msgstr "Leider, diese Seite ist nicht in der Datenbank."
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 msgid "Purge Page"
 msgstr "Seiten endgültig löschen"
 
 #: ../lib/purgepage.php:25
-#, fuzzy, php-format
+#, php-format
 msgid "You are about to purge '%s'!"
 msgstr "Sie sind im Begriff »%s« zu löschen!"
 
@@ -6413,7 +6385,7 @@
 msgstr "Jemand hat die Seite bereits bearbeitet!"
 
 #: ../lib/purgepage.php:45
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
 "Please check to make sure you still want to permanently purge the page from "
@@ -6423,7 +6395,7 @@
 "neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch "
 "von der Datenbank permanent löschen wollen."
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
@@ -6435,8 +6407,8 @@
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 "Während Sie den Löschungsprozess begonnen haben, hat jemand anderer eine "
@@ -6468,139 +6440,139 @@
 msgid "the file '%s'"
 msgstr "die Datei %s"
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \""
 
-#: ../lib/stdlib.php:474
-#, fuzzy, php-format
+#: ../lib/stdlib.php:475
+#, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
-msgstr "Ungültiger Parameter: %s=%s"
+msgstr "Ungültiger Parameter: \"%s\" %s=%s"
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
 msgstr "Ungültige Bildgröße"
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr "phpwiki: URL Formfehler"
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr "Seite sperren, um den Link zu aktivieren"
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr "»%s«: Ungültiger Seitenname: %s"
 
 # z.B. führende Leerzeichen
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr "Führende %s nicht erlaubt"
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr "Steuerzeichen nicht erlaubt"
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr "zu lang"
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr "Ungültiges Zeichen %s entfernt"
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr "Version nicht gefunden"
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, 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:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr "Ungültige Version"
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1423
+#: ../lib/stdlib.php:1425
 #, php-format
-msgid "%s b"
-msgstr "%s B"
+msgid "%s B"
+msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr "%s Bytes"
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
-msgstr "%s k"
+msgid "%s KiB"
+msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
 #, php-format
-msgid "%s Kb (%s bytes)"
-msgstr "%s KB (%s Bytes)"
+msgid "%s KiB (%s bytes)"
+msgstr "%s KiB (%s Bytes)"
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen."
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr "%s: Ungültiger Index in Array"
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s ist leer."
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr "Konnte Verzeichnis »%s« nicht zum Lesen öffnen"
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr "OK"
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr "... (erste %s Wörter)"
@@ -6620,9 +6592,8 @@
 
 #: ../lib/upgrade.php:73 ../lib/upgrade.php:104 ../lib/upgrade.php:108
 #: ../lib/upgrade.php:200 ../lib/upgrade.php:1119
-#, fuzzy
 msgid " Skipped"
-msgstr "Ausgelassen."
+msgstr "Ausgelassen"
 
 #: ../lib/upgrade.php:98
 msgid "newer than the existing page."
@@ -6643,48 +6614,42 @@
 
 #: ../lib/upgrade.php:118 ../lib/upgrade.php:168 ../lib/upgrade.php:384
 #: ../lib/upgrade.php:912 ../lib/upgrade.php:1000
-#, fuzzy, php-format
+#, php-format
 msgid "Check for necessary %s updates"
-msgstr "prüfe Tabelle %s"
+msgstr ""
 
 #: ../lib/upgrade.php:119 ../themes/MonoBook/templates/actionbar.tmpl:18
 #: ../themes/MonoBook/templates/actionbar.tmpl:31
-#, fuzzy
 msgid "ActionPage"
 msgstr "Aktion Seite"
 
 #: ../lib/upgrade.php:121
-#, fuzzy
 msgid "_AuthInfo"
-msgstr "AuthentifizierungsInfo"
+msgstr ""
 
 #: ../lib/upgrade.php:121
-#, fuzzy
 msgid "DebugAuthInfo"
-msgstr "DebugInfo"
+msgstr ""
 
 #: ../lib/upgrade.php:124
-#, fuzzy
 msgid "_GroupInfo"
-msgstr "DebugGruppenInfo"
+msgstr ""
 
 #: ../lib/upgrade.php:124
-#, fuzzy
 msgid "GroupAuthInfo"
-msgstr "AuthentifizierungsInfo"
+msgstr ""
 
 #: ../lib/upgrade.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Check for necessary theme %s updates"
-msgstr "prüfe Tabelle %s"
+msgstr ""
 
 #: ../lib/upgrade.php:171
-#, fuzzy
 msgid "rename to Help: pages"
-msgstr "Ausgewählte Seiten umbenennen"
+msgstr ""
 
 #: ../lib/upgrade.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
@@ -6698,7 +6663,6 @@
 msgstr "ERZEUGT"
 
 #: ../lib/upgrade.php:385
-#, fuzzy
 msgid "database"
 msgstr "Datenbank"
 
@@ -6711,14 +6675,13 @@
 msgstr "Backend Typ: "
 
 #: ../lib/upgrade.php:408 ../lib/upgrade.php:428 ../lib/upgrade.php:437
-#, fuzzy, php-format
+#, php-format
 msgid "Check for table %s"
-msgstr "prüfe Tabelle %s"
+msgstr "Prüfe Tabelle %s"
 
 #: ../lib/upgrade.php:452
-#, fuzzy
 msgid "Check for new session.sess_ip column"
-msgstr "prüfe auf neue Spalte session.sess_ip column"
+msgstr "Prüfe auf neue Spalte session.sess_ip column"
 
 #: ../lib/upgrade.php:458 ../lib/upgrade.php:675 ../lib/upgrade.php:820
 #: ../lib/upgrade.php:883
@@ -6731,19 +6694,17 @@
 msgstr "HINZU"
 
 #: ../lib/upgrade.php:471
-#, fuzzy
 msgid "Check for mysql session.sess_id sanity"
-msgstr "prüfe auf mysql session.sess_id Korrektheit"
+msgstr "Prüfe auf mysql session.sess_id Korrektheit"
 
 #: ../lib/upgrade.php:485 ../lib/upgrade.php:490 ../lib/upgrade.php:527
 #: ../lib/upgrade.php:536
 msgid "fixed"
-msgstr "Geändert"
+msgstr "geändert"
 
 #: ../lib/upgrade.php:504
-#, fuzzy
 msgid "Check for mysql LOCK TABLE privilege"
-msgstr "prüfe mysql LOCK TABLE Rechte"
+msgstr "Prüfe mysql LOCK TABLE Rechte"
 
 #: ../lib/upgrade.php:550
 #, php-format
@@ -6751,12 +6712,10 @@
 msgstr "version <em>%s</em> nicht betroffen"
 
 #: ../lib/upgrade.php:559
-#, fuzzy
 msgid "Check for mysql page.id auto_increment flag"
-msgstr "prüfe auf mysql page.id auto_increment Flag"
+msgstr "Prüfe auf mysql page.id auto_increment Flag"
 
 #: ../lib/upgrade.php:596
-#, fuzzy
 msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
 msgstr "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)"
 
@@ -6775,22 +6734,18 @@
 msgstr "AUSGEBESSERT"
 
 #: ../lib/upgrade.php:647
-#, fuzzy
 msgid "Check for ACCESS_LOG_SQL passwords in POST requests"
-msgstr "prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests"
+msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests"
 
 #: ../lib/upgrade.php:670
-#, fuzzy
 msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)"
-msgstr "prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests"
+msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests"
 
 #: ../lib/upgrade.php:678
-#, fuzzy
 msgid "FIXING"
-msgstr "FEHLEND"
+msgstr ""
 
 #: ../lib/upgrade.php:681 ../lib/upgrade.php:889
-#, fuzzy
 msgid "FAIL"
 msgstr "FEHLER"
 
@@ -6831,19 +6786,18 @@
 msgstr ""
 
 #: ../lib/upgrade.php:913
-#, fuzzy
 msgid "plugin argument"
-msgstr "Ungültiger Parameter %s"
+msgstr ""
 
 #: ../lib/upgrade.php:957
-#, fuzzy, php-format
+#, php-format
 msgid "file %s not found"
 msgstr "%s nicht gefunden"
 
 #: ../lib/upgrade.php:984
-#, fuzzy, php-format
+#, php-format
 msgid "%s not found in %s"
-msgstr "%s nicht gefunden"
+msgstr "%s nicht gefunden in %s"
 
 #: ../lib/upgrade.php:991
 #, php-format
@@ -6851,14 +6805,14 @@
 msgstr "Kann »%s« nicht nach »%s« verschieben"
 
 #: ../lib/upgrade.php:995
-#, fuzzy, php-format
+#, php-format
 msgid "file %s is not writable"
 msgstr "%s ist nicht änderbar"
 
 #: ../lib/upgrade.php:1005 ../lib/upgrade.php:1015 ../lib/upgrade.php:1025
-#, fuzzy, php-format
+#, php-format
 msgid "Check for %s"
-msgstr "prüfe Tabelle %s"
+msgstr "Prüfe %s"
 
 #: ../lib/upgrade.php:1007
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
@@ -6873,9 +6827,8 @@
 msgstr ""
 
 #: ../lib/upgrade.php:1127
-#, fuzzy
 msgid "fixed with"
-msgstr "Geändert"
+msgstr "Geändert mit"
 
 #: ../lib/upgrade.php:1253
 msgid "Upgrade disabled: user != isAdmin"
@@ -6915,7 +6868,7 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() für dieses Backend noch nicht implementiert"
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
@@ -7008,8 +6961,8 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr "Konnte LDAP Server %s nicht finden"
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
 msgstr ""
 
@@ -7018,7 +6971,6 @@
 msgstr ""
 
 #: ../lib/wikilens/PageListColumns.php:378
-#, fuzzy
 msgid "Rating"
 msgstr "BenutzerBewertungen"
 
@@ -7038,7 +6990,7 @@
 msgid "Top Recommendations"
 msgstr "Beste Bewertungungen"
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr "Mitglieder:"
 
@@ -7075,9 +7027,9 @@
 msgstr "Zusatzprogramm %s deaktiviert."
 
 #: ../lib/WikiPlugin.php:486 ../lib/WikiPlugin.php:503
-#, fuzzy, php-format
+#, php-format
 msgid "Plugin '%s' does not exist."
-msgstr "Gruppenseite »%s« existiert nicht"
+msgstr "Zusatzprogramm »%s« existiert nicht"
 
 #: ../lib/WikiPlugin.php:506
 #, php-format
@@ -7089,71 +7041,66 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr "%s scheint kein WikiPlugin zu sein."
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 msgid "Never edited"
 msgstr "Noch nie bearbeitet."
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr "%s um %s"
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, php-format
-msgid "Version %s, saved %s"
-msgstr "Version %s. %s gespeichert"
+msgid "Version %s, saved on %s"
+msgstr "Version %s. gespeichert am %s"
 
 # (Usually a verb, never a noun; siehe nächste Reihe:
 # saved=gespeichert nicht "Speicherung am.")
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, php-format
 msgid "Last edited %s"
 msgstr "Zuletzt geändert %s"
 
 #: ../lib/WikiTheme.php:473
 #, php-format
-msgid "Version %s, saved on %s"
-msgstr "Version %s. gespeichert am %s"
-
-#: ../lib/WikiTheme.php:475
-#, php-format
 msgid "Last edited on %s"
 msgstr "Zuletzt bearbeitet am %s"
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr "heute"
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr "gestern"
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, php-format
 msgid "Owner: %s"
 msgstr "Besitzer: %s"
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Leerer Link zu: %s"
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
 msgstr "Erzeugen: %s"
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "»%s«: Ungültiger Seitenname"
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -7166,69 +7113,70 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Anmelden"
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 msgid "Rename Page"
 msgstr "Seite Umbenennen"
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Seite Sperren"
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Seite Freigeben"
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr "Drucker"
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr "Obere u. untere Werkzeugleisten"
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr "Externe Links"
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7256,9 +7204,9 @@
 
 #: ../lib/WikiUser/Facebook.php:40 ../lib/WikiUser/Facebook.php:81
 #: ../lib/WikiUser/OpenID.php:209 ../lib/WikiUser/OpenID.php:234
-#, fuzzy, php-format
+#, php-format
 msgid " %s AUTH ignored."
-msgstr "ungültiges %s ignoriert"
+msgstr "%s AUTH ignoriert."
 
 #: ../lib/WikiUser/Facebook.php:52
 #, php-format
@@ -7305,38 +7253,38 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr "Ungültiger Benutzername »%s« für LDAP Auth"
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 msgid "Invalid password."
 msgstr "Ungültiges Passwort."
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr "Ungültiges Passwort oder falscher Benutzername."
 
 # (wörtlich=unzureichende Erlaubnisse)
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr "Keine ausreichenden Zugangsrechte."
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt."
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr "Die Länge des Passwortes ist kürzer als vom System gefordert."
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7346,11 +7294,11 @@
 "Sie können sich leider nicht anmelden.\n"
 " Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen."
 
-#: ../lib/WikiUserNew.php:1338
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -7358,12 +7306,12 @@
 "Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren "
 "Sie config/config.ini und überprüfen sie auch ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 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:1781
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7377,14 +7325,14 @@
 "versenden.\n"
 "Siehe %s"
 
-#: ../lib/WikiUserNew.php:1841
+#: ../lib/WikiUserNew.php:1843
 #, php-format
-msgid "E-Mail address '%s' is not properly formatted"
+msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1845
+#: ../lib/WikiUserNew.php:1847
 #, php-format
-msgid "E-Mail address '%s' is properly formatted"
+msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
@@ -7562,10 +7510,10 @@
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7573,7 +7521,7 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
 msgstr "QuellTextAnsicht"
@@ -7581,16 +7529,14 @@
 #: ../themes/blog/templates/blogform.tmpl:10
 #: ../themes/default/templates/blogform.tmpl:10
 #: ../themes/fusionforge/templates/blogform.tmpl:10
-#, fuzzy
 msgid "Headline"
-msgstr "Überschrift"
+msgstr ""
 
 #: ../themes/blog/templates/blogform.tmpl:18
 #: ../themes/default/templates/blogform.tmpl:18
 #: ../themes/fusionforge/templates/blogform.tmpl:18
-#, fuzzy
 msgid "Add Entry"
-msgstr "NeueKategorie"
+msgstr ""
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7602,9 +7548,8 @@
 #: ../themes/Portland/templates/editpage.tmpl:83
 #: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/Wordpress/templates/editpage.tmpl:96
-#, fuzzy
 msgid "Help/GoodStyle"
-msgstr "GuterStil"
+msgstr "Hilfe/GuterStil"
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7627,9 +7572,8 @@
 #: ../themes/fusionforge/templates/editpage.tmpl:79
 #: ../themes/Portland/templates/editpage.tmpl:84
 #: ../themes/Wordpress/templates/editpage.tmpl:97
-#, fuzzy
 msgid "Help/TextFormattingRules"
-msgstr "TextFormatierungsRegeln"
+msgstr "Hilfe/TextFormatierungsRegeln"
 
 #: ../themes/blog/templates/blogform.tmpl:25
 #: ../themes/Crao/templates/editpage.tmpl:94
@@ -7652,12 +7596,11 @@
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7668,12 +7611,11 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
@@ -7682,10 +7624,8 @@
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7696,7 +7636,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr "Ausführung dieser Seite dauerte %s Sekunden"
@@ -7727,9 +7667,8 @@
 
 #: ../themes/blog/templates/sidebar.tmpl:8
 #: ../themes/blog/templates/sidebar.tmpl:12
-#, fuzzy
 msgid "Blog"
-msgstr "Blogs"
+msgstr "Blog"
 
 #: ../themes/blog/templates/top.tmpl:16
 msgid "Page Trail"
@@ -7740,17 +7679,15 @@
 #: ../themes/MonoBook/templates/viewsource.tmpl:6
 #: ../themes/Portland/templates/viewsource.tmpl:6
 #: ../themes/Wordpress/templates/viewsource.tmpl:11
-#, fuzzy
 msgid "This page has been locked and cannot be edited."
-msgstr ""
-"Diese Seite wurde vom Systemadministrator gesperrt und kann nicht bearbeitet "
-"werden."
+msgstr "Diese Seite wurde gesperrt und kann nicht bearbeitet werden."
 
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
-#, fuzzy
 msgid "View the current version."
 msgstr "Die aktuelle Version ansehen"
 
@@ -7767,36 +7704,36 @@
 msgid "Comments on %s by %s."
 msgstr "Kommentar zu %s von %s."
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 msgid "SignOut"
 msgstr "Abmelden"
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 msgid "SignIn"
 msgstr "AnMelden"
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr "Sperren"
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 msgid "Unlock"
 msgstr "Entsperren"
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 msgid "blog"
 msgstr "Blog"
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr "(diff)"
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -7912,21 +7849,28 @@
 #: ../themes/default/templates/editpage.tmpl:118
 #: ../themes/Portland/templates/editpage.tmpl:79
 #: ../themes/Wordpress/templates/editpage.tmpl:92
-#, fuzzy
 msgid "Help/OldTextFormattingRules"
-msgstr "AlteTextFormatierungsRegeln"
+msgstr "Hilfe/AlteTextFormatierungsRegeln"
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr "WieManWikiBenutzt"
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr "WikiWikiWeb"
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7959,13 +7903,12 @@
 msgstr "Neuer Kommentar"
 
 #: ../themes/default/templates/comment.tmpl:10
-#, fuzzy
 msgid "Remove Comment"
-msgstr "Neueste Kommentare"
+msgstr "Kommentare Löschen"
 
 #: ../themes/default/templates/comment.tmpl:18
 #: ../themes/default/templates/wikiblog.tmpl:18
-#, fuzzy, php-format
+#, php-format
 msgid "Modified on %s by %s"
 msgstr "Kommentare am %s geändert von %s"
 
@@ -7975,9 +7918,9 @@
 msgstr "%s von %s"
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ", RAM: %s"
@@ -8091,11 +8034,22 @@
 msgid "Hits:"
 msgstr "Treffer:"
 
+#: ../themes/default/templates/info.tmpl:133
+msgid "Is External:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:134
-#, fuzzy
 msgid "No"
-msgstr "Keine"
+msgstr "Nein"
 
+#: ../themes/default/templates/info.tmpl:138
+msgid "ACL type:"
+msgstr ""
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
@@ -8253,44 +8207,16 @@
 msgid "Guests"
 msgstr "Gäste"
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
+msgid "Prev"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-#, fuzzy
-msgid "Next >>"
-msgstr "Nächste"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ""
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr ""
@@ -8345,37 +8271,37 @@
 # Benutzeroberfläche or Darstellung? We should be consistent.
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
 msgstr "<Darstellung des Systems>"
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr "Ihre Benutzeroberfläche:"
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
 msgstr "<Sprache des Servers>"
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
 msgstr "Ihre Sprache:"
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
-#, fuzzy, php-format
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
+#, php-format
 msgid "User preferences for user %s"
-msgstr "Einstellungen für Benutzer '%s':"
+msgstr "Einstellungen für Benutzer '%s'"
 
 #: ../themes/default/templates/userprefs.tmpl:127
 msgid "UserId"
@@ -8448,12 +8374,12 @@
 "werden."
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr "E-Mail Nachricht bei Änderung folgender Seiten:"
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
@@ -8461,32 +8387,32 @@
 "(fileglobbing) erlaubt."
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr "Darstellung"
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr "Hier können Sie einige Voreinstellungen ändern."
 
@@ -8496,7 +8422,7 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, php-format
 msgid "Hide %s:"
 msgstr "%s verstecken:"
@@ -8511,13 +8437,13 @@
 "Browser und langsame Verbindungen."
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, php-format
 msgid "Add %s:"
 msgstr "%s Hinzufügen:"
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
@@ -8536,23 +8462,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
 msgstr "Texteingabe Fenstergröße"
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr "Höhe"
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr "Breite"
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8563,12 +8489,12 @@
 "ignoriert."
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr "Zeitzone"
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr ""
@@ -8576,40 +8502,39 @@
 "NeuesteÄnderungen)."
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr "Die Uhrzeit am Server ist gerade %s."
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr "Mit dem eingegebenen Zeit-Unterschied, würde die Zeit %s angezeigt."
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
 msgstr "Datumsformat"
 
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
 msgstr "Datum mit relativen Bezeichnungen, wie »Heute« und »Gestern«"
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr "Einstellungen Speichern"
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
-#, fuzzy
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 msgid "Reset Preferences"
 msgstr "Lösche Voreinstellungen"
 
 #: ../themes/default/templates/wikiblog.tmpl:23
-#, fuzzy, php-format
+#, php-format
 msgid "Entry on %s by %s."
 msgstr "Kommentar zu %s von %s."
 
@@ -8622,155 +8547,192 @@
 msgid "Posted: %s"
 msgstr "Gepostet: %s"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
-#, fuzzy
-msgid "/Discussion"
-msgstr "Diskussion"
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 msgid "Action Page"
 msgstr "Aktion Seite"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 msgid "Page"
-msgstr "StartSeite"
+msgstr "Seite"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
-#, fuzzy
 msgid "Template/Talk"
-msgstr "Benutzeroberfläche"
+msgstr ""
 
 #: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
-#, fuzzy
 msgid "Create Page"
-msgstr "NeueSeite"
+msgstr "Neue Seite"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
-#, fuzzy
 msgid "History"
-msgstr "SeitenProtokoll"
+msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
-msgstr "Einstellungen Speichern"
+msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 msgid "Page Info"
-msgstr "SeitenInfo"
+msgstr "Seiten Info"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Back Links"
 msgstr "Back Links"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
-msgstr "Land ändern"
+msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
-msgstr "Zugriff"
+msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 msgid "Purge"
-msgstr "[entfernt]"
+msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-#, fuzzy
-msgid "Watch Page"
-msgstr "Breite"
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr "TextFormatierungsRegeln"
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr ""
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+msgid "This revision of the page does not exist."
+msgstr "Leider, Version ist nicht in der Datenbank."
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
 msgstr ""
 
 #: ../themes/fusionforge/templates/editpage.tmpl:67
-#, fuzzy
 msgid "Make the page external?"
-msgstr "Wähle Seiten zum Umbenennen aus:"
+msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
-#, fuzzy
+#: ../themes/fusionforge/templates/navbar.tmpl:9
+msgid "Home Page"
+msgstr "Start Seite"
+
+# (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
+# Änderungen"; in terms of newspapers or journalism it's traditionally
+# "NeuesteNachrichten" or much more better "DasNeueste").
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+msgid "Recent Changes"
+msgstr "Neueste Änderungen"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
 msgid "SpecialPages"
-msgstr "um von diesem Wiki die Seiten lokal abzuspeichern"
+msgstr "Spezialseiten"
 
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+msgid "Special Pages"
+msgstr "Spezialseiten"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+msgid "Random Page"
+msgstr "ZufallsSeite"
+
 # "ÄhnlicheSeiten" (LikePages sind keine SamePages; die korrekte
 # deutsche Übersetzung ist "ÄhnlicheSeiten" which would be the best.
 # Or in case "Ä" doesn't work as a WikiWord, then use "VergleichbareSeiten".
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
 msgid "Like Pages"
 msgstr "Ähnliche Seiten"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #, fuzzy
+msgid "Wiki Admin"
+msgstr "WikiAdminChmod"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+#, fuzzy
+msgid "My User Page"
+msgstr "Benutzer Seite"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+#, fuzzy
+msgid "User Preferences"
+msgstr "BenutzerEinstellungen"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Einstellungen für Benutzer '%s':"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
+#, fuzzy
 msgid "E-mail Notification"
 msgstr "E-Mail Bestätigung"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "Einstellungen für Benutzer '%s':"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-#, fuzzy
-msgid "Random Page"
-msgstr "ZufallsSeite"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 #, fuzzy
 msgid "Check menu items to display."
 msgstr "Klicken um anzuzeigen"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 #, fuzzy
 msgid "Show Page Trail"
 msgstr "Spur"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:73
 #, fuzzy
 msgid "This page is external."
 msgstr "Formatierung der Seite '%s' auf '%s' geändert."
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -9028,6 +8990,54 @@
 msgid "Edit old revision"
 msgstr "Alte Version Bearbeiten"
 
+#, fuzzy
+#~ msgid "Server rejected address: "
+#~ msgstr "Ausgewählte Seiten löschen"
+
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Nächste"
+
+#, fuzzy
+#~ msgid "%s pages have been permanently changed:"
+#~ msgstr "%s Seiten wurden geändert."
+
+#, fuzzy
+#~ msgid "%s pages have been permanently removed:"
+#~ msgstr "%d Seiten wurden unwiderruflich gelöscht."
+
+#, fuzzy
+#~ msgid "%s pages have been permanently renamed:"
+#~ msgstr "%s Seiten wurden umbenannt."
+
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Version %s. %s gespeichert"
+
+#~ msgid "PageGroupTest"
+#~ msgstr "SeitenGruppenTest"
+
+#~ msgid "PageGroupTest/Four"
+#~ msgstr "SeitenGruppenTest/Vier"
+
+#~ msgid "PageGroupTest/One"
+#~ msgstr "SeitenGruppenTest/Eins"
+
+#~ msgid "PageGroupTest/Three"
+#~ msgstr "SeitenGruppenTest/Drei"
+
+#~ msgid "PageGroupTest/Two"
+#~ msgstr "SeitenGruppenTest/Zwei"
+
+#~ msgid "%s b"
+#~ msgstr "%s B"
+
+#~ msgid "%s k"
+#~ msgstr "%s k"
+
+#, fuzzy
+#~ msgid "/Discussion"
+#~ msgstr "Diskussion"
+
 #~ msgid "Insert Categories (double-click)"
 #~ msgstr "Kategorien einfügen (Doppelklick)"
 
@@ -9104,10 +9114,6 @@
 #~ msgstr "Das PhpWiki Programmierer-Team"
 
 #, fuzzy
-#~ msgid "%s: "
-#~ msgstr "%s: %s"
-
-#, fuzzy
 #~ msgid "Page history"
 #~ msgstr "SeitenProtokoll"
 
@@ -9253,10 +9259,6 @@
 #~ msgstr "Seite '%s' auf '%s' umbenannt."
 
 #, fuzzy
-#~ msgid "%d pages have been reverted."
-#~ msgstr "%s Seiten wurden geändert."
-
-#, fuzzy
 #~ msgid "PhpWikiAdministration/MassRevert"
 #~ msgstr "PhpWikiSystemverwalten/Löschen"
 
@@ -9268,10 +9270,6 @@
 #~ "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen "
 #~ "wollen?"
 
-#, fuzzy
-#~ msgid "Revert selected pages"
-#~ msgstr "Ausgewählte Seiten löschen"
-
 #~ msgid "Ok"
 #~ msgstr "Ok"
 
@@ -9299,9 +9297,6 @@
 #~ msgid "LDAP_AUTH_HOST not defined"
 #~ msgstr "LDAP_AUTH_HOST nicht definiert"
 
-#~ msgid "db type:"
-#~ msgstr "Dbtyp:"
-
 #~ msgid "timeout:"
 #~ msgstr "Zeitüberschreitung:"
 
@@ -9311,9 +9306,6 @@
 #~ msgid "Rename selected pages."
 #~ msgstr "Ausgewählte Seiten umbenennen."
 
-#~ msgid "ACL: "
-#~ msgstr "ACL: "
-
 #~ msgid "Description: "
 #~ msgstr "Beschreibung: "
 
@@ -9632,7 +9624,7 @@
 #~ msgstr "Versuch die neueste Version von »%s« zu kombinieren"
 
 #~ msgid "Creating new repository [%s]"
-#~ msgstr "Das CVS Verzeichnis [%s] wird erzeugt"
+#~ msgstr "Das Subversion Verzeichnis [%s] wird erzeugt"
 
 #~ msgid "Found [%s] in [%s]"
 #~ msgstr "[%s] in [%s] gefunden"

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/es.po
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/es.po	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/es.po	2011-05-18 19:36:20 UTC (rev 13355)
@@ -9,14 +9,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.11\n"
+"Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <proca at clavo.net>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Date: 2001-01-12 16:10-0500\n"
 "From:  <proca at clavo.net>\n"
@@ -37,9 +38,9 @@
 
 # lib/msql.php:221 lib/msql.php:296
 #: ../lib/CachedMarkup.php:577
-#, fuzzy, php-format
+#, php-format
 msgid "Relation %s to page %s"
-msgstr "Eliminación en %s falló: %s"
+msgstr ""
 
 #: ../lib/CachedMarkup.php:632
 msgid "Found by "
@@ -55,12 +56,12 @@
 msgid "Type word above:"
 msgstr "Mecanografíe la palabra arriba:"
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr "¡El tratante %s del DBA está sin apoyo!"
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr "Los tratantes apoyados son: %s"
@@ -80,8 +81,8 @@
 msgid "version %s"
 msgstr "versión %s"
 
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr "por %s"
@@ -97,7 +98,7 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr "Estoy apesadumbrado, allí no soy ninguna página tal como %s."
 
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr "Diferencia de: %s"
@@ -154,87 +155,66 @@
 msgid "Older page:"
 msgstr "Página más viejo:"
 
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "invierta a la versión %d"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " and "
-msgstr "agregue "
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Las versiones son idénticas"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Versión"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr ""
 
 # lib/stdlib.php:384 lib/stdlib.php:445
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr "CambiosRecientes"
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "Discusión sin apoyo: %s=%s"
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -251,12 +231,12 @@
 msgid "(Redirected from %s)"
 msgstr "(vuelto a dirigir de %s)"
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
 msgstr "CajaDeArena"
 
@@ -362,7 +342,7 @@
 msgid "Versions are identical"
 msgstr "Las versiones son idénticas"
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr "Página Bloqueada"
 
@@ -401,19 +381,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr "UsuarioPreferencias"
@@ -478,12 +458,11 @@
 
 # lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/editpage.php:709
-#, fuzzy
 msgid "Changes"
-msgstr "CambiosRecientes"
+msgstr "Cambios"
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr ""
 
@@ -534,14 +513,13 @@
 msgid "String \"%s\" not found."
 msgstr "Secuencia \"%s\" no encontrado."
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
 msgstr "Busque Y Substituya"
 
 # lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/EditToolbar.php:55
-#, fuzzy
 msgid "Search for"
 msgstr "Buscar"
 
@@ -549,8 +527,8 @@
 msgid "Replace with"
 msgstr "Substituya por"
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -561,9 +539,9 @@
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr "Cierre"
 
@@ -572,18 +550,16 @@
 msgstr "Texto en negrilla"
 
 #: ../lib/EditToolbar.php:127
-#, fuzzy
 msgid "Bold text [alt-b]"
-msgstr "Texto en negrilla"
+msgstr "Texto en negrilla [alt-b]"
 
 #: ../lib/EditToolbar.php:131
 msgid "Italic text"
 msgstr "Texto del itálico"
 
 #: ../lib/EditToolbar.php:132
-#, fuzzy
 msgid "Italic text [alt-i]"
-msgstr "Texto del itálico"
+msgstr "Texto del itálico [alt-i]"
 
 #: ../lib/EditToolbar.php:136
 msgid "Strike-through text"
@@ -659,8 +635,8 @@
 msgid "List"
 msgstr "Listas:"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 #, fuzzy
 msgid "Table of Contents"
 msgstr "ningún contenido de la página"
@@ -671,8 +647,8 @@
 msgstr "Nombre de la Página"
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr ""
 
@@ -684,93 +660,90 @@
 #: ../lib/EditToolbar.php:202 ../lib/plugin/PopularTags.php:57
 #: ../lib/plugin/Template.php:61
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr "Chasque un botón para conseguir un texto del ejemplo"
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 msgid "Undo Search & Replace"
 msgstr "Deshaga La Búsqueda Y Substitúyala"
 
 # lib/diff.php:997
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 msgid "AddCategory"
 msgstr "AgregueCategoría"
 
 # lib/diff.php:997
-#: ../lib/EditToolbar.php:321
+#: ../lib/EditToolbar.php:320
 #, fuzzy
 msgid "Insert Categories"
 msgstr "Categoría"
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr "Relleno"
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 msgid "AddPlugin"
 msgstr "AgreguePlugin"
 
-#: ../lib/EditToolbar.php:371
-#, fuzzy
+#: ../lib/EditToolbar.php:370
 msgid "Insert Plugin"
-msgstr "Relleno Plugin (doble-tecleo)"
+msgstr "Relleno Plugin"
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 msgid "AddPageLink"
 msgstr "AgregueElAcoplamientoDeLaPágina"
 
-#: ../lib/EditToolbar.php:401
-#, fuzzy
+#: ../lib/EditToolbar.php:400
 msgid "Insert PageLink"
-msgstr "Inserte el AcoplamientoDeLaPágina (doble-tecleo)"
+msgstr "Inserte el AcoplamientoDeLaPágina"
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 #, fuzzy
 msgid "Add Image or Video"
 msgstr "AgregueElAcoplamientoDeLaPágina"
 
-#: ../lib/EditToolbar.php:439
+#: ../lib/EditToolbar.php:438
 #, fuzzy
 msgid "Insert Image or Video"
 msgstr "AgregueElAcoplamientoDeLaPágina"
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
 msgstr "AgregueLaPlantilla"
 
-#: ../lib/EditToolbar.php:474
-#, fuzzy
+#: ../lib/EditToolbar.php:473
 msgid "Insert Template"
-msgstr "Inserte la plantilla (doble-tecleo)"
+msgstr "Inserte la plantilla"
 
 #: ../lib/ErrorManager.php:220
 #, php-format
 msgid "%s: error while handling error:"
 msgstr "%s: error mientras que maneja error:"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: fichero no encontrado"
 
 # lib/diff.php:997
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr "GrupoCategoría"
 
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sin un nombre"
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr "PáginaPrincipal"
@@ -779,7 +752,23 @@
 msgid "Invalid [] syntax ignored"
 msgstr "[] el sintaxis inválido no hizo caso"
 
-#: ../lib/InlineParser.php:889
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+msgid ": "
+msgstr ": "
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
 msgstr "el color desconocido %s no hizo caso"
@@ -792,7 +781,7 @@
 msgid "Dump to directory"
 msgstr "Descarga al directorio"
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 msgid "Upload File"
 msgstr "Archivo Del Upload"
 
@@ -808,31 +797,31 @@
 msgid "Dump pages as XHTML"
 msgstr "Páginas de la descarga como XHTML"
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
 msgstr "AdministraciónDePhpWiki"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
 msgstr "Editar: %s"
@@ -861,90 +850,90 @@
 msgid "Return to %s"
 msgstr "Vuelva a %s"
 
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr "DescargaCompleta"
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr "La Foto Más última"
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr "Usted debe especificar un directorio para descargar a"
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr "No puede crear el directorio '%s'"
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr "Directorio creado '%s' para la descarga de la página..."
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
 msgstr "Usando el directorio '%s'"
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr "Descargar Las Páginas"
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr "Saltado."
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr "ahorrado como %s"
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Error al escribir la página '%s'"
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr "%s octetos"
 
 # lib/editpage.php:19
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr "... copia de [%s]"
 
 # lib/editpage.php:19
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, php-format
 msgid "... not copied to %s"
 msgstr "... non copia de [%s]"
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 msgid "saved as "
 msgstr "ahorrado como "
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr "... no encontrado"
 
 # lib/pageinfo.php:9
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr "¡Escriba un nombre de página!"
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 #, fuzzy
 msgid "Invalid pagename!"
 msgstr "Username inválido"
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -953,76 +942,76 @@
 msgid "InterWikiMap"
 msgstr "InterMapaDeWiki"
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Página nueva"
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr "tiene corregir conflictos - sobreescribiendo de todos modos"
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr "tiene corregir los conflictos - saltados"
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 "el contenido es idéntico a la versión actual %d - ninguna nueva revisión "
 "creada"
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- ahorrado a la base de datos como versión %d"
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "Archivo %s del MIME"
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr "Archivo serializado %s"
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr "archivo llano %s"
 
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr "Fusión Editar"
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr "Restore de todos modos"
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr "Sobreescriba Todos"
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr " Apesadumbrado, no puede combinarse."
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
@@ -1030,111 +1019,111 @@
 msgid "Revert"
 msgstr "Invierta"
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr "parámetro requerido de la versión que falta"
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 msgid "no page content"
 msgstr "ningún contenido de la página"
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 msgid "same version page"
 msgstr "la misma página de la versión"
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancelar"
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr "Si"
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr "invierta a la versión %d"
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1134
 #, fuzzy, php-format
 msgid "Revert: %s"
 msgstr "Invierta"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- versión %d ahorrada a la base de datos como versión %d"
 
-#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: no definido"
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr "Archivo del InterMapa de Wiki del defecto no cargado."
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Cargamento InterMapaDeWiki del archivo externo %s."
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr "El saltar"
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Mal tipo del archivo:  %s"
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr "'%s' que carga"
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr "El cargar encima de wiki virginal"
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr "¿Ningún archivo uploaded a upload?"
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr "%s uploading"
@@ -1144,43 +1133,43 @@
 msgid "PageChange Notification of %s"
 msgstr "Pagine la notificación del cambio de %s enviado a %s"
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "Vuelva a %s"
 
 # lib/msql.php:29 lib/mysql.php:36
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "No podía conectar con %s"
 
 # lib/pageinfo.php:21
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr "Cambio de la página"
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "Comentarios"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La página retitula %s a %s"
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "Página borrar %s"
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 #, fuzzy
 msgid "E-Mail address confirmation"
 msgstr "Verificación Del Email"
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1195,7 +1184,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 msgid "Optimizing database"
 msgstr "Base de datos óptima"
 
@@ -1474,8 +1463,8 @@
 msgstr "Fije El Acl"
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr "Retitule"
 
@@ -1499,7 +1488,7 @@
 
 # lib/fullsearch.php:48
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1543,8 +1532,8 @@
 msgid "Users will not be able to sign in."
 msgstr "Los usuarios no podrán firmar adentro."
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
 #: ../lib/PageList.php:93
@@ -1571,7 +1560,7 @@
 msgid "Click to de-/select all pages"
 msgstr "Tecleo para de-/seleccionar todas las páginas"
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... primeros octetos de %d"
@@ -1586,21 +1575,21 @@
 msgid "%s not found"
 msgstr "%s: fichero no encontrado"
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
 #, fuzzy
 msgid "individual page permission"
 msgstr "Permiso que falta de la página:"
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
@@ -1611,17 +1600,17 @@
 msgstr "<ningunos fósforos>"
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 msgid "Content"
 msgstr "Contenido"
 
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 msgid "Permission"
 msgstr ""
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr ""
 
@@ -1704,7 +1693,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
@@ -1714,7 +1703,6 @@
 msgstr "Columnas: %s."
 
 #: ../lib/PagePerm.php:191
-#, fuzzy
 msgid "SearchReplace"
 msgstr "Busque Y Substituya"
 
@@ -1774,7 +1762,7 @@
 msgstr "-/+"
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "Descripción"
 
@@ -1804,12 +1792,14 @@
 "ADVERTENCIA: Se abre la página de InterMapaDeWiki, tan no usando esos "
 "acoplamientos."
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1849,7 +1839,7 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr ""
 
@@ -1909,111 +1899,111 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr "usuarios"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr "minutas"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr "horas"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr "dias"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr "semanas"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -2041,11 +2031,11 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
 msgstr "Página actualizada con éxito."
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
 msgstr ""
@@ -2147,7 +2137,7 @@
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2283,14 +2273,14 @@
 msgstr "Editar %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2343,9 +2333,8 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr ""
 
@@ -2394,25 +2383,50 @@
 msgid "Created by CreatePage"
 msgstr "Cree par CreeLaPágina"
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr "CreeToc"
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+# lib/pageinfo.php:21
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+#, fuzzy
+msgid "No page specified."
+msgstr "Ningunos cambios encontrados"
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, fuzzy, php-format
+msgid "Page '%s' does not exist."
+msgstr "La página '%s' del grupo no existe"
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, fuzzy, php-format
+msgid "%s: no such revision %d."
+msgstr "%s: ninguna tal clase"
+
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr ""
 
@@ -2428,8 +2442,8 @@
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "Diferencia"
 
@@ -2437,6 +2451,30 @@
 msgid "Display differences between revisions"
 msgstr ""
 
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "invierta a la versión %d"
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " and "
+msgstr "agregue "
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Las versiones son idénticas"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Versión"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
 #: ../lib/plugin/DynamicIncludePage.php:35
 #, fuzzy
 msgid "DynamicIncludePage"
@@ -2460,7 +2498,7 @@
 msgid "Click to hide/show"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr ""
 
@@ -2520,7 +2558,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr ""
@@ -2586,22 +2624,35 @@
 "Displays a url in a seperate frame inside our body. Only one frame allowed."
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
-#, php-format
-msgid "recursive inclusion of page %s"
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:94
+# lib/msql.php:221 lib/msql.php:296
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "Eliminación en %s falló: %s"
+
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
 #, php-format
-msgid "recursive inclusion of url %s"
+msgid "Recursive inclusion of url %s"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2728,7 +2779,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, php-format
 msgid "%s is empty"
 msgstr "%s es vacío"
@@ -2794,37 +2845,41 @@
 msgid "Include text from another wiki page."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, php-format
-msgid "recursive inclusion of page %s ignored"
+msgid "Recursive inclusion of page %s ignored"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
+#: ../lib/plugin/IncludePage.php:91
 #, fuzzy, php-format
 msgid "Page '%s' does not exist"
 msgstr "La página '%s' del grupo no existe"
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
 #, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "%s(%d): no such revision"
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
 msgstr ""
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:157
+#, fuzzy, php-format
+msgid "Included from %s (revision %d)"
+msgstr "Inserción de '%s'"
+
+# lib/msql.php:237 lib/msql.php:312
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "Inserción de '%s'"
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr ""
@@ -2880,6 +2935,7 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
@@ -2923,6 +2979,8 @@
 
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3213,7 +3271,7 @@
 msgstr "%s: Página no encontrado."
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
+msgid "Download for Subversion"
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:154
@@ -3269,7 +3327,7 @@
 #: ../lib/plugin/PageDump.php:215
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
@@ -3292,12 +3350,13 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr "Siguiente"
 
@@ -3610,7 +3669,7 @@
 #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124
 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: ../lib/plugin/PopularNearby.php:44
 msgid "PopularNearby"
@@ -3646,7 +3705,7 @@
 msgstr "Las páginas más populares."
 
 # lib/diff.php:997
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr "CategoriaCategoria"
 
@@ -3695,7 +3754,7 @@
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr ""
 
@@ -3729,8 +3788,8 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr "PáginaAlAzar"
@@ -4118,11 +4177,11 @@
 msgid "Recursive redirect to self: '%s'"
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
 msgstr ""
 
@@ -4329,9 +4388,8 @@
 msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:287
-#, fuzzy
 msgid "Help:SemanticRelations"
-msgstr "Cancelar"
+msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:335
 #, php-format
@@ -4410,76 +4468,76 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
+#: ../lib/plugin/SyncWiki.php:110
 msgid "Syncing this PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
+#: ../lib/plugin/SyncWiki.php:209
 #, fuzzy
 msgid "Now upload all locally newer uploads."
 msgstr "¿Ningún archivo uploaded a upload?"
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
+#: ../lib/plugin/SyncWiki.php:274
 #, php-format
 msgid "%s force"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:276
+#: ../lib/plugin/SyncWiki.php:278
 #, php-format
 msgid "Postponed %s for %s."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 #, fuzzy
 msgid "skipped"
 msgstr "Saltado."
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 #, fuzzy
 msgid "same content"
 msgstr "ningún contenido de la página"
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr ""
@@ -4601,12 +4659,12 @@
 
 #: ../lib/plugin/SystemInfo.php:400
 #, php-format
-msgid "Application size: %d Kb"
+msgid "Application size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:402
 #, php-format
-msgid "Pagedata size: %d Kb"
+msgid "Pagedata size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:420
@@ -4713,6 +4771,11 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr ""
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr ""
@@ -4802,7 +4865,7 @@
 msgid "Transcluded from %s"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr ""
 
@@ -4892,78 +4955,78 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:179
+#: ../lib/plugin/UpLoad.php:178
 msgid "You cannot upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 msgid "Check you are logged in."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:213
+#: ../lib/plugin/UpLoad.php:212
 #, fuzzy, php-format
 msgid "ERROR uploading '%s'"
 msgstr "'%s' que carga"
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, php-format
 msgid "Files with extension %s are not allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:226
+#: ../lib/plugin/UpLoad.php:225
 #, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, php-format
 msgid "uploaded %s"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 msgid "Uploading failed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:291
+#: ../lib/plugin/UpLoad.php:290
 msgid "The upload logfile exists but is not writable."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 msgid "Can't open the upload logfile."
 msgstr ""
 
@@ -5105,7 +5168,6 @@
 msgstr ""
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr ""
 
@@ -5144,6 +5206,9 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 #, fuzzy
 msgid "WatchPage"
 msgstr "Anchura"
@@ -5174,11 +5239,11 @@
 msgid "The page %s is already watched!"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -5186,6 +5251,12 @@
 msgid "Edit"
 msgstr "Editar"
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#, fuzzy
+msgid "Watch Page"
+msgstr "Anchura"
+
 #: ../lib/plugin/WatchPage.php:110
 #, fuzzy
 msgid "You must sign in to watch pages."
@@ -5251,43 +5322,47 @@
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
 #, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
 msgstr ""
 
 # lib/pageinfo.php:21
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 msgid "No pages changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Select the pages to change:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr ""
 
@@ -5318,41 +5393,42 @@
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr ""
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been changed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
 #, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:171
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
-msgstr ""
+#: ../lib/plugin/WikiAdminChown.php:173
+#, fuzzy
+msgid "Are you sure you want to change the owner of the selected pages?"
+msgstr "Guardar"
 
-#: ../lib/plugin/WikiAdminChown.php:175
+#: ../lib/plugin/WikiAdminChown.php:177
 #, fuzzy
 msgid "Change owner of selected pages"
 msgstr "Guardar"
 
-#: ../lib/plugin/WikiAdminChown.php:176
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:198
+#: ../lib/plugin/WikiAdminChown.php:200
 #, fuzzy
-msgid "Change owner"
+msgid "Change owner to: "
 msgstr "Change Contraseña"
 
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
-msgstr ""
-
 #: ../lib/plugin/WikiAdminMarkup.php:36
 msgid "WikiAdminMarkup"
 msgstr ""
@@ -5380,23 +5456,21 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+#: ../lib/plugin/WikiAdminMarkup.php:165
+msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
+#: ../lib/plugin/WikiAdminMarkup.php:169
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
+#: ../lib/plugin/WikiAdminMarkup.php:192
 #, fuzzy
-msgid "Change markup"
+msgid "Change markup to: "
 msgstr "Change Contraseña"
 
 #: ../lib/plugin/WikiAdminPurge.php:34
@@ -5419,26 +5493,38 @@
 msgid "Didn't purge page '%s'. Access denied."
 msgstr "Página '%s' borrada satisfactoriamente."
 
+# lib/pageinfo.php:21
+#: ../lib/plugin/WikiAdminPurge.php:77
+#, fuzzy
+msgid "One page has been permanently purged:"
+msgstr "Ningunos cambios encontrados"
+
 #: ../lib/plugin/WikiAdminPurge.php:79
 #, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
 msgstr ""
 
+# lib/pageinfo.php:21
+#: ../lib/plugin/WikiAdminPurge.php:85
+#, fuzzy
+msgid "No pages purged."
+msgstr "Ningunos cambios encontrados"
+
 #: ../lib/plugin/WikiAdminPurge.php:92
 #, fuzzy
 msgid "PhpWikiAdministration/Purge"
 msgstr "AdministraciónDePhpWiki"
 
-#: ../lib/plugin/WikiAdminPurge.php:144
+#: ../lib/plugin/WikiAdminPurge.php:146
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:147
+#: ../lib/plugin/WikiAdminPurge.php:149
 #, fuzzy
 msgid "Permanently purge selected pages"
 msgstr "Guardar"
 
-#: ../lib/plugin/WikiAdminPurge.php:148
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5460,38 +5546,50 @@
 msgid "Didn't remove page '%s'. Access denied."
 msgstr "Página '%s' borrada satisfactoriamente."
 
+# lib/pageinfo.php:21
+#: ../lib/plugin/WikiAdminRemove.php:121
+#, fuzzy
+msgid "One page has been removed:"
+msgstr "Ningunos cambios encontrados"
+
 #: ../lib/plugin/WikiAdminRemove.php:123
 #, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+# lib/pageinfo.php:21
+#: ../lib/plugin/WikiAdminRemove.php:129
+#, fuzzy
+msgid "No pages removed."
+msgstr "Ningunos cambios encontrados"
+
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "Quite"
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+#: ../lib/plugin/WikiAdminRemove.php:199
+msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:201
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:211
+#: ../lib/plugin/WikiAdminRemove.php:213
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -5500,86 +5598,97 @@
 msgid "WikiAdminRename"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 msgid "Rename selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:79
+#: ../lib/plugin/WikiAdminRename.php:80
 #, php-format
 msgid "Page '%s' already exists. Ignored."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:82
+#: ../lib/plugin/WikiAdminRename.php:83
 #, php-format
 msgid "Access denied to rename page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:91
+#: ../lib/plugin/WikiAdminRename.php:92
 #, fuzzy, php-format
 msgid "Renamed page from '%s' to '%s'"
 msgstr "invierta a la versión %d"
 
-#: ../lib/plugin/WikiAdminRename.php:100
+#: ../lib/plugin/WikiAdminRename.php:101
 #, fuzzy, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr "invierta a la versión %d"
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:126
-#, php-format
-msgid "%s pages have been permanently renamed:"
-msgstr ""
+# lib/pageinfo.php:21
+#: ../lib/plugin/WikiAdminRename.php:124
+#, fuzzy
+msgid "One page has been renamed:"
+msgstr "Ningunos cambios encontrados"
 
 # lib/pageinfo.php:21
-#: ../lib/plugin/WikiAdminRename.php:132
+#: ../lib/plugin/WikiAdminRename.php:127
+#, fuzzy, php-format
+msgid "%d pages have been renamed:"
+msgstr "Ningunos cambios encontrados"
+
+# lib/pageinfo.php:21
+#: ../lib/plugin/WikiAdminRename.php:133
 #, fuzzy
 msgid "No pages renamed."
 msgstr "Ningunos cambios encontrados"
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:209
-msgid "Are you sure you want to permanently rename the selected pages?"
+#: ../lib/plugin/WikiAdminRename.php:211
+msgid "Are you sure you want to rename the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:213
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 #, fuzzy
 msgid "Rename page"
 msgstr "Borrar Página"
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 msgid "from"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 msgid "Regex?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
 msgstr ""
 
@@ -5605,33 +5714,32 @@
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 msgid "Select the pages to search and replace"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 #, fuzzy
 msgid "Replace"
 msgstr "Substituya por"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr ""
 
@@ -5691,47 +5799,47 @@
 msgid "Invalid ACL"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 msgid "PhpWikiAdministration/SetAcl"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 #, fuzzy
 msgid "Change Access Rights"
 msgstr "Acceso"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 msgid "Select the pages where to change access rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 msgid "Selected Pages: "
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 msgid "Type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 msgid "(Currently not working)"
 msgstr ""
 
@@ -5754,12 +5862,12 @@
 msgid "PhpWikiAdministration/SetExternal"
 msgstr "AdministraciónDePhpWiki"
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 #, fuzzy
 msgid "Set pages to external"
 msgstr "Página desbloquear."
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 msgid "Select the pages to set as external"
 msgstr ""
 
@@ -5771,122 +5879,122 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, php-format
 msgid "Bad action requested: %s"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:100
+#: ../lib/plugin/WikiAdminUtils.php:102
 #, php-format
 msgid "WikiAdminUtils %s returned:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:102
+#: ../lib/plugin/WikiAdminUtils.php:104
 #, fuzzy
 msgid "Back"
 msgstr "AcoplamientosTraseros"
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 msgid "Purge all Pages With Invalid Names"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr "Verificación Del Email"
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 msgid "No pages with bad names had to be deleted."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:147
+#: ../lib/plugin/WikiAdminUtils.php:149
 #, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 msgid "No empty, unreferenced pages were found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:180
+#: ../lib/plugin/WikiAdminUtils.php:182
 #, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, php-format
 msgid "Converted successfully %d pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:233
+#: ../lib/plugin/WikiAdminUtils.php:235
 #, fuzzy
 msgid "Username"
 msgstr "Retitule"
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr ""
 
@@ -5996,311 +6104,245 @@
 msgstr "Gracias!"
 
 #: ../lib/plugin/_WikiTranslation.php:47
-msgid "AddCommentPlugin"
+msgid "AllPagesCreatedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:48
-msgid "AddingPages"
+msgid "AllPagesLastEditedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:49
-msgid "AllPagesCreatedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:50
-msgid "AllPagesLastEditedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:51
 msgid "AllPagesOwnedByMe"
 msgstr ""
 
+# lib/diff.php:997
 #: ../lib/plugin/_WikiTranslation.php:52
-msgid "AuthorHistoryPlugin"
+msgid "CategoryHomePages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:54
-msgid "CalendarListPlugin"
-msgstr "CalendarioListaPlugin"
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
+#: ../themes/Crao/templates/navbar.tmpl:41
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/MonoBook/templates/navbar.tmpl:30
+#: ../themes/MonoBook/templates/navbar.tmpl:36
+#: ../themes/Portland/templates/navbar.tmpl:6
+#: ../themes/shamino_com/templates/top.tmpl:21
+#: ../themes/Sidebar/templates/search.tmpl:6
+#: ../themes/smaller/templates/navbar.tmpl:9
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
+#: ../themes/wikilens/templates/navbar.tmpl:19
+msgid "FindPage"
+msgstr "BuscarPágina"
 
-#: ../lib/plugin/_WikiTranslation.php:55
-msgid "CalendarPlugin"
-msgstr "CalendarioPlugin"
+# lib/stdlib.php:384 lib/stdlib.php:445
+#: ../lib/plugin/_WikiTranslation.php:56
+msgid "FullRecentChanges"
+msgstr ""
 
-# lib/diff.php:997
 #: ../lib/plugin/_WikiTranslation.php:57
-msgid "CategoryHomePages"
-msgstr ""
+#, fuzzy
+msgid "Help/AddingPages"
+msgstr "Descargar Las Páginas"
 
 #: ../lib/plugin/_WikiTranslation.php:58
-msgid "CommentPlugin"
-msgstr ""
+#, fuzzy
+msgid "Help/AddCommentPlugin"
+msgstr "Agregue El Comentario"
 
 #: ../lib/plugin/_WikiTranslation.php:59
-msgid "CreateTocPlugin"
+msgid "Help/AuthorHistoryPlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:60
+msgid "Help/CalendarListPlugin"
+msgstr "Ayuda/CalendarioListaPlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:61
+msgid "Help/CalendarPlugin"
+msgstr "Ayuda/CalendarioPlugin"
+
 #: ../lib/plugin/_WikiTranslation.php:62
-msgid "EditMetaDataPlugin"
+msgid "Help/CommentPlugin"
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
+msgid "Help/CreateTocPlugin"
+msgstr "Ayuda/CreeToc"
+
+#: ../lib/plugin/_WikiTranslation.php:64
+msgid "Help/EditMetaDataPlugin"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
-#: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
-#: ../themes/MonoBook/templates/navbar.tmpl:30
-#: ../themes/MonoBook/templates/navbar.tmpl:36
-#: ../themes/Portland/templates/navbar.tmpl:6
-#: ../themes/shamino_com/templates/top.tmpl:21
-#: ../themes/Sidebar/templates/search.tmpl:6
-#: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
-#: ../themes/wikilens/templates/navbar.tmpl:19
-msgid "FindPage"
-msgstr "BuscarPágina"
-
 #: ../lib/plugin/_WikiTranslation.php:65
-msgid "FoafViewerPlugin"
+msgid "Help/ExternalSearchPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
+msgid "Help/FoafViewerPlugin"
 msgstr ""
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/_WikiTranslation.php:67
-msgid "FullRecentChanges"
+msgid "Help/FrameIncludePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:68
-msgid "HelloWorldPlugin"
+msgid "Help/HelloWorldPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:69
-msgid "HomePageAlias"
-msgstr "PáginaPrincipalAlias"
+msgid "Help/IncludePagePlugin"
+msgstr "Ayuda/BuscarPágina"
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
+msgid "Help/LinkIcons"
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/_WikiTranslation.php:71
-msgid "InterWiki"
-msgstr "InterWiki"
+msgid "Help/MagicPhpWikiURLs"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
+msgid "Help/MoreAboutMechanics"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
+msgid "Help/OldStyleTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
+msgid "Help/PhotoAlbumPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
+msgid "Help/PhpHighlightPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
+msgid "Help/PhpWeatherPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:77
-msgid "OldStyleTablePlugin"
+msgid "Help/PhpWiki"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:78
+msgid "Help/PloticusPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:79
-msgid "PageGroupTest"
+msgid "Help/RawHtmlPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:80
-msgid "PageGroupTest/Four"
+msgid "Help/RedirectToPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:81
-msgid "PageGroupTest/One"
+msgid "Help/RichTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:82
-msgid "PageGroupTest/Three"
+msgid "Help/SystemInfoPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:83
-msgid "PageGroupTest/Two"
+msgid "Help/TranscludePlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr "Ayuda/IncluyaPáginasSecundariaPlugin"
+
 #: ../lib/plugin/_WikiTranslation.php:85
-msgid "PhotoAlbumPlugin"
-msgstr ""
+msgid "Help/UpLoadPlugin"
+msgstr "Ayuda/UpLoadPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:86
-msgid "PhpHighlightPlugin"
+msgid "Help/WabiSabi"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
+msgid "Help/WikiBlogPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
+msgid "Help/WikiPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:89
-msgid "PhpWikiAdministration/Chmod"
+msgid "Help/WikiWikiWeb"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:92
-msgid "PhpWikiAdministration/Rename"
-msgstr ""
+#: ../lib/plugin/_WikiTranslation.php:90
+msgid "HomePageAlias"
+msgstr "PáginaPrincipalAlias"
 
+# lib/fullsearch.php:48
+#: ../lib/plugin/_WikiTranslation.php:91
+msgid "InterWiki"
+msgstr "InterWiki"
+
 #: ../lib/plugin/_WikiTranslation.php:93
-msgid "PhpWikiAdministration/Replace"
+msgid "PhpWikiAdministration/Chmod"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:95
-#: ../themes/MonoBook/templates/navbar.tmpl:21
-msgid "PhpWikiDocumentation"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:96
-msgid "PhpWikiPoll"
+msgid "PhpWikiAdministration/Rename"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:97
-msgid "PloticusPlugin"
+msgid "PhpWikiAdministration/Replace"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:99
-msgid "PgsrcTranslation/de"
+#: ../themes/MonoBook/templates/navbar.tmpl:21
+msgid "PhpWikiDocumentation"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:100
-msgid "PgsrcTranslation/fr"
+msgid "PhpWikiPoll"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:101
-msgid "PgsrcTranslation/it"
+msgid "RecentVisitors"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:102
-msgid "PgsrcTranslation/es"
+msgid "ReleaseNotes"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:103
-msgid "PgsrcTranslation/nl"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:104
-msgid "PgsrcTranslation/sv"
+msgid "SteveWainstead"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:105
-msgid "PgsrcTranslation/ja"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:106
-msgid "PgsrcTranslation/zh"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:107
-msgid "RawHtmlPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:108
-msgid "RecentVisitors"
-msgstr ""
-
-# lib/msql.php:237 lib/msql.php:312
-#: ../lib/plugin/_WikiTranslation.php:109
-msgid "RedirectToPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:110
-msgid "ReleaseNotes"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:111
-msgid "RichTablePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:113
-msgid "SteveWainstead"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:114
-msgid "SystemInfoPlugin"
-msgstr ""
-
-# lib/msql.php:237 lib/msql.php:312
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr "IncluyaPáginasSecundariaPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "UpLoad"
 msgstr "UpLoad"
 
-#: ../lib/plugin/_WikiTranslation.php:119
-msgid "UpLoadPlugin"
-msgstr "UpLoadPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:121
-msgid "WikiBlogPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:122
-msgid "WikiPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr ""
@@ -6331,7 +6373,7 @@
 msgstr "Apesadumbrada, esta página no está en la base de datos."
 
 # lib/pageinfo.php:21
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 #, fuzzy
 msgid "Purge Page"
 msgstr "Cambio de la página"
@@ -6354,7 +6396,7 @@
 "the database."
 msgstr ""
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr "Borrar Página"
 
@@ -6366,8 +6408,8 @@
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 
@@ -6397,139 +6439,139 @@
 msgid "the file '%s'"
 msgstr "el archivo %s"
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr ""
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr "demasiado de largo"
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr "Los carbones ilegales %s quitaron"
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr "Revisión No encontrada"
 
 # lib/pageinfo.php:36
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "Estoy apesadumbrado.  La versión %d de %s no está en la base de datos."
 
-#: ../lib/stdlib.php:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1423
+#: ../lib/stdlib.php:1425
 #, php-format
-msgid "%s b"
-msgstr "%s o"
+msgid "%s B"
+msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr "%s octetos"
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
+msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
-#, php-format
-msgid "%s Kb (%s bytes)"
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
+#, fuzzy, php-format
+msgid "%s KiB (%s bytes)"
 msgstr "%s Kb (%s octetos)"
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr ""
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -6832,7 +6874,7 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() no todavía puesto en ejecucio'n para este backend"
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: La fecha de la nueva revisión es %s"
@@ -6925,8 +6967,8 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr "Incapaz conectar con el servidor %s de LDAP"
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
 msgstr ""
 
@@ -6957,7 +6999,7 @@
 msgid "Top Recommendations"
 msgstr ""
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr "Miembros:"
 
@@ -7013,69 +7055,64 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr "%s: no una subclase de WikiPlugin."
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 msgid "Never edited"
 msgstr "Nunca corregido"
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr "%s en %s"
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, php-format
-msgid "Version %s, saved %s"
-msgstr "versión %s, %s ahorrado"
+msgid "Version %s, saved on %s"
+msgstr "versión %s de %s"
 
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, php-format
 msgid "Last edited %s"
 msgstr "Editada por última vez %s."
 
 #: ../lib/WikiTheme.php:473
 #, php-format
-msgid "Version %s, saved on %s"
-msgstr "versión %s de %s"
-
-#: ../lib/WikiTheme.php:475
-#, php-format
 msgid "Last edited on %s"
 msgstr "Editada por última vez %s."
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr "hoy"
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr "ayer"
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, php-format
 msgid "Owner: %s"
 msgstr "Dueño: %s"
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Acoplamiento vacío a: %s"
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
 msgstr "Cree: %s"
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "'%s': Mal nombre de la página"
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -7088,71 +7125,72 @@
 msgid "Sign Out"
 msgstr "Registro Hacia fuera"
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Muestra Adentro"
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 #, fuzzy
 msgid "Rename Page"
 msgstr "Borrar Página"
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Bloquear Página"
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Desbloquear Página"
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr "Impresora"
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr "Toolbars superiores y inferiores"
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr "Moderno"
 
 # lib/msql.php:237 lib/msql.php:312
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s: indefinido"
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr "Acoplamientos Relacionados"
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr "Acoplamientos Externos"
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7232,40 +7270,40 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr "Username inválido ' %s' para LDAP Auth"
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 msgid "Invalid password."
 msgstr "Contraseña inválido."
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr "Contraseña o userid inválida."
 
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr "Permisos escasos."
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 "Preferencias o formato vacías de la galleta de UsuarioPreferencias no "
 "reconocido."
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr "Las preferencias del defecto serán utilizadas."
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 "La longitud de la contraseña es más corta que la política del sistema "
 "permite."
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7276,11 +7314,11 @@
 " Usted tiene que pedir que el administrador de sistema reajuste su "
 "contraseña."
 
-#: ../lib/WikiUserNew.php:1338
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr "La función de la cripta no está disponible en esta versión de PHP."
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -7288,11 +7326,11 @@
 "En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y "
 "probablemente cambio ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini."
 
-#: ../lib/WikiUserNew.php:1781
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7305,14 +7343,14 @@
 "para enviar notificaciones del cambio de la página.\n"
 "Vea %s"
 
-#: ../lib/WikiUserNew.php:1841
-#, php-format
-msgid "E-Mail address '%s' is not properly formatted"
+#: ../lib/WikiUserNew.php:1843
+#, fuzzy, php-format
+msgid "E-mail address '%s' is not properly formatted"
 msgstr "La dirección ' %s' del email no se ajusta a formato correctamente"
 
-#: ../lib/WikiUserNew.php:1845
-#, php-format
-msgid "E-Mail address '%s' is properly formatted"
+#: ../lib/WikiUserNew.php:1847
+#, fuzzy, php-format
+msgid "E-mail address '%s' is properly formatted"
 msgstr "La dirección ' %s' del email se ajusta a formato correctamente"
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
@@ -7498,10 +7536,10 @@
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7509,7 +7547,7 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
 msgstr "Vea la fuente"
@@ -7539,9 +7577,8 @@
 #: ../themes/Portland/templates/editpage.tmpl:83
 #: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/Wordpress/templates/editpage.tmpl:96
-#, fuzzy
 msgid "Help/GoodStyle"
-msgstr "BuenEstilo"
+msgstr "Ayuda/BuenEstilo"
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7564,9 +7601,8 @@
 #: ../themes/fusionforge/templates/editpage.tmpl:79
 #: ../themes/Portland/templates/editpage.tmpl:84
 #: ../themes/Wordpress/templates/editpage.tmpl:97
-#, fuzzy
 msgid "Help/TextFormattingRules"
-msgstr "ReglasDeFormatoDeTexto"
+msgstr "Ayuda/ReglasDeFormatoDeTexto"
 
 #: ../themes/blog/templates/blogform.tmpl:25
 #: ../themes/Crao/templates/editpage.tmpl:94
@@ -7589,12 +7625,11 @@
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7605,12 +7640,11 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
@@ -7620,10 +7654,8 @@
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7634,7 +7666,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7686,6 +7718,8 @@
 # lib/pageinfo.php:70
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
 #, fuzzy
@@ -7705,36 +7739,36 @@
 msgid "Comments on %s by %s."
 msgstr "Comentarios sobre %s por %s."
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 msgid "SignOut"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 msgid "SignIn"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr "Bloqueada"
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 msgid "blog"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr ""
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -7846,21 +7880,28 @@
 #: ../themes/default/templates/editpage.tmpl:118
 #: ../themes/Portland/templates/editpage.tmpl:79
 #: ../themes/Wordpress/templates/editpage.tmpl:92
-#, fuzzy
 msgid "Help/OldTextFormattingRules"
-msgstr "ViejoReglasDeFormatoDeTexto"
+msgstr "Ayuda/ViejoReglasDeFormatoDeTexto"
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr ""
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr ""
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7911,9 +7952,9 @@
 msgstr "%s por %s"
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ""
@@ -8027,11 +8068,24 @@
 msgid "Hits:"
 msgstr "Número de hits:"
 
+#: ../themes/default/templates/info.tmpl:133
+#, fuzzy
+msgid "Is External:"
+msgstr "Acoplamientos Externos"
+
 #: ../themes/default/templates/info.tmpl:134
 #, fuzzy
 msgid "No"
 msgstr "Ninguna"
 
+#: ../themes/default/templates/info.tmpl:138
+msgid "ACL type:"
+msgstr ""
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
@@ -8177,44 +8231,17 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Previsualizar"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-#, fuzzy
-msgid "Next >>"
-msgstr "Siguiente"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ""
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr ""
@@ -8265,34 +8292,34 @@
 
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
 #, fuzzy, php-format
 msgid "User preferences for user %s"
 msgstr "Preferencias por usuario '%s':"
@@ -8366,43 +8393,43 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr ""
 
@@ -8412,7 +8439,7 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, php-format
 msgid "Hide %s:"
 msgstr ""
@@ -8424,13 +8451,13 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, php-format
 msgid "Add %s:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
@@ -8449,23 +8476,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr "Altura"
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr "Anchura"
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8473,45 +8500,45 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr "Zona Horaria"
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 #, fuzzy
 msgid "Reset Preferences"
 msgstr "UsuarioPreferencias"
@@ -8530,25 +8557,19 @@
 msgid "Posted: %s"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
-msgid "/Discussion"
-msgstr "Discusión"
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
-#, fuzzy
 msgid "Action Page"
 msgstr "BuscarPágina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
 msgid "Page"
 msgstr "PáginaPrincipal"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
 #, fuzzy
 msgid "Template/Talk"
@@ -8561,54 +8582,58 @@
 msgid "Create Page"
 msgstr "CreeLaPágina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
 msgid "History"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr ""
 
 # lib/pageinfo.php:26 lib/pageinfo.php:75
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 #, fuzzy
 msgid "Page Info"
 msgstr "InformacionDeLaPagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 #, fuzzy
 msgid "Back Links"
 msgstr "AcoplamientosTraseros"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 #, fuzzy
 msgid "Change Owner"
 msgstr "Change Contraseña"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 #, fuzzy
 msgid "Access Rights"
 msgstr "Acceso"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 msgid "Purge"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-#, fuzzy
-msgid "Watch Page"
-msgstr "Anchura"
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr "ReglasDeFormatoDeTexto"
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr ""
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+#, fuzzy
+msgid "This revision of the page does not exist."
+msgstr "Apesadumbrada, esta página no está en la base de datos."
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
 msgstr ""
@@ -8617,62 +8642,116 @@
 msgid "Make the page external?"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #, fuzzy
+msgid "Home Page"
+msgstr "PáginaPrincipal"
+
+# lib/stdlib.php:384 lib/stdlib.php:445
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+#, fuzzy
+msgid "Recent Changes"
+msgstr "CambiosRecientes"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+#, fuzzy
 msgid "SpecialPages"
 msgstr "para las páginas del cuento por entregas de la descarga"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+#, fuzzy
+msgid "Special Pages"
+msgstr "para las páginas del cuento por entregas de la descarga"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+#, fuzzy
+msgid "Random Page"
+msgstr "PáginaAlAzar"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
 msgid "Like Pages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #, fuzzy
+msgid "Wiki Admin"
+msgstr "AdministraciónDePhpWiki"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+#, fuzzy
+msgid "My User Page"
+msgstr "Retitule"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+#, fuzzy
+msgid "User Preferences"
+msgstr "UsuarioPreferencias"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Preferencias por usuario '%s':"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
+#, fuzzy
 msgid "E-mail Notification"
 msgstr "Verificación Del Email"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "Preferencias por usuario '%s':"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-#, fuzzy
-msgid "Random Page"
-msgstr "PáginaAlAzar"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 msgid "Check menu items to display."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 #, fuzzy
 msgid "Show Page Trail"
 msgstr "Nombre de la Página"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:73
 #, fuzzy
 msgid "This page is external."
 msgstr "Página desbloquear."
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -8924,6 +9003,24 @@
 msgid "Edit old revision"
 msgstr "Corrija versión archivada"
 
+#, fuzzy
+#~ msgid "E-mail address '%s' appears to be valid."
+#~ msgstr "La dirección ' %s' del email se ajusta a formato correctamente"
+
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Siguiente"
+
+#~ msgid "Version %s, saved %s"
+#~ msgstr "versión %s, %s ahorrado"
+
+#~ msgid "%s b"
+#~ msgstr "%s o"
+
+#, fuzzy
+#~ msgid "/Discussion"
+#~ msgstr "Discusión"
+
 #~ msgid "Insert Categories (double-click)"
 #~ msgstr "Relleno Categorías (doble-tecleo)"
 
@@ -8955,10 +9052,6 @@
 #~ msgid "The PhpWiki programming team"
 #~ msgstr "El equipo de programación de PhpWiki"
 
-#, fuzzy
-#~ msgid "%s: "
-#~ msgstr "%s: %s"
-
 #~ msgid "User preferences for user '%s':"
 #~ msgstr "Preferencias por usuario '%s':"
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/fr.po
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/fr.po	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/fr.po	2011-05-18 19:36:20 UTC (rev 13355)
@@ -4,16 +4,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.11\n"
+"Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <meignen.pierrick at wanadoo.fr>, Roland "
 "Trique <roland.trique at free.fr>, Stéphane Gourichon <stephane.gourichon at lip6."
 "fr>, Pascal <pascal at phpfrance.com>, Benoit Masson\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Date: 2001-09-22 00:00-0000\n"
 "From: Pierrick Meignen <meignen.pierrick at wanadoo.fr>\n"
@@ -30,16 +31,16 @@
 #: ../lib/CachedMarkup.php:569
 #, php-format
 msgid "Attribute %s, value: %s"
-msgstr ""
+msgstr "Attribut %s, valeur : %s"
 
 #: ../lib/CachedMarkup.php:577
-#, fuzzy, php-format
+#, php-format
 msgid "Relation %s to page %s"
-msgstr "Version %s, enregistrée %s"
+msgstr "Relation %s vers la page %s"
 
 #: ../lib/CachedMarkup.php:632
 msgid "Found by "
-msgstr ""
+msgstr "Trouvé par "
 
 #: ../lib/Captcha.php:32
 msgid "Typed in verification word mismatch ... are you a bot?"
@@ -49,12 +50,12 @@
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr "Le gestionnaire DBA %s n'est pas supporté !"
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr "Les gestionnaires supportés sont : %s"
@@ -69,24 +70,21 @@
 msgid "Set USE_DB_SESSION to false."
 msgstr "Mettre USE_DB_SESSION à false."
 
-# lib/diff.php:1001 lib/diff.php:1019
 #: ../lib/diff.php:200 ../lib/plugin/Diff.php:66
 #, php-format
 msgid "version %s"
 msgstr "version %s"
 
-# lib/diff.php:1006 lib/diff.php:1024
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr "par %s"
 
-# lib/diff.php:1010 lib/diff.php:1028
 #: ../lib/diff.php:207 ../lib/plugin/Diff.php:71
 #: ../lib/wikilens/PageListColumns.php:357
 msgid "None"
-msgstr "Aucune"
+msgstr "Aucun(e)"
 
 #: ../lib/diff.php:230 ../lib/plugin/Diff.php:94
 #: ../lib/plugin/PageHistory.php:329 ../lib/plugin/PageInfo.php:54
@@ -94,31 +92,28 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr "Désolé, %s ne correspond à aucune page."
 
-# lib/diff.php:1045
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr "Diff : %s"
 
-# lib/diff.php:1001 lib/diff.php:1019
 #: ../lib/diff.php:240 ../lib/diff.php:250 ../lib/plugin/Diff.php:102
 #: ../lib/plugin/Diff.php:112
 #, php-format
 msgid "version %d"
 msgstr "version %d"
 
-# lib/pageinfo.php:64
 #: ../lib/diff.php:244 ../lib/plugin/Diff.php:106
 msgid "current version"
 msgstr "version actuelle"
 
 #: ../lib/diff.php:261 ../lib/plugin/Diff.php:123
 msgid "revision by previous author"
-msgstr "révision par auteur précédent"
+msgstr "version par l'auteur précédent"
 
 #: ../lib/diff.php:267 ../lib/plugin/Diff.php:129
 msgid "previous revision"
-msgstr "révision précédente"
+msgstr "version précédente"
 
 #: ../lib/diff.php:277 ../lib/plugin/Diff.php:139
 msgid "predecessor to the previous major change"
@@ -135,105 +130,83 @@
 
 #: ../lib/diff.php:292 ../lib/plugin/Diff.php:153
 msgid "Previous Major Revision"
-msgstr "Précédente Révision Principale"
+msgstr "Version majeure précédente"
 
 #: ../lib/diff.php:293 ../lib/plugin/Diff.php:154
 msgid "Previous Revision"
-msgstr "Révision Précédente"
+msgstr "Version précédente"
 
 #: ../lib/diff.php:294 ../lib/plugin/Diff.php:155
 msgid "Previous Author"
-msgstr "Auteur Précédent"
+msgstr "Auteur précédent"
 
 #: ../lib/diff.php:310 ../lib/plugin/Diff.php:172
 msgid "Newer page:"
-msgstr "Page récente :"
+msgstr "Page plus récente :"
 
 #: ../lib/diff.php:312 ../lib/plugin/Diff.php:174
 msgid "Older page:"
-msgstr "Ancienne page :"
+msgstr "Page plus ancienne :"
 
-# lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "revenir à la version %d"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr " et "
-
-# lib/diff.php:1037
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " is identical."
-msgstr " est identique."
-
-# lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-msgid "Version "
-msgstr "Version"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr " a été créé car : "
-
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr "%s : %s"
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr "LiensDatabase"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr "DernièresModifs"
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -242,40 +215,40 @@
 #: ../lib/display.php:261 ../lib/display.php:268
 #, php-format
 msgid "BackLinks for %s"
-msgstr "RétroLiens pour %s"
+msgstr "Page liées à %s"
 
 #: ../lib/display.php:276
 #, php-format
 msgid "(Redirected from %s)"
 msgstr "(Redirigé de %s)"
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
 msgstr "BacÀSable"
 
-# lib/pageinfo.php:64
 #: ../lib/editpage.php:163 ../lib/editpage.php:584
 msgid "Your version"
 msgstr "Votre version"
 
-# lib/pageinfo.php:70
 #: ../lib/editpage.php:163 ../lib/editpage.php:585
 msgid "Other version"
 msgstr "L'autre version"
 
 #: ../lib/editpage.php:174
 msgid "Some internal editing error"
-msgstr ""
+msgstr "Erreur interne pendant la modification"
 
 #: ../lib/editpage.php:175
 msgid ""
 "Your are probably trying to edit/create an invalid version of this page."
-msgstr "Vous lisez une ancienne révision de cette page."
+msgstr ""
+"Vous essayez probablement de modifier ou de créer une version invalide de "
+"cette page."
 
 #: ../lib/editpage.php:176
 msgid "&version=-1 might help."
@@ -289,7 +262,7 @@
 #: ../lib/editpage.php:233
 #, php-format
 msgid "View Source: %s"
-msgstr "Afficher la source : %s"
+msgstr "Source de : %s"
 
 #: ../lib/editpage.php:251
 msgid "Page now locked."
@@ -305,7 +278,7 @@
 
 #: ../lib/editpage.php:260
 msgid "Page now not-public."
-msgstr "La page n'est maintenant plus publique."
+msgstr "La page est maintenant privée."
 
 #: ../lib/editpage.php:269
 msgid "Page now external."
@@ -313,7 +286,7 @@
 
 #: ../lib/editpage.php:270
 msgid "Page now not-external."
-msgstr "La page n'est maintenant plus externe."
+msgstr "La page est maintenant interne."
 
 #: ../lib/editpage.php:379
 #, php-format
@@ -322,7 +295,7 @@
 
 #: ../lib/editpage.php:433
 msgid "Too many external links."
-msgstr "Trop de liens extérieurs."
+msgstr "Trop de liens externes."
 
 #: ../lib/editpage.php:446
 msgid "SpamAssassin reports: "
@@ -333,9 +306,9 @@
 msgstr ""
 
 #: ../lib/editpage.php:474
-#, fuzzy, php-format
+#, php-format
 msgid "%s is listed at %s with %s"
-msgstr "%s pages pointent vers %s :"
+msgstr ""
 
 #: ../lib/editpage.php:498
 msgid "Spam Prevention"
@@ -344,40 +317,38 @@
 #: ../lib/editpage.php:499
 msgid "This page edit seems to contain spam and was therefore not saved."
 msgstr ""
+"Cette modification de la page semble contenir du spam et n'a donc pas été "
+"enregistrée"
 
-# lib/editpage.php:33 lib/savepage.php:32 lib/savepage.php:53
 #: ../lib/editpage.php:501 ../lib/editpage.php:560
 msgid "Sorry for the inconvenience."
-msgstr "Désolé pour la gène occasionnée."
+msgstr "Désolé pour la gêne occasionnée."
 
-# lib/diff.php:1037
 #: ../lib/editpage.php:526
 msgid "Versions are identical"
 msgstr "Les versions sont identiques"
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr "Page verrouillée"
 
-# lib/editpage.php:31 lib/savepage.php:52
 #: ../lib/editpage.php:558
 msgid ""
 "This page has been locked by the administrator so your changes can not be "
 "saved."
 msgstr ""
 "Cette page a été verrouillée par l'administrateur et vos changements n'ont "
-"pas pu être enregistrée."
+"pas pu être enregistrés."
 
-# lib/savepage.php:24
 #: ../lib/editpage.php:559
 msgid ""
 "(Copy your changes to the clipboard. You can try editing a different page or "
 "save your text in a text editor.)"
 msgstr ""
-"(Copiez vos modifications dans le presse-papier. Vous pouvez essayer "
-"d'éditer une page différente ou sauver votre texte dans un éditeur)."
+"(Copiez vos modifications dans le presse-papier. Vous pouvez essayer de "
+"modifier une page différente ou enregistrer votre texte à l'aide d'un "
+"éditeur)."
 
-# lib/display.php:14
 #: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:800
 #: ../lib/main.php:1167 ../lib/plugin/ModeratedPage.php:42
 #: ../lib/plugin/ModeratedPage.php:146 ../lib/plugin/ModeratedPage.php:216
@@ -398,19 +369,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr "PréférencesUtilisateurs"
@@ -430,24 +401,25 @@
 "those sections by hand before you click Save."
 msgstr ""
 "Certaines modifications n'ont pas pu être combinées automatiquement. "
-"Veuillez regarder les sections commençant par '%s', et se terminant par '%"
-"s'. Vous devrez éditer ces sections à la main avant cliquer sur Enregistrer."
+"Veuillez regarder les sections commençant par « %s », et se terminant par « "
+"%s ». Vous devrez éditer ces sections à la main avant de cliquer sur "
+"Enregistrer."
 
 #: ../lib/editpage.php:587 ../lib/editpage.php:948
 msgid "Please check it through before saving."
-msgstr "Veuillez la vérifier avant de la sauver."
+msgstr "Veuillez la vérifier avant de l'enregistrer."
 
 #: ../lib/editpage.php:598
 msgid "Conflicting Edits!"
-msgstr "Conflit d'éditions !"
+msgstr "Modifications conflictuelles !"
 
 #: ../lib/editpage.php:599
 msgid ""
 "In the time since you started editing this page, another user has saved a "
 "new version of it."
 msgstr ""
-"Depuis que vous avez commencé à éditer cette page, un autre utilisateur en a "
-"enregistré une nouvelle version."
+"Depuis que vous avez commencé à modifier cette page, un autre utilisateur en "
+"a enregistré une nouvelle version."
 
 #: ../lib/editpage.php:600
 msgid ""
@@ -461,7 +433,7 @@
 
 #: ../lib/editpage.php:669 ../lib/plugin/HtmlConverter.php:66
 msgid "Convert"
-msgstr "Converti"
+msgstr "Convertir"
 
 #: ../lib/editpage.php:698 ../lib/EditToolbar.php:211
 #: ../lib/EditToolbar.php:213 ../lib/WysiwygEdit/Wikiwyg.php:79
@@ -473,20 +445,18 @@
 msgid "Save"
 msgstr "Enregistrer"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/editpage.php:709
-#, fuzzy
 msgid "Changes"
-msgstr "DernièresModifs"
+msgstr "Modifications"
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
-msgstr "Déposer"
+msgstr "Téléchargé"
 
 #: ../lib/editpage.php:716
 msgid "Spell Check"
-msgstr ""
+msgstr "Vérifier l'orthographe"
 
 #: ../lib/editpage.php:739 ../themes/Portland/templates/editpage.tmpl:39
 #: ../themes/Wordpress/templates/editpage.tmpl:53
@@ -496,16 +466,16 @@
 
 #: ../lib/editpage.php:900
 msgid "Keep old"
-msgstr ""
+msgstr "Garder l'ancien"
 
 #: ../lib/editpage.php:903
 msgid "Overwrite with new"
-msgstr ""
+msgstr "Écraser avec le nouveau"
 
 #: ../lib/editpage.php:913
 #, php-format
 msgid "Merge and Edit: %s"
-msgstr "Fusioner et éditer : %s"
+msgstr "Fusionner et modifier : %s"
 
 #: ../lib/EditToolbar.php:48
 msgid "Undo"
@@ -517,7 +487,7 @@
 
 #: ../lib/EditToolbar.php:51
 msgid "Operation undone"
-msgstr ""
+msgstr "Opération annulée"
 
 #: ../lib/EditToolbar.php:52
 msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
@@ -526,24 +496,23 @@
 #: ../lib/EditToolbar.php:53
 #, php-format
 msgid "String \"%s\" not found."
-msgstr "\"%s\" non trouvée."
+msgstr "Chaîne \"%s\" non trouvée."
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
-msgstr "Recherche & Remplace"
+msgstr "Rechercher & Remplacer"
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/EditToolbar.php:55
 msgid "Search for"
-msgstr "Chercher"
+msgstr "Rechercher"
 
 #: ../lib/EditToolbar.php:56
 msgid "Replace with"
 msgstr "Remplacer par"
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -554,35 +523,35 @@
 msgid "OK"
 msgstr "OK"
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr "Fermer"
 
 #: ../lib/EditToolbar.php:126
 msgid "Bold text"
-msgstr "Texte en gras"
+msgstr "Gras"
 
 #: ../lib/EditToolbar.php:127
 msgid "Bold text [alt-b]"
-msgstr "Texte en gras"
+msgstr "Gras [alt-b]"
 
 #: ../lib/EditToolbar.php:131
 msgid "Italic text"
-msgstr "Texte en italique"
+msgstr "Italique"
 
 #: ../lib/EditToolbar.php:132
 msgid "Italic text [alt-i]"
-msgstr "Texte en italique"
+msgstr "Italique [alt-i]"
 
 #: ../lib/EditToolbar.php:136
 msgid "Strike-through text"
-msgstr "Texte rayé"
+msgstr "Biffé"
 
 #: ../lib/EditToolbar.php:137
 msgid "Strike"
-msgstr "Rayer"
+msgstr "Biffé"
 
 #: ../lib/EditToolbar.php:141
 msgid "Color text"
@@ -594,19 +563,19 @@
 
 #: ../lib/EditToolbar.php:146
 msgid "PageName|optional label"
-msgstr ""
+msgstr "Page|label optionnel"
 
 #: ../lib/EditToolbar.php:147
 msgid "Link to page"
-msgstr "Lien vers la page"
+msgstr "Lien vers une page"
 
 #: ../lib/EditToolbar.php:151
 msgid "http://www.example.com|optional label"
-msgstr ""
+msgstr "http://www.example.com|label facultatif"
 
 #: ../lib/EditToolbar.php:152
 msgid "External link (remember http:// prefix)"
-msgstr "Lien externe (http:// prefix)"
+msgstr "Lien externe (le préfixe http:// est obligatoire)"
 
 #: ../lib/EditToolbar.php:156
 msgid "Headline text"
@@ -618,13 +587,12 @@
 
 #: ../lib/EditToolbar.php:161
 msgid "Insert non-formatted text here"
-msgstr "Insérer du texte non-formaté ici"
+msgstr "Insérer le texte préformaté ici"
 
 #: ../lib/EditToolbar.php:162
 msgid "Ignore wiki formatting"
-msgstr "Ignorer le formatage wiki"
+msgstr "Ignorer la syntaxe wiki"
 
-# lib/pageinfo.php:64
 #: ../lib/EditToolbar.php:167
 msgid "Your signature"
 msgstr "Votre signature"
@@ -645,8 +613,8 @@
 msgid "List"
 msgstr "Liste"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 msgid "Table of Contents"
 msgstr "Table des matières"
 
@@ -655,132 +623,140 @@
 msgid "Page Name"
 msgstr "Nom de la page"
 
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr "Redirection"
 
 #: ../lib/EditToolbar.php:201
 msgid "Template Name"
-msgstr "nom du modèle"
+msgstr "Nom du modèle"
 
 #: ../lib/EditToolbar.php:202 ../lib/plugin/PopularTags.php:57
 #: ../lib/plugin/Template.php:61
 msgid "Template"
 msgstr "Modèle"
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr "Cliquer sur un bouton pour obtenir une exemple de texte"
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 msgid "Undo Search & Replace"
-msgstr "Annuler Rechercher & Remplacer"
+msgstr "Annuler « Rechercher & Remplacer »"
 
-# lib/diff.php:997
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 msgid "AddCategory"
-msgstr "AjoutezCatégorie"
+msgstr "Ajouter une catégorie"
 
-#: ../lib/EditToolbar.php:321
-#, fuzzy
+#: ../lib/EditToolbar.php:320
 msgid "Insert Categories"
-msgstr "Catégories populaires"
+msgstr "Ajouter une catégorie"
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr "Insérer"
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 msgid "AddPlugin"
-msgstr "AjoutezPlugin"
+msgstr "Insérer un greffon"
 
-#: ../lib/EditToolbar.php:371
-#, fuzzy
+#: ../lib/EditToolbar.php:370
 msgid "Insert Plugin"
-msgstr "utiliser ce plugin"
+msgstr "Insérer un greffon"
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 msgid "AddPageLink"
-msgstr "AjouterDesPagesLien"
+msgstr "Insérer un lien"
 
-#: ../lib/EditToolbar.php:401
-#, fuzzy
+#: ../lib/EditToolbar.php:400
 msgid "Insert PageLink"
-msgstr "AjouterDesPagesLien"
+msgstr "Insérer un lien"
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
-#, fuzzy
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 msgid "Add Image or Video"
-msgstr "Ajouter l'image"
+msgstr "Ajouter une image ou une vidéo"
 
-#: ../lib/EditToolbar.php:439
-#, fuzzy
+#: ../lib/EditToolbar.php:438
 msgid "Insert Image or Video"
-msgstr "Ajouter l'image"
+msgstr "Ajouter une image ou une vidéo"
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
-msgstr ""
+msgstr "Ajouter un modèle"
 
-#: ../lib/EditToolbar.php:474
-#, fuzzy
+#: ../lib/EditToolbar.php:473
 msgid "Insert Template"
-msgstr "Modèle"
+msgstr "Ajouter un modèle"
 
 #: ../lib/ErrorManager.php:220
 #, php-format
 msgid "%s: error while handling error:"
 msgstr "%s : erreur pendant la gestion de l'erreur :"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "%s : fichier non trouvé"
 
-# lib/diff.php:997
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr "CatégorieGroupes"
 
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sans titre"
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr "PageAccueil"
 
 #: ../lib/InlineParser.php:344
 msgid "Invalid [] syntax ignored"
-msgstr "[] non valables, ignoré"
+msgstr "Syntaxe [] invalide ignorée"
 
-#: ../lib/InlineParser.php:889
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+msgid ": "
+msgstr " : "
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
-msgstr "%s color non valable ignoré"
+msgstr "couleur %s non valable ignorée"
 
 #: ../lib/loadsave.php:73
 msgid "ZIP files of database"
-msgstr ""
+msgstr "Récupérer dans un fichier ZIP"
 
 #: ../lib/loadsave.php:74
 msgid "Dump to directory"
 msgstr "Récupération dans le répertoire"
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 msgid "Upload File"
 msgstr "Déposer un fichier"
 
 #: ../lib/loadsave.php:76 ../lib/plugin/WikiForm.php:68
 msgid "Load File"
-msgstr "Charger le fichier"
+msgstr "Importer un fichier"
 
 #: ../lib/loadsave.php:77
 msgid "Upgrade"
@@ -788,53 +764,52 @@
 
 #: ../lib/loadsave.php:79
 msgid "Dump pages as XHTML"
-msgstr "Sauvegarde des pages au format XHTML"
+msgstr "Exporter les pages en XHTML"
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
 msgstr "AdministrationDePhpWiki"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
-msgstr "Édité par : %s"
+msgstr "Modifié par : %s"
 
 #: ../lib/loadsave.php:98 ../lib/loadsave.php:99
-#, fuzzy
 msgid "LoadDump"
 msgstr "RécupérationDeLaPage"
 
 #: ../lib/loadsave.php:102
 #, php-format
 msgid "PageChange Notification of %s sent to %s"
-msgstr "Les notifications de changement de la page %s ont été envoyés à %s"
+msgstr "La notification de changement de la page %s a été envoyée à %s"
 
 #: ../lib/loadsave.php:105
 #, php-format
 msgid "PageChange Notification Error: Couldn't send %s to %s"
 msgstr ""
-"Erreur lors des notifications de changements de page: Impossible d'envoyer %"
-"s à %s"
+"Erreur lors de la notification de changement de page : impossible d'envoyer "
+"%s à %s"
 
 #: ../lib/loadsave.php:113
 msgid "Complete."
@@ -843,91 +818,88 @@
 #: ../lib/loadsave.php:114
 #, php-format
 msgid "Return to %s"
-msgstr "Retour à la %s"
+msgstr "Retourner à %s"
 
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr "SauvegardeTotale"
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr "DernierInstantané"
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde"
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
-msgstr "Impossible de créer le répertoire '%s'"
+msgstr "Impossible de créer le répertoire : « %s »"
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
-msgstr "Répertoire '%s' créé pour la sauvegarde..."
+msgstr "Répertoire « %s » créé pour la sauvegarde..."
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
-msgstr "Utilisation du répertoire '%s'"
+msgstr "Utilisation du répertoire « %s »"
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr "Récupération des pages"
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr "Ignoré."
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr "enregistrée sous %s"
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "Impossible d'ouvrir le fichier '%s' en écriture"
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr "%s octets enregistrés"
 
-# lib/editpage.php:19
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr "... copié à %s"
 
-# lib/editpage.php:19
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, php-format
 msgid "... not copied to %s"
 msgstr "... non copié à %s"
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 msgid "saved as "
-msgstr "enregistrée sous "
+msgstr "enregistré sous "
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr "... non trouvé"
 
-# lib/pageinfo.php:9
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
-msgstr "La page n'a aucun titre !"
+msgstr "Nom de page vide !"
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 msgid "Invalid pagename!"
-msgstr "Nom de page invalide."
+msgstr "Nom de page invalide !"
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -936,228 +908,227 @@
 msgid "InterWikiMap"
 msgstr "CarteInterWiki"
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "du %s"
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nouvelle page"
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
-msgstr "conflits d'édition - écraser quand même "
+msgstr "conflits de modification - écraser quand même "
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
-msgstr ""
+msgstr "garder l'ancien"
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
-msgstr "a des conflits d'édition - ignoré"
+msgstr "a des conflits de modification - ignoré"
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
-msgstr "contenu est identique à la version en cours %d - pas de révision"
+msgstr ""
+"le contenu est identique à la version en cours %d - pas de nouvelle version"
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
-msgstr "- sauvée dans la base de données sous la version %d"
+msgstr "- enregistrée dans la base de données sous la version %d"
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "fichier MIME %s"
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr "Fichier sérialisé %s"
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
-msgstr "fichier simple %s"
+msgstr "fichier brut %s"
 
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
-msgstr "Fusionner l'édition"
+msgstr "Fusionner les modifications"
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr "Restaurer quand même"
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
-msgstr ""
+msgstr "Tout écraser"
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr " Désolé, impossible de fusionner."
 
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
 #: ../themes/Wordpress/templates/actionbar.tmpl:60
 msgid "Revert"
-msgstr "Réinitialiser"
+msgstr "Révoquer"
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
-msgstr "argument de version requis manquant"
+msgstr "argument de version obligatoire manquant"
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 msgid "no page content"
-msgstr "pas de sommaire de page"
+msgstr "pas de contenu dans la page"
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 msgid "same version page"
-msgstr "même version de page"
+msgstr "même version de la page"
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr "Oui"
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr "Annuler"
 
-# lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr "revenir à la version %d"
 
-#: ../lib/loadsave.php:1129
-#, fuzzy, php-format
+#: ../lib/loadsave.php:1134
+#, php-format
 msgid "Revert: %s"
-msgstr "Réinitialiser"
+msgstr "Révoquer : %s"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d sauvée dans la base de données sous la version %d"
 
-#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s : non défini"
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr "Carte InterWiki par défaut non chargée."
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
-msgstr "Chargement de la CarteInterWiki depuis le fichiers %s."
+msgstr "Chargement de la CarteInterWiki depuis le fichier %s."
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr "Ignoré"
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Mauvais type de fichier : %s"
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
-msgstr "Chargement ' %s '"
+msgstr "Chargement de « %s »"
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
-msgstr "Chargement d'un wiki vierge"
+msgstr "Chargement du nouveau wiki"
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr "Pas de fichier à déposer ?"
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
-msgstr "Dépôt de %s"
+msgstr "Téléchargement de %s"
 
 #: ../lib/MailNotify.php:194
-#, fuzzy, php-format
+#, php-format
 msgid "PageChange Notification of %s"
-msgstr "Les notifications de changement de la page %s ont été envoyés à %s"
+msgstr "Notification de changement de la page %s"
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, php-format
 msgid "sent to %s"
 msgstr "envoyé à %s"
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Erreur : impossible d'envoyer %s à %s"
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
-msgstr "Modification de page"
+msgstr "Modification de la page"
 
-#: ../lib/MailNotify.php:288
-#, fuzzy, php-format
+#: ../lib/MailNotify.php:289
+#, php-format
 msgid "Summary: %s"
-msgstr "Résumé :"
+msgstr "Résumé : %s"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
-msgstr "retitrez la page de '%s' à '%s'"
+msgstr "Page renommée de %s à %s"
 
-#: ../lib/MailNotify.php:342
-#, fuzzy, php-format
+#: ../lib/MailNotify.php:343
+#, php-format
 msgid "User %s removed page %s"
-msgstr "Page enlevée %s"
+msgstr "L'utilisateur %s a supprimé la page %s"
 
-#: ../lib/MailNotify.php:378
-#, fuzzy
+#: ../lib/MailNotify.php:379
 msgid "E-Mail address confirmation"
 msgstr "Vérification de l'adresse électronique"
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1172,9 +1143,9 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 msgid "Optimizing database"
-msgstr "Optimisation de database"
+msgstr "Optimisation de la base de données"
 
 #: ../lib/main.php:473
 msgid "FORBIDDEN"
@@ -1221,7 +1192,8 @@
 #, 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)."
+"%s %s %s est interdite sur ce wiki pour %s l'utilisateur « %s » (niveau : "
+"%s)."
 
 #: ../lib/main.php:533
 #, php-format
@@ -1248,7 +1220,7 @@
 
 #: ../lib/main.php:561
 msgid "dump html pages"
-msgstr "récupération des pages HTML"
+msgstr "récupération des pages en HTML"
 
 #: ../lib/main.php:562
 msgid "dump serial pages"
@@ -1256,7 +1228,7 @@
 
 #: ../lib/main.php:563
 msgid "edit this page"
-msgstr "éditer cette page"
+msgstr "modifier cette page"
 
 #: ../lib/main.php:564
 msgid "rename this page"
@@ -1264,7 +1236,7 @@
 
 #: ../lib/main.php:565
 msgid "revert to a previous version of this page"
-msgstr "revenir à une précédente version de cette page."
+msgstr "revenir à une version précédente de la page"
 
 #: ../lib/main.php:566
 msgid "create this page"
@@ -1272,7 +1244,7 @@
 
 #: ../lib/main.php:567
 msgid "load files into this wiki"
-msgstr "chargement des fichiers sur ce wiki"
+msgstr "importer des fichiers dans ce wiki"
 
 #: ../lib/main.php:568
 msgid "lock this page"
@@ -1288,7 +1260,7 @@
 
 #: ../lib/main.php:571
 msgid "unlock this page"
-msgstr "déverrouiller la page"
+msgstr "déverrouiller cette page"
 
 #: ../lib/main.php:572
 msgid "upload a zip dump"
@@ -1313,16 +1285,15 @@
 
 #: ../lib/main.php:577
 msgid "download a zip dump from this wiki"
-msgstr "télécharger une sauvegarde compressée de ce wiki"
+msgstr "télécharger une sauvegarde ZIP de ce wiki"
 
 #: ../lib/main.php:578
 msgid "download a html zip dump from this wiki"
-msgstr "télécharger une sauvegarde HTML compressée de ce wiki"
+msgstr "télécharger une sauvegarde HTML ZIP de ce wiki"
 
 #: ../lib/main.php:584
-#, fuzzy
 msgid "use"
-msgstr "utilisateurs"
+msgstr ""
 
 #: ../lib/main.php:602
 msgid "Browsing pages"
@@ -1342,7 +1313,7 @@
 
 #: ../lib/main.php:606
 msgid "Editing pages"
-msgstr "Éditions des pages"
+msgstr "Modifier des pages"
 
 #: ../lib/main.php:607
 msgid "Reverting to a previous version of pages"
@@ -1350,7 +1321,7 @@
 
 #: ../lib/main.php:608
 msgid "Creating pages"
-msgstr "Création des pages"
+msgstr "Créer des pages"
 
 #: ../lib/main.php:609
 msgid "Loading files"
@@ -1358,25 +1329,24 @@
 
 #: ../lib/main.php:610
 msgid "Locking pages"
-msgstr "Verrouillage des pages"
+msgstr "Verrouiller des pages"
 
 #: ../lib/main.php:611
 msgid "Purging pages"
-msgstr "Purge des pages"
+msgstr "Purger des pages"
 
 #: ../lib/main.php:612
 msgid "Removing pages"
-msgstr "Suppression des pages"
+msgstr "Supprimer les pages"
 
 #: ../lib/main.php:613
 msgid "Unlocking pages"
-msgstr "Déverrouillage des pages"
+msgstr "Déverrouiller des pages"
 
 #: ../lib/main.php:614
 msgid "Uploading zip dumps"
 msgstr "Déposer la sauvegarde compressée"
 
-# lib/pageinfo.php:64
 #: ../lib/main.php:615
 msgid "Verify the current action"
 msgstr "Vérifier l'action actuelle"
@@ -1399,17 +1369,15 @@
 
 #: ../lib/main.php:620
 msgid "Downloading html zip dumps"
-msgstr "Téléchargement des sauvegardes html compressées"
+msgstr "Téléchargement des sauvegardes HTML compressées"
 
 #: ../lib/main.php:769
-#, fuzzy
 msgid "Illegal character '"
-msgstr "Illégal %s supprimées"
+msgstr "Caractère interdit '"
 
 #: ../lib/main.php:769
-#, fuzzy
 msgid "' in page name."
-msgstr "%s : Nom de page invalide"
+msgstr "' dans le nom de la page."
 
 #: ../lib/main.php:788
 #, php-format
@@ -1429,7 +1397,6 @@
 msgid "%s: Bad action"
 msgstr "%s : Mauvaise action"
 
-# lib/stdlib.php:36
 #: ../lib/main.php:833
 msgid "Fatal PhpWiki Error"
 msgstr "Erreur fatale de PhpWiki"
@@ -1443,13 +1410,12 @@
 msgstr "DéfinirAcl"
 
 #: ../lib/main.php:1092
-#, fuzzy
 msgid "SetAclSimple"
-msgstr "WikiAdminSetAcl"
+msgstr ""
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr "Renommer"
 
@@ -1465,15 +1431,13 @@
 msgid "PageDump"
 msgstr "RécupérationDeLaPage"
 
-# lib/fullsearch.php:48
 #: ../lib/main.php:1123 ../lib/plugin/FullTextSearch.php:46
 #: ../lib/plugin/WantedPagesOld.php:126
 msgid "FullTextSearch"
 msgstr "RechercheEnTexteIntégral"
 
-# lib/fullsearch.php:48
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1490,7 +1454,7 @@
 #: ../lib/main.php:1305 ../lib/main.php:1318 ../lib/Request.php:821
 #, php-format
 msgid "%s is not writable."
-msgstr "%s n'est pas accessible en écriture."
+msgstr "%s n'est pas modifiable."
 
 #: ../lib/main.php:1306
 msgid "The session.save_path directory"
@@ -1500,8 +1464,8 @@
 #, 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 redéfinissez-le "
-"dans config/config.ini."
+"Veuillez vous assurer que %s est modifiable, ou redéfinissez %s dans config/"
+"config.ini."
 
 #: ../lib/main.php:1309
 #, php-format
@@ -1517,36 +1481,34 @@
 msgid "Users will not be able to sign in."
 msgstr "Les utilisateurs ne pourront pas s'inscrire."
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
+"Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 4.3.9"
 
-# lib/diff.php:1006 lib/diff.php:1024
 #: ../lib/PageList.php:93
 #, php-format
 msgid "Sort by %s"
-msgstr "Trié par %s"
+msgstr "Trier par %s"
 
 #: ../lib/PageList.php:120
-#, fuzzy
 msgid "reverse"
-msgstr "Réinitialiser"
+msgstr "inverser"
 
 #: ../lib/PageList.php:131
 msgid "Click to reverse sort order"
-msgstr "Cliquer pour inverser l'ordre de tri"
+msgstr "Cliquez pour inverser le tri"
 
-# lib/diff.php:1006 lib/diff.php:1024
 #: ../lib/PageList.php:138
 #, php-format
 msgid "Click to sort by %s"
-msgstr "Cliquer pour trier par %s"
+msgstr "Cliquez pour trier par %s"
 
 #: ../lib/PageList.php:275
 msgid "Click to de-/select all pages"
 msgstr "Cliquez pour (de)sélectionner toutes les pages"
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr "... %d premiers octets"
@@ -1561,51 +1523,48 @@
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "permissions héritées de %s"
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
-#, fuzzy
 msgid "individual page permission"
-msgstr "Permission de page individuelle"
+msgstr "permission de page individuelle"
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
-msgstr "Permission de page par défaut"
+msgstr "permission de page par défaut"
 
 #: ../lib/PageList.php:658 ../lib/plugin/FullTextSearch.php:115
 msgid "<no matches>"
 msgstr "<aucun résultat>"
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 msgid "Content"
 msgstr "Contenu"
 
-# lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 msgid "Permission"
 msgstr "Permission"
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr "ACL"
 
 #: ../lib/PageList.php:1180
 msgid "All"
-msgstr ""
+msgstr "Tout"
 
-# lib/diff.php:1003 lib/diff.php:1021
 #: ../lib/PageList.php:1184 ../themes/default/templates/info.tmpl:57
 #: ../themes/MonoBook/templates/info.tmpl:72
 msgid "Last Modified"
@@ -1627,7 +1586,6 @@
 msgid "Last Summary"
 msgstr "Dernier résumé"
 
-# lib/diff.php:1001 lib/diff.php:1019
 #: ../lib/PageList.php:1193 ../lib/plugin/AuthorHistory.php:111
 #: ../lib/plugin/AuthorHistory.php:154
 msgid "Version"
@@ -1653,11 +1611,11 @@
 #: ../themes/MonoBook/templates/info.tmpl:143
 #: ../themes/Wordpress/templates/editpage.tmpl:62
 msgid "Locked"
-msgstr "Verrouillée"
+msgstr "Verrouillé"
 
 #: ../lib/PageList.php:1207
 msgid "locked"
-msgstr "verrouillée"
+msgstr "verrouillé"
 
 #: ../lib/PageList.php:1209 ../themes/fusionforge/templates/editpage.tmpl:67
 msgid "External"
@@ -1673,26 +1631,25 @@
 
 #: ../lib/PageList.php:1213
 msgid "minor"
-msgstr "mineure"
+msgstr "mineur"
 
 #: ../lib/PageList.php:1215
 msgid "Markup"
-msgstr "Marquage"
+msgstr "Syntaxe"
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
 #: ../lib/PageList.php:1506 ../lib/plugin/WantedPagesOld.php:170
 #, php-format
 msgid "Columns: %s."
-msgstr "Colonnes : %s."
+msgstr "Colonnes : %s."
 
 #: ../lib/PagePerm.php:191
-#, fuzzy
 msgid "SearchReplace"
-msgstr "Recherche & Remplace"
+msgstr "Rechercher & Remplacer"
 
 #: ../lib/PagePerm.php:321
 msgid "List this page and all subpages"
@@ -1716,11 +1673,11 @@
 
 #: ../lib/PagePerm.php:326
 msgid "Change page attributes"
-msgstr "Changer les attributs de cette page"
+msgstr "Modifier les attributs de la page"
 
 #: ../lib/PagePerm.php:327
 msgid "Remove this page"
-msgstr "Supprimer la page"
+msgstr "Supprimer cette page"
 
 #: ../lib/PagePerm.php:328
 msgid "Purge this page"
@@ -1737,7 +1694,7 @@
 
 #: ../lib/PagePerm.php:585
 msgid "Group/User"
-msgstr "Groupe/Utilisateur"
+msgstr "Groupe/utilisateur"
 
 #: ../lib/PagePerm.php:586
 msgid "Grant"
@@ -1745,16 +1702,16 @@
 
 #: ../lib/PagePerm.php:587
 msgid "Del/+"
-msgstr "Effacer/+"
+msgstr "Suppr/+"
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "Description"
 
 #: ../lib/PagePerm.php:609
 msgid "Add this ACL"
-msgstr "Ajouer cette ACL"
+msgstr "Ajouter cette ACL"
 
 #: ../lib/PagePerm.php:633
 msgid "Allow / Deny"
@@ -1762,7 +1719,7 @@
 
 #: ../lib/PagePerm.php:645
 msgid "Delete this ACL"
-msgstr "Effacer cette ACL"
+msgstr "Supprimer cette ACL"
 
 #: ../lib/PagePerm.php:671
 msgid "add "
@@ -1770,19 +1727,20 @@
 
 #: ../lib/PagePerm.php:675
 msgid "Check to add this ACL"
-msgstr "Vérifier pour ajouter cette ACL"
+msgstr "Cocher pour ajouter cette ACL"
 
 #: ../lib/PageType.php:142
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-# lib/diff.php:1001 lib/diff.php:1019
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1810,17 +1768,17 @@
 
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/WikiForum.php:71
 msgid "No pagename specified"
-msgstr "Aucun nom de page indiqué"
+msgstr "Pas de nom de page spécifié"
 
 #: ../lib/plugin/AddComment.php:98
 msgid "Click to hide the comments"
-msgstr ""
+msgstr "Cliquez pour masquer les commentaires"
 
 #: ../lib/plugin/AddComment.php:101
 msgid "Click to display all comments"
-msgstr "Cliquez pour afficher tout commente"
+msgstr "Cliquez pour afficher tous les commentaires"
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr "Cliquez pour afficher"
 
@@ -1835,17 +1793,17 @@
 
 #: ../lib/plugin/AllPages.php:38
 msgid "List all pages in this wiki."
-msgstr "Afficher la liste de toutes les pages de ce wiki."
+msgstr "Liste de toutes les pages de ce wiki."
 
 #: ../lib/plugin/AllPages.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "All pages in this wiki (%d total):"
-msgstr "Toutes les pages dans ce wiki ({total} au total) :"
+msgstr "Toutes les pages de ce wiki (%d au total) :"
 
 #: ../lib/plugin/AllPages.php:75
-#, fuzzy, php-format
+#, php-format
 msgid "List of user-created pages (%d total):"
-msgstr "Liste des pages créées par les utilisateurs ({total} au total) :"
+msgstr "Liste des pages créées par les utilisateurs (%d au total) :"
 
 #: ../lib/plugin/AllPages.php:84 ../lib/plugin/LinkDatabase.php:81
 #, php-format
@@ -1880,111 +1838,111 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr "Utilisateurs connectés à ce wiki (%d au total) :"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr "utilisateurs"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr "minutes"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
-msgstr ""
+msgstr "heures"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr "jours"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
-msgstr ""
+msgstr "semaines"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr "Montre l'index de la table access log."
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -2012,14 +1970,14 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
-msgstr "Page changé avec succès."
+msgstr "Page mise à jour avec succès."
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
-msgstr ""
+msgstr "Aller à %s"
 
 #: ../lib/plugin/AsciiMath.php:49
 msgid "AsciiMath"
@@ -2042,14 +2000,12 @@
 msgstr ""
 
 #: ../lib/plugin/AtomFeed.php:36
-#, fuzzy
 msgid "Atom Aggregator Plugin"
-msgstr "Importer des ressources RSS"
+msgstr ""
 
-# InfosAuthentification
 #: ../lib/plugin/_AuthInfo.php:35
 msgid "AuthInfo"
-msgstr "InfosAuth"
+msgstr ""
 
 #: ../lib/plugin/_AuthInfo.php:39
 msgid "Display general and user specific auth information."
@@ -2082,12 +2038,12 @@
 "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."
 msgstr ""
-"Affiche la liste de toutes les révisions faites par un auteur, ou montre une "
+"Affiche la liste de toutes les versions faites par un auteur, ou montre une "
 "liste du type HistoriquePage pour une simple page uniquement pour un auteur."
 
 #: ../lib/plugin/AuthorHistory.php:112 ../lib/plugin/AuthorHistory.php:155
 msgid "Minor"
-msgstr "Mineure"
+msgstr "Mineur"
 
 #: ../lib/plugin/AuthorHistory.php:113
 #: ../themes/default/templates/info.tmpl:63
@@ -2107,10 +2063,9 @@
 msgid "Summary"
 msgstr "Résumé"
 
-# lib/diff.php:1003 lib/diff.php:1021
 #: ../lib/plugin/AuthorHistory.php:115 ../lib/plugin/AuthorHistory.php:157
 msgid "Modified"
-msgstr "Dernière modification"
+msgstr "Modifié"
 
 #: ../lib/plugin/AuthorHistory.php:144
 #, php-format
@@ -2125,7 +2080,7 @@
 "Historique des éditions majeures ou mineures pour n'importe quelle page "
 "éditée par %s."
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2143,7 +2098,7 @@
 #: ../lib/plugin/_BackendInfo.php:53
 #, php-format
 msgid "Querying backend directly for '%s'"
-msgstr "Requête directe au backend pour '%s'"
+msgstr "Requête directe au backend pour « %s »"
 
 #: ../lib/plugin/_BackendInfo.php:62
 #, php-format
@@ -2157,7 +2112,7 @@
 #: ../lib/plugin/BackLinks.php:33
 #, php-format
 msgid "List all pages which link to %s."
-msgstr "Affiche toutes les pages liée à %s."
+msgstr "Liste des pages liées à %s."
 
 #: ../lib/plugin/BackLinks.php:67 ../lib/plugin/ListPages.php:118
 #: ../lib/plugin/ListPages.php:121 ../lib/plugin/ListSubpages.php:84
@@ -2167,12 +2122,12 @@
 #: ../lib/plugin/BackLinks.php:120
 #, php-format
 msgid "No other page links to %s yet."
-msgstr "Aucune page n'est ancore liée à %s."
+msgstr "Aucune page n'est déjà liée à %s."
 
 #: ../lib/plugin/BackLinks.php:123
 #, php-format
 msgid "One page would link to %s:"
-msgstr "Une page pointait vers %s :"
+msgstr "Une page pointerait vers %s :"
 
 #: ../lib/plugin/BackLinks.php:132
 #, php-format
@@ -2195,9 +2150,8 @@
 msgstr "Une page pointe vers %s :"
 
 #: ../lib/plugin/BackLinks.php:162
-#, fuzzy
 msgid "Those"
-msgstr "Fermer"
+msgstr ""
 
 #: ../lib/plugin/BackLinks.php:161
 #, php-format
@@ -2206,12 +2160,12 @@
 
 #: ../lib/plugin/BackLinks.php:170
 msgid "More..."
-msgstr ""
+msgstr "Plus..."
 
 #: ../lib/plugin/BlogArchives.php:39 ../lib/plugin/BlogArchives.php:144
 #: ../themes/blog/templates/actionbar.tmpl:11
 msgid "Archives"
-msgstr ""
+msgstr "Archives"
 
 #: ../lib/plugin/BlogArchives.php:43
 msgid "List blog months links for the current or ADMIN user"
@@ -2240,9 +2194,8 @@
 msgstr ""
 
 #: ../lib/plugin/BlogJournal.php:95
-#, fuzzy
 msgid "New entry"
-msgstr "Nouveau commentaire."
+msgstr "Nouvelle entrée"
 
 #: ../lib/plugin/BlogJournal.php:97
 msgid "No Blog Entries"
@@ -2262,14 +2215,14 @@
 msgstr "Éditer %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2284,22 +2237,20 @@
 msgstr "Mois suivant"
 
 #: ../lib/plugin/Calendar.php:127
-#, fuzzy
 msgid "Wk"
-msgstr "L"
+msgstr ""
 
-# lib/diff.php:997
 #: ../lib/plugin/CategoryPage.php:44
 msgid "CategoryPage"
 msgstr "CatégoriePages"
 
 #: ../lib/plugin/CategoryPage.php:48
 msgid "Create a Wiki page."
-msgstr "Créer cette page."
+msgstr "Créer une page wiki"
 
 #: ../lib/plugin/Chart.php:50
 msgid "Chart"
-msgstr ""
+msgstr "Diagramme"
 
 #: ../lib/plugin/Chart.php:54
 msgid "Render SVG charts"
@@ -2314,17 +2265,15 @@
 msgstr "Cacher des commentaires dans une PageWiki."
 
 #: ../lib/plugin/CreateBib.php:37
-#, fuzzy
 msgid "CreateBib"
-msgstr "CréerUneTdm"
+msgstr ""
 
 #: ../lib/plugin/CreateBib.php:41
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr "aucune page indiquée"
 
@@ -2338,20 +2287,17 @@
 msgstr "Créer une PageWiki avec le nom demandé."
 
 #: ../lib/plugin/CreatePage.php:66
-#, fuzzy
 msgid "Cannot create page with empty name!"
-msgstr "Impossible de créer le répertoire '%s'"
+msgstr ""
 
-# lib/display.php:14
 #: ../lib/plugin/CreatePage.php:70
-#, fuzzy
 msgid "CreatePage failed"
-msgstr "CréerUnePage"
+msgstr ""
 
 #: ../lib/plugin/CreatePage.php:72 ../lib/plugin/CreatePage.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "Do you really want to create the page '%s'?"
-msgstr "Voulez-vous réellement reinitialiser le mot de passe de %s ?"
+msgstr "Voulez-vous réellement crééer la page '%s' ?"
 
 #: ../lib/plugin/CreatePage.php:79 ../lib/plugin/CreatePage.php:83
 msgid "The new page you want to create will be a subpage."
@@ -2371,30 +2317,52 @@
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-# lib/display.php:14
 #: ../lib/plugin/CreatePage.php:132
 msgid "Created by CreatePage"
 msgstr "Créée par CréerUnePage"
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr "CréerUneTdm"
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+msgid "No page specified."
+msgstr "Aucune page indiquée"
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, php-format
+msgid "Page '%s' does not exist."
+msgstr "La page « %s » n'existe pas"
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
+msgstr "Accès en lecture interdit pour la page « %s »."
+
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, php-format
+msgid "%s: no such revision %d."
+msgstr "%s(%d) : version inexistante"
+
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr "Cliquez pour afficher la table des matières"
 
@@ -2406,35 +2374,53 @@
 msgid "A simple plugin that displays current time and date"
 msgstr ""
 
-# lib/display.php:14
 #: ../lib/plugin/DeadEndPages.php:31
 msgid "DeadEndPages"
-msgstr "PagesSansLien"
+msgstr ""
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
-msgstr "Diff"
+msgstr ""
 
 #: ../lib/plugin/Diff.php:40
 msgid "Display differences between revisions"
-msgstr "Affiche les différences entre révisions"
+msgstr "Affiche les différences entre versions"
 
+# lib/diff.php:1001 lib/diff.php:1019
+#: ../lib/plugin/Diff.php:182
+msgid "Content of versions "
+msgstr "Contenu des versions "
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr " et "
+
+#: ../lib/plugin/Diff.php:183
+msgid " is identical."
+msgstr " est identique."
+
+#: ../lib/plugin/Diff.php:188
+msgid "Version "
+msgstr "Version "
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr " a été créée car : "
+
 #: ../lib/plugin/DynamicIncludePage.php:35
-#, fuzzy
 msgid "DynamicIncludePage"
-msgstr "InclureUnePage"
+msgstr ""
 
 #: ../lib/plugin/DynamicIncludePage.php:39
-#, fuzzy
 msgid "Dynamically include the content from another wiki page."
-msgstr "Inclure le texte d'une autre PageWiki."
+msgstr "Inclure dynamiquement le texte d'une autre PageWiki."
 
 #: ../lib/plugin/DynamicIncludePage.php:59
 #: ../lib/plugin/DynamicIncludePage.php:82
-#, fuzzy, php-format
+#, php-format
 msgid " %s :"
-msgstr "%s b"
+msgstr ""
 
 #: ../lib/plugin/DynamicIncludePage.php:77
 #: ../lib/plugin/DynamicIncludePage.php:78
@@ -2444,7 +2430,7 @@
 msgid "Click to hide/show"
 msgstr "Cliquez pour masquer/afficher"
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr "EditerLesMetaDonnées"
 
@@ -2468,7 +2454,7 @@
 
 #: ../lib/plugin/EditMetaData.php:144 ../lib/upgrade.php:789
 msgid "Submit"
-msgstr "Valider"
+msgstr "Soumettre"
 
 #: ../lib/plugin/EditMetaData.php:159
 msgid "Requires WikiAdmin privileges to edit."
@@ -2495,9 +2481,8 @@
 msgstr ""
 
 #: ../lib/plugin/FileInfo.php:40
-#, fuzzy
 msgid "FileInfo"
-msgstr "Info"
+msgstr ""
 
 #: ../lib/plugin/FileInfo.php:44
 msgid "Display file information like version, size, date... of uploaded files."
@@ -2505,15 +2490,15 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
-msgstr "Un argument requis '%s' est manquant."
+msgstr ""
 
 #: ../lib/plugin/FileInfo.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "File '%s' not found."
-msgstr "%s non trouvé"
+msgstr "Fichier « %s » non trouvé."
 
 #: ../lib/plugin/FileInfo.php:90
 msgid ""
@@ -2570,22 +2555,34 @@
 msgstr ""
 "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé."
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
+msgstr "Greffon non exécuté (hors navigation)"
+
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
 #, php-format
-msgid "recursive inclusion of page %s"
-msgstr "insertion récursive de la page %s"
+msgid "Recursive inclusion of page %s"
+msgstr "Insertion récursive de la page %s"
 
-#: ../lib/plugin/FrameInclude.php:94
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr "%s ou %s paramètre manquant"
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
 #, php-format
-msgid "recursive inclusion of url %s"
-msgstr "insertion récursive de l'URL %s"
+msgid "Recursive inclusion of url %s"
+msgstr "Insertion récursive de l'URL %s"
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2596,7 +2593,6 @@
 msgid "Search the content of all pages in this wiki."
 msgstr "Rechercher le contenu de toutes les pages de ce wiki."
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/FullTextSearch.php:88 ../lib/plugin/FullTextSearch.php:123
 #, php-format
 msgid "Full text search results for '%s'"
@@ -2613,9 +2609,9 @@
 msgstr ""
 
 #: ../lib/plugin/FullTextSearch.php:163 ../lib/plugin/WantedPages.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "(%d Links)"
-msgstr "Liens"
+msgstr "(%d liens)"
 
 #: ../lib/plugin/FuzzyPages.php:39
 msgid "FuzzyPages"
@@ -2629,7 +2625,7 @@
 #: ../lib/plugin/FuzzyPages.php:96
 #, php-format
 msgid "These page titles match fuzzy with '%s'"
-msgstr "Ces titres de pages correspondent de manière floue à '%s'"
+msgstr "Ces titres de pages correspondent de manière floue à « %s »"
 
 #: ../lib/plugin/FuzzyPages.php:101
 msgid "Name"
@@ -2637,12 +2633,12 @@
 
 #: ../lib/plugin/FuzzyPages.php:102
 msgid "Score"
-msgstr "Point"
+msgstr "Score"
 
 #: ../lib/plugin/FuzzyPages.php:136
 #, php-format
 msgid "No fuzzy matches with '%s'"
-msgstr ""
+msgstr "Pas de correspondances floues avec « %s »"
 
 #: ../lib/plugin/FuzzyPages.php:169
 msgid "Spelling Score"
@@ -2688,16 +2684,14 @@
 msgid "Nothing found"
 msgstr "Aucun résultat"
 
-# lib/pageinfo.php:10 lib/stdlib.php:239
 #: ../lib/plugin/GoTo.php:37
 msgid "GoTo"
 msgstr "AllerVers"
 
 #: ../lib/plugin/GoTo.php:41
 msgid "Go to or create page."
-msgstr "Aller à ou créer page."
+msgstr "Aller à la page ou la créer."
 
-# lib/pageinfo.php:10 lib/stdlib.php:239
 #: ../lib/plugin/GoTo.php:78 ../lib/plugin/WikiAdminSelect.php:130
 #: ../lib/plugin/WikiAdminSelect.php:141
 #: ../themes/MonoBook/templates/navbar.tmpl:33
@@ -2712,7 +2706,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, php-format
 msgid "%s is empty"
 msgstr "%s est vide."
@@ -2739,7 +2733,7 @@
 #: ../lib/plugin/_GroupInfo.php:34
 #, php-format
 msgid "Show Group Information"
-msgstr ""
+msgstr "Information sur le groupe"
 
 #: ../lib/plugin/HelloWorld.php:46
 msgid "HelloWorld"
@@ -2777,36 +2771,39 @@
 msgid "Include text from another wiki page."
 msgstr "Inclure le texte d'une autre PageWiki."
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, php-format
-msgid "recursive inclusion of page %s ignored"
-msgstr "insertion récursive de la page %s ignoré"
+msgid "Recursive inclusion of page %s ignored"
+msgstr "Insertion récursive de la page %s ignoré"
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
-#, fuzzy, php-format
+#: ../lib/plugin/IncludePage.php:91
+#, php-format
 msgid "Page '%s' does not exist"
-msgstr "Le groupe de page %s n'existe pas"
+msgstr "La page '%s' n'existe pas"
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
-#, fuzzy, php-format
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
+#, php-format
 msgid "Illegal inclusion of page %s: no read access"
-msgstr "insertion récursive de la page %s ignoré"
+msgstr ""
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
+msgstr ""
+
+#: ../lib/plugin/IncludePage.php:157
 #, php-format
-msgid "%s(%d): no such revision"
-msgstr "%s(%d) : révision inexistante"
+msgid "Included from %s (revision %d)"
+msgstr "Inséré de %s (version %d)"
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "Inséré de %s"
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr "... %d premières lignes"
@@ -2826,17 +2823,15 @@
 #: ../lib/plugin/IncludeSiteMap.php:56
 #, php-format
 msgid "Include recursively all linked pages starting at %s"
-msgstr "Créer une carte du site commencer à %s"
+msgstr "Créer une carte du site commençant à %s"
 
 #: ../lib/plugin/IncludeTree.php:39
-#, fuzzy
 msgid "IncludeTree"
-msgstr "InclureUnePage"
+msgstr ""
 
 #: ../lib/plugin/IncludeTree.php:43
-#, fuzzy
 msgid "Dynamic Category Tree"
-msgstr "Catégories populaires"
+msgstr ""
 
 #: ../lib/plugin/InterWikiSearch.php:31
 msgid "InterWikiSearch"
@@ -2850,9 +2845,8 @@
 
 #: ../lib/plugin/InterWikiSearch.php:87
 msgid "Wiki Name"
-msgstr "Nom Wiki"
+msgstr "Nom du wiki"
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/plugin/InterWikiSearch.php:88 ../lib/plugin/RecentChanges.php:805
 #: ../lib/plugin/SemanticSearchAdvanced.php:107
 #: ../themes/Crao/templates/navbar.tmpl:43
@@ -2861,38 +2855,36 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
 #: ../themes/Sidebar/templates/search.tmpl:18
 #: ../themes/Sidebar/templates/search.tmpl:30
 msgid "Search"
-msgstr "Recherche"
+msgstr "Rechercher"
 
 #: ../lib/plugin/JabberPresence.php:42
 msgid "JabberPresence"
-msgstr "JabberPresence"
+msgstr ""
 
 #: ../lib/plugin/JabberPresence.php:46
 msgid "Simple jabber presence plugin"
 msgstr ""
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/plugin/LdapSearch.php:54
 msgid "LdapSearch"
 msgstr "LdapChercher"
 
 #: ../lib/plugin/LdapSearch.php:57
 msgid "Search an LDAP directory"
-msgstr ""
+msgstr "Chercher dans un annuaire LDAP"
 
 #: ../lib/plugin/LdapSearch.php:76
-#, fuzzy
 msgid "Missing ldap extension"
-msgstr "Permission de page individuelle absente:"
+msgstr ""
 
 #: ../lib/plugin/LdapSearch.php:99
-#, fuzzy
 msgid "Failed to connect to LDAP host"
 msgstr "Impossible de se connecter au serveur LDAP "
 
@@ -2902,6 +2894,8 @@
 
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -2947,13 +2941,11 @@
 msgstr "Liens"
 
 #: ../lib/plugin/LinkDatabase.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format argument %s"
-msgstr "Les gestionnaires supportés sont : %s"
+msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/LinkSearch.php:35 ../lib/plugin/LinkSearch.php:109
-#, fuzzy
 msgid "LinkSearch"
 msgstr "RechercheLive"
 
@@ -2971,13 +2963,12 @@
 msgstr ""
 
 #: ../lib/plugin/LinkSearch.php:94
-#, fuzzy
 msgid "outgoing"
-msgstr "Identifiant"
+msgstr "sortant"
 
 #: ../lib/plugin/LinkSearch.php:95
 msgid "incoming"
-msgstr ""
+msgstr "entrant"
 
 #: ../lib/plugin/LinkSearch.php:110
 msgid "Search in pages for links with the matching name."
@@ -2986,9 +2977,8 @@
 #: ../lib/plugin/LinkSearch.php:145
 #: ../lib/plugin/SemanticSearchAdvanced.php:187
 #: ../lib/plugin/SemanticSearch.php:329
-#, fuzzy
 msgid "Link"
-msgstr "Liens"
+msgstr "Lien"
 
 #: ../lib/plugin/LinkSearch.php:155
 #, php-format
@@ -3005,12 +2995,11 @@
 
 #: ../lib/plugin/ListPages.php:95
 msgid "You must be logged in to view ratings."
-msgstr "Vous devez vous connecter pour voir les scores."
+msgstr "Vous devez vous identifier pour voir les évaluations."
 
 #: ../lib/plugin/ListRelations.php:34
-#, fuzzy
 msgid "ListRelations"
-msgstr "Annuler la notation"
+msgstr ""
 
 #: ../lib/plugin/ListRelations.php:37
 msgid ""
@@ -3041,13 +3030,12 @@
 msgstr ""
 
 #: ../lib/plugin/MediawikiTable.php:60
-#, fuzzy
 msgid "Layout tables using a Mediawiki-like markup style."
-msgstr "Un système de marques pour faire des tableaux sophistiqués."
+msgstr ""
 
 #: ../lib/plugin/ModeratedPage.php:45
 msgid "Support moderated pages"
-msgstr "Supportés pages moderée"
+msgstr ""
 
 #: ../lib/plugin/ModeratedPage.php:150 ../lib/plugin/ModeratedPage.php:175
 #: ../lib/plugin/ModeratedPage.php:221
@@ -3095,15 +3083,15 @@
 
 #: ../lib/plugin/ModeratedPage.php:401
 msgid "Reason: "
-msgstr ""
+msgstr "Raison : "
 
 #: ../lib/plugin/ModeratedPage.php:402
 msgid "Approve"
-msgstr ""
+msgstr "Approuver"
 
 #: ../lib/plugin/ModeratedPage.php:404
 msgid "Reject"
-msgstr ""
+msgstr "Rejeter"
 
 #: ../lib/plugin/ModeratedPage.php:432 ../lib/plugin/ModeratedPage.php:439
 #, php-format
@@ -3121,7 +3109,7 @@
 
 #: ../lib/plugin/MostPopular.php:34
 msgid "List the most popular pages."
-msgstr "Affiche la listes des pages les plus populaires."
+msgstr "Voir les pages les plus populaires."
 
 #: ../lib/plugin/MostPopular.php:60
 msgid "sortby=mtime not supported with MostPopular"
@@ -3142,14 +3130,12 @@
 msgstr "Pages visitées sur ce wiki, classées par ordre de popularité :"
 
 #: ../lib/plugin/NewPagesPerUser.php:35
-#, fuzzy
 msgid "NewPagesPerUser"
-msgstr "Nouvelle page."
+msgstr ""
 
 #: ../lib/plugin/NewPagesPerUser.php:39
-#, fuzzy
 msgid "List all new pages per month per user"
-msgstr "Énumérez tous les utilisateurs une fois authentifiés."
+msgstr ""
 
 #: ../lib/plugin/NoCache.php:40
 msgid "NoCache"
@@ -3172,7 +3158,6 @@
 msgid "Line %s does not begin with a '|'."
 msgstr "La ligne %s ne commence pas par un '|'."
 
-# lib/display.php:14
 #: ../lib/plugin/OrphanedPages.php:34
 msgid "OrphanedPages"
 msgstr "PagesOrphelines"
@@ -3196,17 +3181,16 @@
 msgstr "Page %s non trouvée."
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
-msgstr "Télécharger pour CVS"
+msgid "Download for Subversion"
+msgstr "Télécharger pour Subversion"
 
 #: ../lib/plugin/PageDump.php:154
 msgid "Download for backup"
 msgstr "Télécharger pour sauvegarder"
 
 #: ../lib/plugin/PageDump.php:160
-#, fuzzy
 msgid "Download all revisions for backup"
-msgstr "Télécharger pour sauvegarder"
+msgstr "Télécharger toutes les versions pour sauvegarder"
 
 #: ../lib/plugin/PageDump.php:163
 #, php-format
@@ -3214,24 +3198,21 @@
 msgstr "Prévisualisation : récupération de %s"
 
 #: ../lib/plugin/PageDump.php:170
-#, fuzzy
 msgid ""
 "(formatted for PhpWiki developers as pgsrc template, not for backing up)"
 msgstr "(format pour les développeurs, pas pour la sauvegarde)"
 
 #: ../lib/plugin/PageDump.php:173 ../lib/plugin/PageDump.php:193
-#, fuzzy
 msgid "Preview as normal format"
 msgstr "Prévisualisation au format de sauvegarde"
 
 #: ../lib/plugin/PageDump.php:179 ../lib/plugin/PageDump.php:206
 msgid "Preview as backup format"
-msgstr "Prévisualisation au format de sauvegarde"
+msgstr ""
 
 #: ../lib/plugin/PageDump.php:183
-#, fuzzy
 msgid "(formatted for backing up: all revisions)"
-msgstr "(format de sauvegarde)"
+msgstr "(format de sauvegarde : toutes les versions)"
 
 #: ../lib/plugin/PageDump.php:187 ../lib/plugin/PageDump.php:200
 msgid "Preview as developer format"
@@ -3260,16 +3241,17 @@
 #: ../lib/plugin/PageDump.php:215
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 "Les développeurs de PhpWiki devraient inspecter manuellement les balises des "
-"fichiers téléchargés avant de les éditer sous emacs, et vérifier les CVS."
+"fichiers téléchargés avant de les éditer sous emacs et les publier sous "
+"Subversion."
 
 #: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
 #: ../lib/plugin/SemanticSearchAdvanced.php:142
 #: ../lib/plugin/SemanticSearch.php:284
 msgid "Warning:"
-msgstr "Attention:"
+msgstr "Attention :"
 
 #: ../lib/plugin/PageGroup.php:45
 msgid "PageGroup"
@@ -3285,12 +3267,13 @@
 msgid "Contents"
 msgstr "Contenu"
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s : pas de section de ce type>"
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr "Suivant"
 
@@ -3300,11 +3283,11 @@
 
 #: ../lib/plugin/PageGroup.php:104 ../lib/plugin/PrevNext.php:60
 msgid "First"
-msgstr "Première"
+msgstr "Premier"
 
 #: ../lib/plugin/PageGroup.php:105 ../lib/plugin/PrevNext.php:63
 msgid "Last"
-msgstr "Dernière"
+msgstr "Dernier"
 
 #: ../lib/plugin/PageHistory.php:89
 #, php-format
@@ -3313,15 +3296,15 @@
 
 #: ../lib/plugin/PageHistory.php:103
 msgid "No revisions found"
-msgstr "Révision non trouvée"
+msgstr "Aucune version trouvée"
 
 #: ../lib/plugin/PageHistory.php:108
 msgid "compare revisions"
-msgstr "comparer les révisions"
+msgstr "comparer les versions"
 
 #: ../lib/plugin/PageHistory.php:113
 msgid "Check any two boxes to compare revisions."
-msgstr "Cochez une des boîtes pour comparer les révisions."
+msgstr "Cochez deux boîtes quelconques pour comparer les versions."
 
 #: ../lib/plugin/PageHistory.php:114
 #, php-format
@@ -3346,7 +3329,6 @@
 msgid "PageHistory"
 msgstr "HistoriqueDeLaPage"
 
-# lib/diff.php:1001 lib/diff.php:1019
 #: ../lib/plugin/PageHistory.php:173 ../lib/plugin/PageHistory.php:249
 #, php-format
 msgid "Version %d"
@@ -3362,18 +3344,17 @@
 #: ../themes/SpaceWiki/lib/RecentChanges.php:35
 #: ../themes/Wordpress/lib/RecentChanges.php:14
 msgid "minor edit"
-msgstr "édition mineure"
+msgstr "modification mineure"
 
 #: ../lib/plugin/PageHistory.php:241
 msgid "History of changes."
-msgstr "Historique des changements."
+msgstr "Historique des modifications."
 
 #: ../lib/plugin/PageHistory.php:271
 #, php-format
 msgid "List PageHistory for %s"
 msgstr "Historique de %s"
 
-# lib/pageinfo.php:26 lib/pageinfo.php:75
 #: ../lib/plugin/PageInfo.php:32 ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/default/templates/actionbar.tmpl:36
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
@@ -3398,9 +3379,8 @@
 msgstr "Pour suivre les pages à la trace"
 
 #: ../lib/plugin/PasswordReset.php:42
-#, fuzzy
 msgid "PasswordReset"
-msgstr "Mot de passe :"
+msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:46
 msgid ""
@@ -3408,7 +3388,6 @@
 "by e-mail."
 msgstr ""
 
-# lib/msql.php:31 lib/msql.php:37
 #: ../lib/plugin/PasswordReset.php:60 ../lib/plugin/PasswordReset.php:81
 #: ../themes/default/templates/wikiforum.tmpl:22
 msgid "Message"
@@ -3422,7 +3401,7 @@
 #: ../lib/plugin/PasswordReset.php:63 ../lib/plugin/PasswordReset.php:84
 #: ../lib/plugin/PasswordReset.php:162
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #: ../lib/plugin/PasswordReset.php:64
 #, php-format
@@ -3435,18 +3414,17 @@
 msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:85
-#, fuzzy, php-format
+#, php-format
 msgid "Error sending email with password for user %s."
-msgstr "Mot de passe ou identifiant d'utilisateur invalide."
+msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:92
-#, fuzzy
 msgid "Reset password of user: "
-msgstr "Mot de passe ou identifiant d'utilisateur invalide."
+msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:102 ../lib/plugin/PasswordReset.php:145
 msgid "Send email"
-msgstr ""
+msgstr "Envoyer message"
 
 #: ../lib/plugin/PasswordReset.php:131
 msgid "You need to specify the userid!"
@@ -3454,7 +3432,7 @@
 
 #: ../lib/plugin/PasswordReset.php:153
 msgid "Already logged in"
-msgstr ""
+msgstr "Déjà connecté"
 
 #: ../lib/plugin/PasswordReset.php:154
 msgid "Changing passwords is done at "
@@ -3466,14 +3444,13 @@
 msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:165
-#, fuzzy
 msgid "You need to ask an Administrator to reset this password. See below: "
-msgstr "Vous devez être un administrateur pour utiliser ce plugin."
+msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:177
 #, php-format
 msgid "Do you really want to reset the password of user %s?"
-msgstr "Voulez-vous réellement reinitialiser le mot de passe de %s ?"
+msgstr "Voulez-vous réellement réinitialiser les mot de passe de %s ?"
 
 #: ../lib/plugin/PasswordReset.php:178
 msgid "An email will be sent."
@@ -3520,7 +3497,7 @@
 #: ../lib/plugin/PhpHighlight.php:148
 #, php-format
 msgid "Invalid color: %s"
-msgstr "Couleur non valable : %s"
+msgstr "Couleur non valide : %s"
 
 #: ../lib/plugin/PhpWeather.php:63
 msgid "PhpWeather"
@@ -3548,7 +3525,7 @@
 
 #: ../lib/plugin/PhpWeather.php:165
 msgid "Submit country"
-msgstr "Valider le pays"
+msgstr ""
 
 #: ../lib/plugin/PhpWeather.php:165
 msgid "Change country"
@@ -3556,7 +3533,7 @@
 
 #: ../lib/plugin/PhpWeather.php:184
 msgid "Submit location"
-msgstr "Valider la localisation"
+msgstr "Soumettre la localisation"
 
 #: ../lib/plugin/Ploticus.php:93
 msgid "Ploticus"
@@ -3580,21 +3557,20 @@
 msgstr "GestionsDesPlugins"
 
 #: ../lib/plugin/PluginManager.php:36
-#, fuzzy
 msgid "List of plugins on this wiki"
-msgstr "Afficher la liste de toutes les pages de ce wiki."
+msgstr "Liste des greffons de ce wiki"
 
 #: ../lib/plugin/PluginManager.php:50
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Greffons"
 
 #: ../lib/plugin/PluginManager.php:59
 msgid "use this plugin"
-msgstr "utiliser ce plugin"
+msgstr "utiliser ce greffon"
 
 #: ../lib/plugin/PluginManager.php:71
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Greffon"
 
 #: ../lib/plugin/PluginManager.php:73
 msgid "Arguments"
@@ -3603,23 +3579,21 @@
 #: ../lib/plugin/PluginManager.php:111
 #, php-format
 msgid "%s does not appear to be a WikiPlugin."
-msgstr "%s ne semble pas être un plugin."
+msgstr "%s ne semble pas être un greffon."
 
 #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124
 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "Help"
 msgstr "Aide"
 
-# lib/stdlib.php:74
 #: ../lib/plugin/PopularNearby.php:44
 msgid "PopularNearby"
 msgstr "PopulairesAlentour"
 
 #: ../lib/plugin/PopularNearby.php:48
 msgid "List the most popular pages nearby."
-msgstr "Énumère les pages proches des plus visitées."
+msgstr ""
 
-# lib/stdlib.php:53
 #: ../lib/plugin/PopularNearby.php:68
 #, php-format
 msgid "%d best incoming links: "
@@ -3631,7 +3605,6 @@
 msgid "%d best outgoing links: "
 msgstr "%d meilleurs liens sortants : "
 
-# lib/stdlib.php:74
 #: ../lib/plugin/PopularNearby.php:78
 #, php-format
 msgid "%d most popular nearby: "
@@ -3639,17 +3612,14 @@
 
 # lib/stdlib.php:74
 #: ../lib/plugin/PopularTags.php:33
-#, fuzzy
 msgid "PopularTags"
-msgstr "PopulairesAlentour"
+msgstr ""
 
 #: ../lib/plugin/PopularTags.php:37
-#, fuzzy
 msgid "List the most popular tags."
-msgstr "Affiche la listes des pages les plus populaires."
+msgstr ""
 
-# lib/diff.php:997
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr "CatégorieCatégorie"
 
@@ -3671,9 +3641,8 @@
 msgstr ""
 
 #: ../lib/plugin/PreferenceApp.php:53
-#, fuzzy
 msgid "PreferenceApp"
-msgstr "Préférences"
+msgstr ""
 
 #: ../lib/plugin/PreferenceApp.php:57
 msgid "Analyzes preferences based on voting budget and ratings."
@@ -3685,22 +3654,20 @@
 msgstr ""
 
 #: ../lib/plugin/PreferenceApp.php:198
-#, fuzzy
 msgid "Total Units"
-msgstr "%d visites totales"
+msgstr ""
 
 #: ../lib/plugin/PreferenceApp.php:201
-#, fuzzy
 msgid "Total Voters"
-msgstr "%d thèmes au total: "
+msgstr "Total des votants"
 
 #: ../lib/plugin/PreferenceApp.php:272
 msgid "Total Budget"
-msgstr ""
+msgstr "Budget total"
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr "PréférencesInfo"
 
@@ -3720,7 +3687,7 @@
 
 #: ../lib/plugin/PrevNext.php:64
 msgid "Up"
-msgstr "Haut"
+msgstr "Monter"
 
 #: ../lib/plugin/PrevNext.php:66
 msgid "Index"
@@ -3728,17 +3695,15 @@
 
 # lib/diff.php:1001 lib/diff.php:1019
 #: ../lib/plugin/Processing.php:31
-#, fuzzy
 msgid "Processing"
-msgstr "Permission"
+msgstr ""
 
 #: ../lib/plugin/Processing.php:35
 msgid "Render inline Processing"
 msgstr ""
 
-# lib/display.php:14
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr "PageAléatoire"
@@ -3754,7 +3719,7 @@
 
 #: ../lib/plugin/RateIt.php:91
 msgid "Rating system. Store user ratings per page"
-msgstr "Système de vote. Stocke les votes d'utilisateur par page."
+msgstr ""
 
 #: ../lib/plugin/RateIt.php:147 ../lib/plugin/RateIt.php:243
 #, php-format
@@ -3762,38 +3727,33 @@
 msgstr ""
 
 #: ../lib/plugin/RateIt.php:148
-#, fuzzy
 msgid "Your current rating: "
-msgstr "Votre note "
+msgstr "Votre note actuelle : "
 
 # lib/pageinfo.php:64
 #: ../lib/plugin/RateIt.php:149
-#, fuzzy
 msgid "Your current prediction: "
-msgstr "vérifier l'action actuelle"
+msgstr ""
 
 #: ../lib/plugin/RateIt.php:150
-#, fuzzy
 msgid "Change your rating from "
-msgstr "Votre note "
+msgstr ""
 
 #: ../lib/plugin/RateIt.php:151
-#, fuzzy
 msgid " to "
-msgstr "à"
+msgstr " à "
 
 #: ../lib/plugin/RateIt.php:152
-#, fuzzy
 msgid "Add your rating: "
-msgstr "Votre note "
+msgstr ""
 
 #: ../lib/plugin/RateIt.php:153
 msgid "Thanks!"
-msgstr ""
+msgstr "Merci !"
 
 #: ../lib/plugin/RateIt.php:154
 msgid "Rating deleted!"
-msgstr ""
+msgstr "Évaluation supprimée !"
 
 #: ../lib/plugin/RateIt.php:259 ../lib/plugin/RateIt.php:263
 #, php-format
@@ -3801,9 +3761,9 @@
 msgstr "Votre note est %.1f"
 
 #: ../lib/plugin/RateIt.php:269
-#, fuzzy, php-format
+#, php-format
 msgid "Prediction: %s"
-msgstr "Éditer : %s"
+msgstr ""
 
 #: ../lib/plugin/RateIt.php:273
 #, php-format
@@ -3812,10 +3772,9 @@
 
 #: ../lib/plugin/RateIt.php:293
 msgid "Rate It"
-msgstr "Classez la"
+msgstr "Notez-la"
 
 #: ../lib/plugin/RateIt.php:388
-#, fuzzy
 msgid "Cancel your rating"
 msgstr "Annuler la notation"
 
@@ -3838,17 +3797,14 @@
 
 #: ../lib/plugin/RecentChanges.php:51 ../lib/plugin/RecentChanges.php:57
 #: ../lib/plugin/RecentChanges.php:532
-#, fuzzy
 msgid "UserContribs"
-msgstr "Statistiques d'utilisateur"
+msgstr ""
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RecentChanges.php:59
 #: ../themes/MonoBook/templates/navbar.tmpl:18
 #: ../themes/Sidebar/templates/navbar.tmpl:46
-#, fuzzy
 msgid "RecentNewPages"
-msgstr "DernièresModifs"
+msgstr ""
 
 #: ../lib/plugin/RecentChanges.php:61 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentEdits.php:29
@@ -3868,31 +3824,28 @@
 msgstr "diff"
 
 #: ../lib/plugin/RecentChanges.php:171
-#, fuzzy
 msgid "hist"
-msgstr "(hist)"
+msgstr ""
 
 #: ../lib/plugin/RecentChanges.php:214
-#, fuzzy
 msgid "contribs"
-msgstr "commentaires"
+msgstr ""
 
 #: ../lib/plugin/RecentChanges.php:221
-#, fuzzy
 msgid "new pages"
-msgstr "nouvelle page"
+msgstr "nouvelles pages"
 
 #: ../lib/plugin/RecentChanges.php:278
 msgid "edits"
-msgstr "éditions"
+msgstr "modifications"
 
 #: ../lib/plugin/RecentChanges.php:280
 msgid "major edits"
-msgstr "éditions majeures"
+msgstr "modifications majeures"
 
 #: ../lib/plugin/RecentChanges.php:282
 msgid "minor edits"
-msgstr "éditions mineures"
+msgstr "modifications mineures"
 
 #: ../lib/plugin/RecentChanges.php:283 ../lib/plugin/RecentChanges.php:385
 #: ../lib/plugin/RecentComments.php:47
@@ -3904,12 +3857,11 @@
 msgstr "commentaires"
 
 #: ../lib/plugin/RecentChanges.php:286
-#, fuzzy
 msgid "created new pages"
-msgstr "créer cette page"
+msgstr ""
 
 #: ../lib/plugin/RecentChanges.php:292
-#, fuzzy, php-format
+#, php-format
 msgid " for pages changed by %s"
 msgstr " pour les pages modifiées par %s"
 
@@ -3919,14 +3871,14 @@
 msgstr " pour les pages possédées par %s"
 
 #: ../lib/plugin/RecentChanges.php:301
-#, fuzzy, php-format
+#, php-format
 msgid " for all pages linking to %s"
-msgstr "Aucune page ne pointe vers %s."
+msgstr " pour les pages liées à %s."
 
 #: ../lib/plugin/RecentChanges.php:304
-#, fuzzy, php-format
+#, php-format
 msgid " for all pages matching '%s'"
-msgstr "Affiche toutes les pages liée à %s."
+msgstr " pour les pages correspondant à %s."
 
 #: ../lib/plugin/RecentChanges.php:329
 #, php-format
@@ -3994,15 +3946,13 @@
 msgid "Click to add this feed to your sidebar"
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/RecentChanges.php:806
 msgid "Title Search"
-msgstr "Recherche par titre"
+msgstr "Rechercher dans les titres"
 
 #: ../lib/plugin/RecentChanges.php:1164
-#, fuzzy
 msgid "List all recent changes in this wiki."
-msgstr "Afficher la liste de toutes les pages de ce wiki."
+msgstr "Montrer tous les changements récents de ce wiki."
 
 #: ../lib/plugin/RecentChanges.php:1370
 msgid "Show changes for:"
@@ -4027,7 +3977,7 @@
 
 #: ../lib/plugin/RecentChanges.php:1435
 msgid "My modifications only"
-msgstr "Mes modifications uniquement"
+msgstr "Que mes modifications"
 
 #: ../lib/plugin/RecentChanges.php:1452
 #: ../themes/MonoBook/templates/navbar.tmpl:78
@@ -4036,11 +3986,11 @@
 
 #: ../lib/plugin/RecentChanges.php:1455
 msgid "My pages only"
-msgstr "Mes pages uniquement"
+msgstr "Que mes pages"
 
 #: ../lib/plugin/RecentChanges.php:1472
 msgid "Major modifications only"
-msgstr "Modifications majeures uniquement"
+msgstr "Que les modifications majeures"
 
 #: ../lib/plugin/RecentChanges.php:1472
 msgid "All modifications"
@@ -4048,12 +3998,11 @@
 
 #: ../lib/plugin/RecentChanges.php:1483
 msgid "Page once only"
-msgstr "Une seule fois la page"
+msgstr "Une fois par page"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RecentChanges.php:1483
 msgid "Full changes"
-msgstr "Plusieurs fois la page"
+msgstr "Changements exhaustifs"
 
 #: ../lib/plugin/RecentChanges.php:1494
 msgid "Old and new pages"
@@ -4061,7 +4010,7 @@
 
 #: ../lib/plugin/RecentChanges.php:1494
 msgid "New pages only"
-msgstr "Nouvelles pages uniquement"
+msgstr "Que les nouvelles pages"
 
 #: ../lib/plugin/RecentComments.php:36 ../lib/plugin/RecentComments.php:53
 #: ../themes/MonoBook/templates/navbar.tmpl:17
@@ -4082,7 +4031,7 @@
 
 #: ../lib/plugin/RecentEdits.php:54
 msgid "Recent Edits"
-msgstr "Éditions récentes"
+msgstr "Modifications récentes"
 
 #: ../lib/plugin/RecentReferrers.php:33
 msgid "RecentReferrers"
@@ -4097,36 +4046,33 @@
 msgstr "RedirigerVers"
 
 #: ../lib/plugin/RedirectTo.php:47
-#, fuzzy
 msgid "Redirects to another URL or page."
 msgstr "Redirige vers une autre url ou page."
 
 #: ../lib/plugin/RedirectTo.php:68
 msgid "Illegal characters in external URL."
-msgstr ""
+msgstr "Caractère interdit dans une URL externe."
 
 #: ../lib/plugin/RedirectTo.php:72
-#, fuzzy
 msgid "Redirect to an external URL is only allowed in locked pages."
-msgstr "%s n'est autorisé que dans les pages verrouillées."
+msgstr ""
 
 #: ../lib/plugin/RedirectTo.php:81
-#, fuzzy
 msgid "'href' or 'page' parameter missing."
-msgstr "%s ou %s paramètre manquant"
+msgstr ""
 
 #: ../lib/plugin/RedirectTo.php:85
 #, php-format
 msgid "Recursive redirect to self: '%s'"
 msgstr "Redirection récursive vers soi-même: %s"
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr "La double redirection interdit."
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
-msgstr "Consultation des pages de redirection."
+msgstr "Voir la page de redirection."
 
 #: ../lib/plugin/RelatedChanges.php:37
 #, php-format
@@ -4134,16 +4080,13 @@
 msgstr " (aux pages liées à \"%s\")"
 
 #: ../lib/plugin/RelatedChanges.php:49
-#, fuzzy
 msgid "List of changes on all pages which are linked to from this page."
-msgstr "Liste des pages qui ne sont liées à aucune autre."
+msgstr ""
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RelatedChanges.php:57 ../lib/plugin/RelatedChanges.php:86
 msgid "Related Changes"
 msgstr "Changements liés"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RelatedChanges.php:86 ../themes/Crao/templates/navbar.tmpl:16
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 msgid "RelatedChanges"
@@ -4159,9 +4102,9 @@
 msgstr ""
 
 #: ../lib/plugin/_Retransform.php:48
-#, fuzzy, php-format
+#, php-format
 msgid "Retransform page '%s'"
-msgstr "ACL modifié pour la page %s."
+msgstr ""
 
 #: ../lib/plugin/RichTable.php:34
 msgid "RichTable"
@@ -4197,30 +4140,27 @@
 msgstr ""
 
 #: ../lib/plugin/SemanticRelations.php:35
-#, fuzzy
 msgid "SemanticRelations"
-msgstr "Annuler la notation"
+msgstr ""
 
 #: ../lib/plugin/SemanticRelations.php:38
-#, fuzzy
 msgid "Display the list of relations and attributes on this page."
-msgstr "Changer les attributs de cette page"
+msgstr ""
 
 #: ../lib/plugin/SemanticRelations.php:88
 #: ../lib/plugin/SemanticRelations.php:108 ../lib/plugin/SemanticSearch.php:58
-#, fuzzy
 msgid "SemanticSearch"
-msgstr "RechercheInterWiki"
+msgstr ""
 
 #: ../lib/plugin/SemanticRelations.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Semantic relations for %s"
-msgstr "Il manque %s pour %s"
+msgstr "Relations sémantiques pour %s"
 
 #: ../lib/plugin/SemanticRelations.php:122
 #, php-format
 msgid "Attributes of %s"
-msgstr ""
+msgstr "Attributs de %s"
 
 #: ../lib/plugin/SemanticRelations.php:132
 #: ../lib/plugin/SemanticRelations.php:133
@@ -4233,9 +4173,8 @@
 
 #: ../lib/plugin/SemanticSearchAdvanced.php:62
 #: ../lib/plugin/SemanticSearch.php:220
-#, fuzzy
 msgid "SemanticSearchAdvanced"
-msgstr "RechercheInterWiki"
+msgstr ""
 
 #: ../lib/plugin/SemanticSearchAdvanced.php:65
 msgid "Parse and execute a full query expression"
@@ -4250,7 +4189,6 @@
 msgstr ""
 
 #: ../lib/plugin/SemanticSearchAdvanced.php:117
-#, fuzzy
 msgid "Pagename(s): "
 msgstr "Nom de la page"
 
@@ -4270,18 +4208,16 @@
 msgstr "Relation"
 
 #: ../lib/plugin/SemanticSearch.php:61
-#, fuzzy
 msgid "Search relations and attributes"
-msgstr "Changer les attributs de cette page"
+msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:104
 msgid "Filter by this relation. With autocompletion."
 msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:122
-#, fuzzy
 msgid "Relations"
-msgstr "Liens correspondants"
+msgstr "Relations"
 
 #: ../lib/plugin/SemanticSearch.php:130 ../lib/plugin/SemanticSearch.php:209
 msgid "Add an AND query"
@@ -4313,7 +4249,7 @@
 
 #: ../lib/plugin/SemanticSearch.php:216
 msgid "Attributes"
-msgstr ""
+msgstr "Attributs"
 
 #: ../lib/plugin/SemanticSearch.php:217
 msgid "Search in pages for an attribute with that numeric value."
@@ -4321,21 +4257,20 @@
 
 #: ../lib/plugin/SemanticSearch.php:220
 msgid "Advanced..."
-msgstr ""
+msgstr "Avancée..."
 
 #: ../lib/plugin/SemanticSearch.php:285
 msgid "No relations nor attributes in the whole wikidb defined!"
 msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:287
-#, fuzzy
 msgid "Help:SemanticRelations"
-msgstr "Annuler la notation"
+msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:335
 #, php-format
 msgid "Illegal operator: %s"
-msgstr ""
+msgstr "Caractère interdit dans le nom."
 
 #: ../lib/plugin/SemanticSearch.php:383
 #, php-format
@@ -4348,7 +4283,7 @@
 
 #: ../lib/plugin/SemanticSearch.php:407
 msgid "Value"
-msgstr ""
+msgstr "Valeur"
 
 #: ../lib/plugin/SiteMap.php:51
 msgid "SiteMap"
@@ -4365,16 +4300,15 @@
 
 #: ../lib/plugin/SpellCheck.php:68
 msgid "Spell Checker"
-msgstr ""
+msgstr "Correcteur orthographique"
 
 #: ../lib/plugin/SpellCheck.php:71
 msgid "Check the spelling of a page and make suggestions"
 msgstr ""
 
 #: ../lib/plugin/SpellCheck.php:120
-#, fuzzy
 msgid "SpellCheck"
-msgstr "Sélectionner"
+msgstr ""
 
 #: ../lib/plugin/SpellCheck.php:121
 msgid "Cannot SpellCheck myself"
@@ -4409,77 +4343,73 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
-#, fuzzy
+#: ../lib/plugin/SyncWiki.php:110
 msgid "Syncing this PhpWiki"
-msgstr "Mise à jour du PhpWiki"
+msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 msgid "<unknown>"
-msgstr "<inconnue>"
+msgstr "<inconnu>"
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr " ignoré"
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
-#, fuzzy
+#: ../lib/plugin/SyncWiki.php:209
 msgid "Now upload all locally newer uploads."
-msgstr "Pas de fichier à déposer ?"
+msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
-#, fuzzy, php-format
+#: ../lib/plugin/SyncWiki.php:274
+#, php-format
 msgid "%s force"
-msgstr "%s mots"
+msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:276
-#, fuzzy, php-format
+#: ../lib/plugin/SyncWiki.php:278
+#, php-format
 msgid "Postponed %s for %s."
-msgstr "Il manque %s pour %s"
+msgstr "Pas de listes trouvées pour %1$s"
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
-#, fuzzy
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 msgid "skipped"
-msgstr " ignoré"
+msgstr "ignoré"
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
-#, fuzzy
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 msgid "same content"
-msgstr "pas de sommaire de page"
+msgstr "même contenu"
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr "ÉCHOUÉ"
@@ -4518,7 +4448,6 @@
 msgid "cached pagedata:"
 msgstr "page bufferisée :"
 
-# lib/pageinfo.php:70
 #: ../lib/plugin/SystemInfo.php:123
 msgid "cached versiondata:"
 msgstr "version bufferisée :"
@@ -4548,7 +4477,7 @@
 msgstr ""
 "De plus, essayez de conserver les dernières contributions de tous les "
 "auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne "
-"conservez en aucun cas plus que %d révisions par auteur."
+"conservez en aucun cas plus que %d versions par auteur."
 
 #: ../lib/plugin/SystemInfo.php:149
 #, php-format
@@ -4606,13 +4535,13 @@
 
 #: ../lib/plugin/SystemInfo.php:400
 #, php-format
-msgid "Application size: %d Kb"
-msgstr "Taille de l'application : %d Kb"
+msgid "Application size: %d KiB"
+msgstr "Taille de l'application : %d Kio"
 
 #: ../lib/plugin/SystemInfo.php:402
 #, php-format
-msgid "Pagedata size: %d Kb"
-msgstr "Taille des données de la page : %d Kb"
+msgid "Pagedata size: %d KiB"
+msgstr "Taille des données de la page : %d Kio"
 
 #: ../lib/plugin/SystemInfo.php:420
 #, php-format
@@ -4705,7 +4634,7 @@
 
 #: ../lib/plugin/SystemInfo.php:498
 msgid "Available plugins"
-msgstr "Plugins disponibles"
+msgstr "Greffons disponibles"
 
 #: ../lib/plugin/SystemInfo.php:499
 msgid "Supported languages"
@@ -4719,12 +4648,16 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr "insertion récursive de la page %s ignoré"
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr "TeX2png"
 
 #: ../lib/plugin/TeX2png.php:49
-#, fuzzy
 msgid ""
 "Convert Tex mathematicals expressions to cached png files. This is for small "
 "text"
@@ -4737,7 +4670,6 @@
 msgstr " (erreur de syntaxe pour latex) "
 
 #: ../lib/plugin/TeX2png.php:185
-#, fuzzy
 msgid "TeX imagepath not writable."
 msgstr "Répertoire TeX non accessible en écriture."
 
@@ -4780,11 +4712,10 @@
 msgid "Search the titles of all pages in this wiki."
 msgstr "Rechercher les titres de toutes les pages de ce wiki."
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/TitleSearch.php:92
-#, fuzzy, php-format
+#, php-format
 msgid "Title search results for '%s' (%d total)"
-msgstr "Résultat de recherche sur les titres de pages pour '%s'"
+msgstr "Résultat de recherche sur les titres de pages pour '%s' (%d au total)"
 
 # lib/fullsearch.php:48
 #: ../lib/plugin/TitleSearch.php:94
@@ -4802,7 +4733,7 @@
 
 #: ../lib/plugin/Transclude.php:60
 msgid "Transcluded page"
-msgstr "Page insérées"
+msgstr "Page insérée"
 
 #: ../lib/plugin/Transclude.php:103
 #, php-format
@@ -4814,7 +4745,7 @@
 msgid "Transcluded from %s"
 msgstr "Inséré de %s"
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr "TraduireUnTexte"
 
@@ -4856,7 +4787,6 @@
 msgid "Translate %s to %s in %s"
 msgstr "Traduire de %s à %s en %s"
 
-# lib/savepage.php:76
 #: ../lib/plugin/TranslateText.php:98
 msgid "Thanks for adding this translation!"
 msgstr "Merci d'avoir ajouté cette traduction."
@@ -4906,82 +4836,80 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr "Transférer les fichiers vers Upload:<filename>"
 
-#: ../lib/plugin/UpLoad.php:179
-#, fuzzy
+#: ../lib/plugin/UpLoad.php:178
 msgid "You cannot upload files."
-msgstr "Erreur: Impossible d'ouvrir le journal des fichiers déposés."
+msgstr ""
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 msgid "Check you are logged in."
-msgstr ""
+msgstr "Vous devez vous identifier"
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
-msgstr ""
+msgstr "Vérifiez que vous êtes dans le bon projet."
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
-msgstr ""
+msgstr "Vous êtes déjà membre de ce projet."
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr "ACCES REFUSE: Vous devez être connecté pour uploader."
 
-#: ../lib/plugin/UpLoad.php:213
-#, fuzzy, php-format
+#: ../lib/plugin/UpLoad.php:212
+#, php-format
 msgid "ERROR uploading '%s'"
 msgstr "ERREUR en déposant '%s' : "
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, php-format
 msgid "Files with extension %s are not allowed."
-msgstr "%s: extension interdit."
+msgstr "%s: extension interdite."
 
-#: ../lib/plugin/UpLoad.php:226
-#, fuzzy, php-format
+#: ../lib/plugin/UpLoad.php:225
+#, php-format
 msgid "Only files with the extension %s are allowed."
-msgstr "%s: extension interdit."
+msgstr ""
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr "Un fichier portant le nom '%s' existe déjà."
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
 msgstr "Désolé, mais le fichier est trop gros."
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
-msgstr "Fichier transféré avec succès."
+msgstr "Fichier téléchargé avec succès"
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, php-format
 msgid "uploaded %s"
-msgstr "dépôt de %s"
+msgstr "Téléchargé %s"
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 msgid "Uploading failed."
-msgstr "Échec du dépôt."
+msgstr "Le téléchargement a échoué."
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
-msgstr ""
+msgstr "Pas de fichier sélectionné. Merci d'en sélectionner un."
 
-#: ../lib/plugin/UpLoad.php:291
-#, fuzzy
+#: ../lib/plugin/UpLoad.php:290
 msgid "The upload logfile exists but is not writable."
-msgstr "Erreur : le journal des dépôts ne peut etre modifie."
+msgstr "Le journal des dépôts existe mais ne peut être modifié."
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 msgid "Can't open the upload logfile."
-msgstr "Erreur: Impossible d'ouvrir le journal des fichiers déposés."
+msgstr "Impossible d'ouvrir le journal des fichiers déposés."
 
 #: ../lib/plugin/UriResolver.php:36 ../lib/SemanticWeb.php:137
 msgid "UriResolver"
@@ -5009,23 +4937,23 @@
 
 #: ../lib/plugin/UserPreferences.php:106
 msgid "Your UserPreferences have been successfully reset to default."
-msgstr "Vos préférences ont été reinitialisees avec succès."
+msgstr "Vos préférences ont été réinitialisées avec succès"
 
 #: ../lib/plugin/UserPreferences.php:115
 msgid "Do you really want to reset all your UserPreferences?"
-msgstr "Voulez-vous réellement reinitialiser toutes vos préférences ?"
+msgstr "Voulez-vous réellement réinitialiser toutes vos préférences ?"
 
 #: ../lib/plugin/UserPreferences.php:123
 msgid "Wrong password. Try again."
-msgstr "Mot de passe invalide, essayez encore."
+msgstr "Erreur de mot de passe. Veuillez recommencer."
 
 #: ../lib/plugin/UserPreferences.php:140
 msgid "Password updated."
-msgstr "Mot de passe mis à jour."
+msgstr "Mot de passe mis à jour"
 
 #: ../lib/plugin/UserPreferences.php:142
 msgid "Password was not changed."
-msgstr "Mot de passe inchangé."
+msgstr "Le mot de passe n'a pas été mis à jour"
 
 #: ../lib/plugin/UserPreferences.php:145
 msgid "Password cannot be changed."
@@ -5037,21 +4965,20 @@
 
 #: ../lib/plugin/UserPreferences.php:154
 msgid "One UserPreferences field successfully updated."
-msgstr "Une préférence mise à jour avec succès."
+msgstr "Une préférence a été mise à jour avec succès."
 
 #: ../lib/plugin/UserPreferences.php:156
 #, php-format
 msgid "%d UserPreferences fields successfully updated."
-msgstr "%d préférences mises à jour avec succès."
+msgstr "%d préférences ont été mises à jour avec succès."
 
 #: ../lib/plugin/UserRatings.php:44
 msgid "UserRatings"
-msgstr "Statistiques d'utilisateur"
+msgstr "Évaluations par les pairs"
 
 #: ../lib/plugin/UserRatings.php:48
-#, fuzzy
 msgid "List the user's ratings."
-msgstr "Affiche la listes des pages les plus populaires."
+msgstr ""
 
 #: ../lib/plugin/UserRatings.php:81
 #, php-format
@@ -5082,18 +5009,16 @@
 msgstr "Note"
 
 #: ../lib/plugin/Video.php:49
-#, fuzzy
 msgid "Video"
-msgstr "Vues"
+msgstr ""
 
 #: ../lib/plugin/Video.php:53
 msgid "Display video in Flash"
-msgstr ""
+msgstr "Afficher une vidéo en Flash"
 
 #: ../lib/plugin/Video.php:72
-#, fuzzy
 msgid "Both 'url' or 'file' parameters missing."
-msgstr "%s ou %s paramètre manquant"
+msgstr ""
 
 #: ../lib/plugin/Video.php:74
 msgid "Choose only one of 'url' or 'file' parameters."
@@ -5115,7 +5040,6 @@
 msgid "Legend"
 msgstr "Légende"
 
-# lib/display.php:14
 #: ../lib/plugin/WantedPagesOld.php:30 ../lib/plugin/WantedPagesOld.php:58
 #: ../lib/plugin/WantedPages.php:39 ../lib/plugin/WantedPages.php:66
 msgid "WantedPages"
@@ -5126,14 +5050,13 @@
 msgstr "Afficher toutes les pages référencées qui n'existent pas."
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr "TraductionPgsrc"
 
 #: ../lib/plugin/WantedPagesOld.php:92
 #: ../themes/default/templates/online.tmpl:39
 msgid "<none>"
-msgstr "<aucune>"
+msgstr "<aucun>"
 
 #: ../lib/plugin/WantedPagesOld.php:107
 #, php-format
@@ -5147,7 +5070,7 @@
 
 #: ../lib/plugin/WantedPagesOld.php:143
 msgid "Count"
-msgstr "Compte"
+msgstr "Nombre"
 
 #: ../lib/plugin/WantedPages.php:75
 msgid "Wanted From"
@@ -5164,6 +5087,9 @@
 msgstr "Pages recherchées dans ce wiki :"
 
 #: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 msgid "WatchPage"
 msgstr "Suivre"
 
@@ -5182,22 +5108,22 @@
 #: ../lib/plugin/WatchPage.php:81
 #, php-format
 msgid "Do you %s want to add this page \"%s\" to your WatchList?"
-msgstr "Souhaitez-vous %s ajouter la page \"%s\" a votre liste de suivi ?"
+msgstr "Voulez-vous %s ajouter la page « %s » à votre liste de suivi ?"
 
 #: ../lib/plugin/WatchPage.php:82
 msgid "really"
 msgstr "vraiment"
 
 #: ../lib/plugin/WatchPage.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "The page %s is already watched!"
-msgstr "Cette page fait déjà partie de votre liste de suivi !"
+msgstr "Cette page %s fait déjà partie de votre liste de suivi !"
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -5205,10 +5131,14 @@
 msgid "Edit"
 msgstr "Modifier"
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+msgid "Watch Page"
+msgstr "Surveiller"
+
 #: ../lib/plugin/WatchPage.php:110
-#, fuzzy
 msgid "You must sign in to watch pages."
-msgstr "Vous devez vous inscrire pour %s."
+msgstr "Vous devez vous identifier pour surveiller des pages"
 
 #: ../lib/plugin/WatchPage.php:121
 msgid "ERROR: No email defined! You need to do this in your "
@@ -5236,7 +5166,7 @@
 #: ../lib/plugin/WhoIsOnline.php:78
 #, php-format
 msgid "%d online users"
-msgstr "%d visiteurs en ligne"
+msgstr "%d utilisateurs en ligne"
 
 #: ../lib/plugin/WhoIsOnline.php:106
 msgid "Guest"
@@ -5249,11 +5179,11 @@
 
 #: ../lib/plugin/WikiAdminChmod.php:39
 msgid "WikiAdminChmod"
-msgstr "AdministrationDePhpWiki/Droits"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminChmod.php:43 ../lib/plugin/WikiAdminSetAcl.php:45
 msgid "Set individual page permissions."
-msgstr "Régler les permissions de pages individuellement."
+msgstr "Modifier les permissions individuelles de la page."
 
 #: ../lib/plugin/WikiAdminChmod.php:72
 #, php-format
@@ -5271,42 +5201,48 @@
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
 #, php-format
-msgid "%s pages have been changed."
-msgstr "Les pages %s ont été changées."
+msgid "%d pages have been changed."
+msgstr "%d pages ont été modifiées."
 
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 msgid "No pages changed."
-msgstr "Aucune page changée."
+msgstr "Aucune page modifiée."
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
-msgstr "Supprimer la page maintenant"
+msgstr ""
+"Êtes-vous sûr de vouloir modifier de manière permanente les fichiers "
+"sélectionnés ?"
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Select the pages to change:"
 msgstr "Sélectionnez les pages à modifier :"
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr "Ce plugin est en cours de développement et ne marche pas !"
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr "Changer le mode de permission à :"
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr "(ugo : rwx)"
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr "Propager les nouvelles permissions aux sous-pages ?"
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr ""
 "(désactive les permissions individuelles par page, activer l'héritage) ?"
@@ -5316,9 +5252,8 @@
 msgstr "WikiAdminChown"
 
 #: ../lib/plugin/WikiAdminChown.php:40
-#, fuzzy
 msgid "Change owner of selected pages."
-msgstr "Changer le propriétaire des pages selectionnées."
+msgstr "Changer le propriétaire des pages sélectionnées."
 
 #: ../lib/plugin/WikiAdminChown.php:64 ../lib/plugin/WikiAdminMarkup.php:65
 #: ../lib/plugin/WikiAdminSearchReplace.php:95
@@ -5329,155 +5264,142 @@
 msgstr "Accès refusé pour changer la page '%s'."
 
 #: ../lib/plugin/WikiAdminChown.php:77
-#, fuzzy, php-format
+#, php-format
 msgid "Change owner of page '%s' to '%s'."
 msgstr "Changement de propriétaire %s à %s."
 
 #: ../lib/plugin/WikiAdminChown.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr "Impossible de changer le propriétaire '%s' à '%s'."
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been changed:"
+msgstr "Une page a été modifiée :"
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
-#, fuzzy, php-format
-msgid "%s pages have been permanently changed:"
-msgstr "%s pages ont été définitivement modifiées."
+#, php-format
+msgid "%d pages have been changed:"
+msgstr "%d pages ont été modifiées :"
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 msgid "PhpWikiAdministration/Chown"
 msgstr "AdministrationDePhpWiki/Chown"
 
-#: ../lib/plugin/WikiAdminChown.php:171
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+#: ../lib/plugin/WikiAdminChown.php:173
+msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
-"Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers "
-"sélectionnés ?"
+"Êtes-vous sûr de vouloir changer le propriétaire des pages sélectionnées ?"
 
-#: ../lib/plugin/WikiAdminChown.php:175
-#, fuzzy
+#: ../lib/plugin/WikiAdminChown.php:177
 msgid "Change owner of selected pages"
 msgstr "Changer le propriétaire des pages sélectionnées"
 
-#: ../lib/plugin/WikiAdminChown.php:176
-#, fuzzy
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Select the pages to change the owner"
-msgstr "Sélectionnez les pages qui vont chnager de propriétaire :"
+msgstr "Sélectionnez les pages dont vous voulez changer le propriétaire"
 
-#: ../lib/plugin/WikiAdminChown.php:198
-#, fuzzy
-msgid "Change owner"
-msgstr "Changer le proprietaire"
+#: ../lib/plugin/WikiAdminChown.php:200
+msgid "Change owner to: "
+msgstr "Changer le propriétaire par : "
 
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
-msgstr "à"
-
 #: ../lib/plugin/WikiAdminMarkup.php:36
 msgid "WikiAdminMarkup"
 msgstr ""
 
 #: ../lib/plugin/WikiAdminMarkup.php:40
-#, fuzzy
 msgid "Change the markup type of selected pages."
-msgstr "Changer le propriétaire des pages selectionnées."
+msgstr "Changer la syntaxe des pages sélectionnées."
 
 #: ../lib/plugin/WikiAdminMarkup.php:73
-#, fuzzy, php-format
+#, php-format
 msgid "Change markup type from %s to %s"
-msgstr "Changer le pays"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminMarkup.php:80
-#, fuzzy, php-format
+#, php-format
 msgid "change page '%s' to markup type '%s'."
-msgstr "Changement de propriétaire %s à %s."
+msgstr ""
 
 #: ../lib/plugin/WikiAdminMarkup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "Couldn't change page '%s' to markup type '%s'."
-msgstr "Impossible de changer le propriétaire '%s' à '%s'."
+msgstr ""
 
 #: ../lib/plugin/WikiAdminMarkup.php:109
-#, fuzzy
 msgid "PhpWikiAdministration/Markup"
-msgstr "AdministrationDePhpWiki"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+#: ../lib/plugin/WikiAdminMarkup.php:165
+msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
-"Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers "
-"sélectionnés ?"
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
-#, fuzzy
+#: ../lib/plugin/WikiAdminMarkup.php:169
 msgid "Change markup type"
-msgstr "Changer le pays"
+msgstr "Changer le type de syntaxe"
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
-#, fuzzy
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Select the pages to change the markup type"
-msgstr "Sélectionnez les pages qui vont chnager de propriétaire :"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
-#, fuzzy
-msgid "Change markup"
-msgstr "Changer le Mot de passe"
+#: ../lib/plugin/WikiAdminMarkup.php:192
+msgid "Change markup to: "
+msgstr ""
 
 #: ../lib/plugin/WikiAdminPurge.php:34
-#, fuzzy
 msgid "WikiAdminPurge"
-msgstr "WikiAdminSupprimer"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminPurge.php:38
-#, fuzzy
 msgid "Permanently purge all selected pages."
-msgstr "Supprimer toutes les pages sélectionnées en permanence."
+msgstr "Purger définitivement toutes les pages sélectionnées."
 
 #: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:53
-#, fuzzy, php-format
+#, php-format
 msgid "Purged page '%s' successfully."
-msgstr "Page '%s' supprimée avec succès."
+msgstr "Page '%s' purgée avec succès"
 
 #: ../lib/plugin/WikiAdminPurge.php:70
-#, fuzzy, php-format
+#, php-format
 msgid "Didn't purge page '%s'. Access denied."
-msgstr "Page '%s' non supprimée. Accès refusé."
+msgstr "Page '%s' non purgée. Accès refusé."
 
+#: ../lib/plugin/WikiAdminPurge.php:77
+msgid "One page has been permanently purged:"
+msgstr "Une page a été définitivement purgée :"
+
 #: ../lib/plugin/WikiAdminPurge.php:79
-#, fuzzy, php-format
-msgid "%s pages have been permanently purged:"
-msgstr "%d pages ont été définitivement supprimées."
+#, php-format
+msgid "%d pages have been permanently purged:"
+msgstr "%d pages ont été définitivement purgées :"
 
+#: ../lib/plugin/WikiAdminPurge.php:85
+msgid "No pages purged."
+msgstr "Aucune page purgée."
+
 #: ../lib/plugin/WikiAdminPurge.php:92
-#, fuzzy
 msgid "PhpWikiAdministration/Purge"
-msgstr "AdministrationDePhpWiki"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:144
-#, fuzzy
+#: ../lib/plugin/WikiAdminPurge.php:146
 msgid "Are you sure you want to permanently purge the following files?"
-msgstr "Supprimer la page maintenant"
+msgstr "Êtes-vous sûr de vouloir purger définitivement les pages suivantes ?"
 
-#: ../lib/plugin/WikiAdminPurge.php:147
-#, fuzzy
+#: ../lib/plugin/WikiAdminPurge.php:149
 msgid "Permanently purge selected pages"
-msgstr "Supprimer toutes les pages sélectionnées en permanence."
+msgstr "Purger définitivement les pages sélectionnées"
 
-#: ../lib/plugin/WikiAdminPurge.php:148
-#, fuzzy
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Select the files to purge"
-msgstr "Sélectionnez les pages à modifier :"
+msgstr "Sélectionnez les fichiers à purger"
 
 #: ../lib/plugin/WikiAdminRemove.php:40
 msgid "WikiAdminRemove"
-msgstr "WikiAdminSupprimer"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminRemove.php:44
 msgid "Permanently remove all selected pages."
@@ -5486,196 +5408,201 @@
 #: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:53
 #, php-format
 msgid "Removed page '%s' successfully."
-msgstr "Page '%s' supprimée avec succès."
+msgstr "Page '%s' supprimée avec succès"
 
 #: ../lib/plugin/WikiAdminRemove.php:114
-#, fuzzy, php-format
+#, php-format
 msgid "Didn't remove page '%s'. Access denied."
 msgstr "Page '%s' non supprimée. Accès refusé."
 
+#: ../lib/plugin/WikiAdminRemove.php:121
+msgid "One page has been removed:"
+msgstr "Une page a été supprimée :"
+
 #: ../lib/plugin/WikiAdminRemove.php:123
-#, fuzzy, php-format
-msgid "%s pages have been permanently removed:"
-msgstr "%d pages ont été définitivement supprimées."
+#, php-format
+msgid "%d pages have been removed:"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+#: ../lib/plugin/WikiAdminRemove.php:129
+msgid "No pages removed."
+msgstr "Aucune page n'a été supprimée."
+
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
-msgstr "AdministrationDePhpWiki/Supprimer"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "Supprimer"
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
-msgstr ""
-"Êtes-vous certain de vouloir supprimer définitivement les fichiers "
-"sélectionnés ?"
+#: ../lib/plugin/WikiAdminRemove.php:199
+msgid "Are you sure you want to remove the selected files?"
+msgstr "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?"
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr "Supprimer les pages sélectionnées"
 
-#: ../lib/plugin/WikiAdminRemove.php:201
-#, fuzzy
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Select the files to remove"
-msgstr "Sélectionner les pages à renommer :"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr "Même les pages qui ont été supprimées il y a au plus %s days."
 
-#: ../lib/plugin/WikiAdminRemove.php:211
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRemove.php:213
+#, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
-"(Les pages qui ont été supprimées il y a au plus %s jours sont déjà "
-"vérifiées.)"
+"Les pages qui ont été supprimées il y a au plus %s jours sont déjà cochées."
 
 #: ../lib/plugin/WikiAdminRename.php:36
 msgid "WikiAdminRename"
-msgstr "WikiAdminRenommer"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 msgid "Rename selected pages"
-msgstr "Renommer les pages sélectionnées."
+msgstr "Renommer les pages sélectionnées"
 
-#: ../lib/plugin/WikiAdminRename.php:79
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRename.php:80
+#, php-format
 msgid "Page '%s' already exists. Ignored."
-msgstr "La page %s existe déjà. Ignoré."
+msgstr "La page %s existe déjà. Ignorée."
 
-#: ../lib/plugin/WikiAdminRename.php:82
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRename.php:83
+#, php-format
 msgid "Access denied to rename page '%s'."
-msgstr "Accès refusé pour changer la page '%s'."
+msgstr "Accès refusé pour renommer la page '%s'."
 
-#: ../lib/plugin/WikiAdminRename.php:91
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRename.php:92
+#, php-format
 msgid "Renamed page from '%s' to '%s'"
-msgstr "Page '%s' renommées en '%s' avec succès."
+msgstr "Renommer la page de '%s' à '%s'"
 
-#: ../lib/plugin/WikiAdminRename.php:100
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminRename.php:101
+#, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
-msgstr "Page '%s' renommées en '%s' avec succès."
+msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page '%s' to '%s'."
-msgstr "Page '%s' renommées en '%s' avec succès."
+msgstr "Page '%s' renommée en '%s'."
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr "Impossible de renommer la page '%s' en '%s'."
 
-#: ../lib/plugin/WikiAdminRename.php:126
-#, fuzzy, php-format
-msgid "%s pages have been permanently renamed:"
-msgstr "%s pages ont été définitivement renommées."
+#: ../lib/plugin/WikiAdminRename.php:124
+msgid "One page has been renamed:"
+msgstr "Une page a été renommée :"
 
-#: ../lib/plugin/WikiAdminRename.php:132
-#, fuzzy
+#: ../lib/plugin/WikiAdminRename.php:127
+#, php-format
+msgid "%d pages have been renamed:"
+msgstr "%d pages ont été renommées :"
+
+#: ../lib/plugin/WikiAdminRename.php:133
 msgid "No pages renamed."
-msgstr "Aucune page renommée."
+msgstr "Aucune page n'a été renommée."
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr "Renommer en"
 
-#: ../lib/plugin/WikiAdminRename.php:209
-#, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
-msgstr "Êtes-vous certain de renommer définitivement les pages sélectionnées ?"
+#: ../lib/plugin/WikiAdminRename.php:211
+msgid "Are you sure you want to rename the selected pages?"
+msgstr "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?"
 
-#: ../lib/plugin/WikiAdminRename.php:213
-#, fuzzy
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 msgid "Rename page"
-msgstr "Supprimer la page"
+msgstr "Renommer la page"
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
-msgstr "Sélectionner les pages à renommer :"
+msgstr "Sélectionnez les pages à renommer :"
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 msgid "from"
 msgstr "de"
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr "à"
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 msgid "Regex?"
 msgstr "expression régulière ?"
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
-msgstr "Sensible à la casse ?"
+msgstr "Insensible à la casse ?"
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr "Changer les noms de pages dans toutes les pages liées ?"
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
-msgstr ""
+msgstr "Créer une redirection de l'ancien nom vers le nouveau ?"
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:36
 msgid "WikiAdminSearchReplace"
-msgstr "WikiAdminRemplacementRecherche"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:40
 msgid "Search and replace text in selected wiki pages."
 msgstr "Recherche puis remplace le texte dans les pages sélectionnées."
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:75
-#, fuzzy, php-format
+#, php-format
 msgid "Replace '%s' by '%s'"
-msgstr "Page '%s' renommées en '%s' avec succès."
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:86
 msgid "Error: Empty search string."
-msgstr "Erreur: chaîne vide invalide."
+msgstr "Erreur : la chaîne à rechercher est vide."
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:97
 #, php-format
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr "%s a bien été modifié par %s dans la page %s."
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr "ATTENTION: vous devez entrez au moins une lettre pour la recherche!"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr ""
 "Etes-vous sur de vouloir rechercher et remplacer dans les fichiers "
 "sélectionnées ?"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
-#, fuzzy
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 msgid "Select the pages to search and replace"
 msgstr ""
 "Sélectionner ci-dessous les pages dans lesquelles la recherche sera "
 "effectuée :"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 msgid "Replace"
-msgstr "Remplacer: "
+msgstr "Remplacer"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr "par"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
-#, fuzzy
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr "respect de la casse"
 
@@ -5702,11 +5629,11 @@
 #: ../lib/plugin/WikiAdminSelect.php:205
 #, php-format
 msgid "Selected page '%s' passed to '%s'."
-msgstr "%s passée à %s."
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetAcl.php:41
 msgid "WikiAdminSetAcl"
-msgstr "WikiAdminSetAcl"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetAcl.php:91
 #, php-format
@@ -5714,35 +5641,34 @@
 msgstr "ACL inchangé pour la page %s."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "ACL changed for page '%s'"
 msgstr "ACL modifié pour la page %s."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "from '%s'"
 msgstr "du %s"
 
 #: ../lib/plugin/WikiAdminSetAcl.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "to '%s'."
-msgstr "Chargement ' %s '"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetAcl.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "ACL changed for page '%s' from '%s' to '%s'."
-msgstr "ACL modifié pour la page %s."
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetAcl.php:123
 msgid "Invalid ACL"
-msgstr "Acl invalide"
+msgstr "ACL invalide"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 msgid "PhpWikiAdministration/SetAcl"
-msgstr "AdministrationDePhpWiki/DéfinirAcl"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
@@ -5750,72 +5676,63 @@
 "Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers "
 "sélectionnés ?"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 msgid "Change Access Rights"
 msgstr "Droits d'acces"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 msgid "Select the pages where to change access rights"
-msgstr "Sélectionnez les pages qui vont chnager de propriétaire :"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 msgid "Selected Pages: "
 msgstr "Pages sélectionnées : "
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 msgid "Type"
 msgstr "Type"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr "Les cases sélectionnées autorisent l'accès, sinon elles l'interdisent."
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr "Pour ignorer effacez la ligne."
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr "Pour ajouter cocher 'Add' près de la liste déroulante."
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 msgid "(Currently not working)"
-msgstr "(Non recommandé !)"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetExternal.php:35
-#, fuzzy
 msgid "WikiAdminSetExternal"
-msgstr "WikiAdminSetAcl"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetExternal.php:39
-#, fuzzy
 msgid "Mark selected pages as external."
-msgstr "Sélectionner les pages à renommer :"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetExternal.php:71
-#, fuzzy, php-format
+#, php-format
 msgid "change page '%s' to external."
-msgstr "Changement de propriétaire %s à %s."
+msgstr ""
 
 #: ../lib/plugin/WikiAdminSetExternal.php:95
-#, fuzzy
 msgid "PhpWikiAdministration/SetExternal"
-msgstr "AdministrationDePhpWiki/DéfinirAcl"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 msgid "Set pages to external"
-msgstr "Sélectionner les pages à renommer :"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 msgid "Select the pages to set as external"
 msgstr ""
-"Sélectionner ci-dessous les pages dans lesquelles la recherche sera "
-"effectuée :"
 
 #: ../lib/plugin/WikiAdminUtils.php:39
 msgid "WikiAdminUtils"
@@ -5825,122 +5742,120 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr "Plusieurs fonctions pour l'administration d'un wiki."
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, php-format
 msgid "Bad action requested: %s"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr "Vous devez être un administrateur pour utiliser ce plugin."
 
-#: ../lib/plugin/WikiAdminUtils.php:100
-#, fuzzy, php-format
+#: ../lib/plugin/WikiAdminUtils.php:102
+#, php-format
 msgid "WikiAdminUtils %s returned:"
-msgstr "WikiAdminUtils dit :"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:102
-#, fuzzy
+#: ../lib/plugin/WikiAdminUtils.php:104
 msgid "Back"
-msgstr "RétroLiens"
+msgstr "Retour"
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr "Purger le cache"
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 msgid "Purge all Pages With Invalid Names"
 msgstr "Supprimer les pages dont le nom n'est pas valide"
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr "Vérification de l'adresse électronique"
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr "Cache de marques purgé !"
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 msgid "No pages with bad names had to be deleted."
 msgstr "Aucune page supprimées avec un nom invalide."
 
-#: ../lib/plugin/WikiAdminUtils.php:147
+#: ../lib/plugin/WikiAdminUtils.php:149
 #, php-format
-msgid "Deleted %s pages with invalid names:"
-msgstr "%s pages ont été supprimées à cause de leur nom invalide:"
+msgid "Deleted %d pages with invalid names:"
+msgstr "%d pages ont été supprimées à cause de leur nom invalide:"
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr "[purgé]"
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 msgid "No empty, unreferenced pages were found."
-msgstr "Aucune page trouvée avec un nom invalide."
+msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:180
+#: ../lib/plugin/WikiAdminUtils.php:182
 #, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, php-format
 msgid "Converted successfully %d pages"
 msgstr "%d pages converties avec succès"
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr "Désolé. Restriction d'accès pas encore disponible"
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr "Adresse électronique"
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr "Vérification du statut"
 
-#: ../lib/plugin/WikiAdminUtils.php:233
-#, fuzzy
+#: ../lib/plugin/WikiAdminUtils.php:235
 msgid "Username"
-msgstr "Renommer"
+msgstr "utilisateur"
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr "Changer la vérification du statut"
 
@@ -5963,18 +5878,16 @@
 msgstr "%s on %s :"
 
 #: ../lib/plugin/WikicreoleTable.php:55
-#, fuzzy
 msgid "WikicreoleTable"
-msgstr "WikiPoll"
+msgstr ""
 
 #: ../lib/plugin/WikicreoleTable.php:59
-#, fuzzy
 msgid "Layout tables using the Wikicreole syntax."
-msgstr "Apparences de tableaux utilisant l'ancien modèle de balisage."
+msgstr ""
 
 #: ../lib/plugin/WikiForm.php:34
 msgid "WikiForm"
-msgstr "WikiForm"
+msgstr ""
 
 #: ../lib/plugin/WikiForm.php:38 ../lib/plugin/WikiFormRich.php:106
 msgid "Provide generic WikiForm input buttons"
@@ -6010,7 +5923,7 @@
 
 #: ../lib/plugin/WikiPoll.php:60
 msgid "WikiPoll"
-msgstr "WikiPoll"
+msgstr ""
 
 #: ../lib/plugin/WikiPoll.php:64
 msgid "Enable configurable polls"
@@ -6042,7 +5955,7 @@
 #: ../lib/plugin/WikiPoll.php:269 ../lib/plugin/WikiPoll.php:283
 #, php-format
 msgid "  %d%% (%d/%d)"
-msgstr "  %d%% (%d/%d)"
+msgstr ""
 
 #: ../lib/plugin/WikiPoll.php:299 ../lib/plugin/WikiPoll.php:301
 msgid "The result of this poll so far:"
@@ -6051,305 +5964,239 @@
 # lib/savepage.php:76
 #: ../lib/plugin/WikiPoll.php:299
 msgid "Thanks for participating!"
-msgstr "Merci d'avoir participé !"
+msgstr "Merci de votre participation !"
 
 #: ../lib/plugin/_WikiTranslation.php:47
-msgid "AddCommentPlugin"
-msgstr "AjoutDesCommentaires"
-
-#: ../lib/plugin/_WikiTranslation.php:48
-msgid "AddingPages"
-msgstr "AjouterDesPages"
-
-#: ../lib/plugin/_WikiTranslation.php:49
 msgid "AllPagesCreatedByMe"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:50
+#: ../lib/plugin/_WikiTranslation.php:48
 msgid "AllPagesLastEditedByMe"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:51
+#: ../lib/plugin/_WikiTranslation.php:49
 msgid "AllPagesOwnedByMe"
 msgstr "ToutesMesPages"
 
-#: ../lib/plugin/_WikiTranslation.php:52
-msgid "AuthorHistoryPlugin"
-msgstr "PluginHistoriqueAuteur"
-
-#: ../lib/plugin/_WikiTranslation.php:54
-msgid "CalendarListPlugin"
-msgstr "PluginListeDuCalendrier"
-
-#: ../lib/plugin/_WikiTranslation.php:55
-msgid "CalendarPlugin"
-msgstr "PluginCalendrier"
-
 # lib/diff.php:997
-#: ../lib/plugin/_WikiTranslation.php:57
+#: ../lib/plugin/_WikiTranslation.php:52
 msgid "CategoryHomePages"
 msgstr "CatégoriePagesAccueil"
 
-#: ../lib/plugin/_WikiTranslation.php:58
-msgid "CommentPlugin"
-msgstr "PluginCommenter"
-
-#: ../lib/plugin/_WikiTranslation.php:59
-msgid "CreateTocPlugin"
-msgstr "PluginCréerUneTdm"
-
-#: ../lib/plugin/_WikiTranslation.php:62
-msgid "EditMetaDataPlugin"
-msgstr "PluginÉditerMetaData"
-
-# lib/fullsearch.php:48
-#: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
-msgstr "PluginRechercheExterne"
-
-# lib/display.php:14
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
 #: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:30
 #: ../themes/MonoBook/templates/navbar.tmpl:36
 #: ../themes/Portland/templates/navbar.tmpl:6
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/Sidebar/templates/search.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
 #: ../themes/wikilens/templates/navbar.tmpl:19
 msgid "FindPage"
 msgstr "ChercherUnePage"
 
+# lib/stdlib.php:384 lib/stdlib.php:445
+#: ../lib/plugin/_WikiTranslation.php:56
+msgid "FullRecentChanges"
+msgstr "DernièresModifs"
+
+#: ../lib/plugin/_WikiTranslation.php:57
+msgid "Help/AddingPages"
+msgstr "Aide/AjouterDesPages"
+
+#: ../lib/plugin/_WikiTranslation.php:58
+msgid "Help/AddCommentPlugin"
+msgstr "Aide/AjoutDesCommentaires"
+
+#: ../lib/plugin/_WikiTranslation.php:59
+msgid "Help/AuthorHistoryPlugin"
+msgstr "Aide/PluginHistoriqueAuteur"
+
+#: ../lib/plugin/_WikiTranslation.php:60
+msgid "Help/CalendarListPlugin"
+msgstr "Aide/PluginListeDuCalendrier"
+
+#: ../lib/plugin/_WikiTranslation.php:61
+msgid "Help/CalendarPlugin"
+msgstr "Aide/PluginCalendrier"
+
+#: ../lib/plugin/_WikiTranslation.php:62
+msgid "Help/CommentPlugin"
+msgstr "Aide/PluginCommenter"
+
+#: ../lib/plugin/_WikiTranslation.php:63
+msgid "Help/CreateTocPlugin"
+msgstr "Aide/PluginCréerUneTdm"
+
+#: ../lib/plugin/_WikiTranslation.php:64
+msgid "Help/EditMetaDataPlugin"
+msgstr "Aide/PluginÉditerMetaData"
+
+# lib/fullsearch.php:48
 #: ../lib/plugin/_WikiTranslation.php:65
-msgid "FoafViewerPlugin"
-msgstr "PluginFoafViewer"
+msgid "Help/ExternalSearchPlugin"
+msgstr "Aide/PluginRechercheExterne"
 
 #: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
-msgstr "PluginInclureUnCadre"
+msgid "Help/FoafViewerPlugin"
+msgstr "Aide/PluginFoafViewer"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/_WikiTranslation.php:67
-msgid "FullRecentChanges"
-msgstr "DernièresModifs"
+msgid "Help/FrameIncludePlugin"
+msgstr "Aide/PluginInclureUnCadre"
 
 #: ../lib/plugin/_WikiTranslation.php:68
-msgid "HelloWorldPlugin"
-msgstr "PluginBonjourLeMonde"
+msgid "Help/HelloWorldPlugin"
+msgstr "Aide/PluginBonjourLeMonde"
 
 #: ../lib/plugin/_WikiTranslation.php:69
-msgid "HomePageAlias"
-msgstr "AliasAccueil"
+msgid "Help/IncludePagePlugin"
+msgstr "Aide/PluginInclureUnePage"
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
-msgstr "PluginInclureUnePage"
+msgid "Help/LinkIcons"
+msgstr "Aide/IcônesLiens"
 
 #: ../lib/plugin/_WikiTranslation.php:71
-msgid "InterWiki"
-msgstr "InterWiki"
+msgid "Help/MagicPhpWikiURLs"
+msgstr "Aide/URLMagiquesPhpWiki"
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
-msgstr "IcônesLiens"
+msgid "Help/MoreAboutMechanics"
+msgstr "Aide/DétailsTechniques"
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
-msgstr "URLMagiquesPhpWiki"
+msgid "Help/OldStyleTablePlugin"
+msgstr "Aide/PluginTableauAncienStyle"
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
-msgstr "DétailsTechniques"
+msgid "Help/PhotoAlbumPlugin"
+msgstr "Aide/PluginAlbumPhotos"
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
-msgstr "PageTestNouvellesMarques"
+msgid "Help/PhpHighlightPlugin"
+msgstr "Aide/PluginColorationPhp"
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
-msgstr "PageTestAnciennesMarques"
+msgid "Help/PhpWeatherPlugin"
+msgstr "Aide/PluginMétéoPhp"
 
 #: ../lib/plugin/_WikiTranslation.php:77
-msgid "OldStyleTablePlugin"
-msgstr "PluginTableauAncienStyle"
+msgid "Help/PhpWiki"
+msgstr "Aide/PhpWiki"
 
+#: ../lib/plugin/_WikiTranslation.php:78
+msgid "Help/PloticusPlugin"
+msgstr "Aide/PluginPloticus"
+
 #: ../lib/plugin/_WikiTranslation.php:79
-msgid "PageGroupTest"
-msgstr "TestGroupeDePages"
+msgid "Help/RawHtmlPlugin"
+msgstr "Aide/PluginHtmlPur"
 
 #: ../lib/plugin/_WikiTranslation.php:80
-msgid "PageGroupTest/Four"
-msgstr "TestGroupeDePages/Quatre"
+msgid "Help/RedirectToPlugin"
+msgstr "Aide/PluginRedirection"
 
 #: ../lib/plugin/_WikiTranslation.php:81
-msgid "PageGroupTest/One"
-msgstr "TestGroupeDePages/Un"
+msgid "Help/RichTablePlugin"
+msgstr "Aide/PluginBeauTableau"
 
 #: ../lib/plugin/_WikiTranslation.php:82
-msgid "PageGroupTest/Three"
-msgstr "TestGroupeDePages/Trois"
+msgid "Help/SystemInfoPlugin"
+msgstr "Aide/PluginInfosSystème"
 
 #: ../lib/plugin/_WikiTranslation.php:83
-msgid "PageGroupTest/Two"
-msgstr "TestGroupeDePages/Deux"
+msgid "Help/TranscludePlugin"
+msgstr "Aide/PluginInsérer"
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr "Aide/PluginListeSousPages"
+
 #: ../lib/plugin/_WikiTranslation.php:85
-msgid "PhotoAlbumPlugin"
-msgstr "PluginAlbumPhotos"
+msgid "Help/UpLoadPlugin"
+msgstr "Aide/PluginDéposer"
 
 #: ../lib/plugin/_WikiTranslation.php:86
-msgid "PhpHighlightPlugin"
-msgstr "PluginColorationPhp"
+msgid "Help/WabiSabi"
+msgstr "Aide/WabiSabi"
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
-msgstr "PluginMétéoPhp"
+msgid "Help/WikiBlogPlugin"
+msgstr "PluginWikiBlog"
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
-msgstr "PhpWiki"
+msgid "Help/WikiPlugin"
+msgstr "Aide/PluginWiki"
 
 #: ../lib/plugin/_WikiTranslation.php:89
+msgid "Help/WikiWikiWeb"
+msgstr "Aide/WikiWikiWeb"
+
+#: ../lib/plugin/_WikiTranslation.php:90
+msgid "HomePageAlias"
+msgstr "AliasAccueil"
+
+#: ../lib/plugin/_WikiTranslation.php:91
+msgid "InterWiki"
+msgstr "InterWiki"
+
+#: ../lib/plugin/_WikiTranslation.php:93
 msgid "PhpWikiAdministration/Chmod"
 msgstr "AdministrationDePhpWiki/Chmod"
 
-#: ../lib/plugin/_WikiTranslation.php:92
+#: ../lib/plugin/_WikiTranslation.php:96
 msgid "PhpWikiAdministration/Rename"
 msgstr "AdministrationDePhpWiki/Renommer"
 
-#: ../lib/plugin/_WikiTranslation.php:93
+#: ../lib/plugin/_WikiTranslation.php:97
 msgid "PhpWikiAdministration/Replace"
 msgstr "AdministrationDePhpWiki/Remplacer"
 
-#: ../lib/plugin/_WikiTranslation.php:95
+#: ../lib/plugin/_WikiTranslation.php:99
 #: ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "PhpWikiDocumentation"
 msgstr "DocumentationDePhpWiki"
 
-#: ../lib/plugin/_WikiTranslation.php:96
+#: ../lib/plugin/_WikiTranslation.php:100
 msgid "PhpWikiPoll"
 msgstr "SondagePhpWiki"
 
-#: ../lib/plugin/_WikiTranslation.php:97
-msgid "PloticusPlugin"
-msgstr "PluginPloticus"
-
-#: ../lib/plugin/_WikiTranslation.php:99
-msgid "PgsrcTranslation/de"
-msgstr "TraductionPgsrc/de"
-
-#: ../lib/plugin/_WikiTranslation.php:100
-msgid "PgsrcTranslation/fr"
-msgstr "TraductionPgsrc/fr"
-
 #: ../lib/plugin/_WikiTranslation.php:101
-msgid "PgsrcTranslation/it"
-msgstr "TraductionPgsrc/it"
-
-#: ../lib/plugin/_WikiTranslation.php:102
-msgid "PgsrcTranslation/es"
-msgstr "TraductionPgsrc/es"
-
-#: ../lib/plugin/_WikiTranslation.php:103
-msgid "PgsrcTranslation/nl"
-msgstr "TraductionPgsrc/nl"
-
-#: ../lib/plugin/_WikiTranslation.php:104
-msgid "PgsrcTranslation/sv"
-msgstr "TraductionPgsrc/sv"
-
-#: ../lib/plugin/_WikiTranslation.php:105
-msgid "PgsrcTranslation/ja"
-msgstr "TraductionPgsrc/ja"
-
-#: ../lib/plugin/_WikiTranslation.php:106
-msgid "PgsrcTranslation/zh"
-msgstr "TraductionPgsrc/zh"
-
-#: ../lib/plugin/_WikiTranslation.php:107
-msgid "RawHtmlPlugin"
-msgstr "PluginHtmlPur"
-
-#: ../lib/plugin/_WikiTranslation.php:108
 msgid "RecentVisitors"
 msgstr "VisiteursRécents"
 
-#: ../lib/plugin/_WikiTranslation.php:109
-msgid "RedirectToPlugin"
-msgstr "PluginRedirection"
-
-#: ../lib/plugin/_WikiTranslation.php:110
+#: ../lib/plugin/_WikiTranslation.php:102
 msgid "ReleaseNotes"
 msgstr "NotesDeVersion"
 
-#: ../lib/plugin/_WikiTranslation.php:111
-msgid "RichTablePlugin"
-msgstr "PluginBeauTableau"
-
-#: ../lib/plugin/_WikiTranslation.php:113
+#: ../lib/plugin/_WikiTranslation.php:104
 msgid "SteveWainstead"
 msgstr "SteveWainstead"
 
-#: ../lib/plugin/_WikiTranslation.php:114
-msgid "SystemInfoPlugin"
-msgstr "PluginInfosSystème"
-
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr "PluginInsérer"
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr "PluginListeSousPages"
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../lib/plugin/_WikiTranslation.php:106
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "UpLoad"
 msgstr "DéposerUnFichier"
 
-#: ../lib/plugin/_WikiTranslation.php:119
-msgid "UpLoadPlugin"
-msgstr "PluginDéposer"
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr "WabiSabi"
-
-#: ../lib/plugin/_WikiTranslation.php:121
-msgid "WikiBlogPlugin"
-msgstr "PluginWikiBlog"
-
-#: ../lib/plugin/_WikiTranslation.php:122
-msgid "WikiPlugin"
-msgstr "PluginWiki"
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr "WikiWikiWeb"
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr "_WikiTranslation"
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr "Affiche la traduction de quelques mots dans certaines pages."
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
@@ -6358,7 +6205,7 @@
 "A FAIRE: Google peut uniquement traduire l'anglais et le français. Trouver "
 "un service pour traduire %s en %s"
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr "Définir la traduction pour %s en %s"
@@ -6372,38 +6219,36 @@
 msgstr ""
 
 #: ../lib/plugin/YouTube.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Required argument %s missing"
-msgstr "Un argument requis '%s' est manquant."
+msgstr "Argument obligatoire %s manquant"
 
 #: ../lib/plugin/YouTube.php:104 ../lib/plugin/YouTube.php:106
 #: ../lib/plugin/YouTube.php:108 ../lib/plugin/YouTube.php:110
 #: ../lib/plugin/YouTube.php:134 ../lib/plugin/YouTube.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid argument %s"
 msgstr "Argument non valable : %s"
 
 #: ../lib/purgepage.php:18 ../lib/removepage.php:18
-#, fuzzy
 msgid "Sorry, this page does not exist."
-msgstr "Je suis désolé. Cet page n'est pas dans la base de données."
+msgstr "Désolé, cette page n'existe pas"
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 msgid "Purge Page"
 msgstr "Purger la page"
 
 #: ../lib/purgepage.php:25
-#, fuzzy, php-format
+#, php-format
 msgid "You are about to purge '%s'!"
-msgstr "Vous êtes sur le point de supprimer ' %s ' de façon permanente !"
+msgstr "Vous êtes sur le point de purger '%s' !"
 
-# lib/editpage.php:23
 #: ../lib/purgepage.php:44 ../lib/removepage.php:44
 msgid "Someone has edited the page!"
 msgstr "Quelqu'un a édité la page !"
 
 #: ../lib/purgepage.php:45
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
 "Please check to make sure you still want to permanently purge the page from "
@@ -6413,20 +6258,20 @@
 "enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez "
 "toujours retirer de façon permanente cette page de la base de données."
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr "Supprimer la page"
 
 #: ../lib/removepage.php:25
 #, php-format
 msgid "You are about to remove '%s'!"
-msgstr "Vous êtes sur le point de supprimer ' %s ' de façon permanente !"
+msgstr "Vous êtes sur le point de supprimer '%s' !"
 
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 "Depuis que vous avez entamé le processus d'effacement, quelqu'un a "
@@ -6439,7 +6284,7 @@
 
 #: ../lib/Request.php:706
 msgid "Upload error: file only partially received"
-msgstr ""
+msgstr "Erreur : le fichier n'a été que partiellement transmis"
 
 #: ../lib/Request.php:709
 msgid "Upload error: no file selected"
@@ -6451,145 +6296,145 @@
 
 #: ../lib/Request.php:821
 msgid "The PhpWiki access log file"
-msgstr "Le journal d'évènement de PhpWiki"
+msgstr "Le journal d'évènements de PhpWiki"
 
 #: ../lib/Request.php:824
 #, php-format
 msgid "the file '%s'"
-msgstr "le fichier %s"
+msgstr "le fichier « %s »"
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr "MAUVAIS URL -- retirez tous les <, >, \""
 
-#: ../lib/stdlib.php:474
-#, fuzzy, php-format
+#: ../lib/stdlib.php:475
+#, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr "Argument non valable : %s=%s"
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
-msgstr "Taille d'image non valables"
+msgstr "Taille d'image invalide"
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
-msgstr "MAUVAIS phpwiki: URL"
+msgstr ""
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
-msgstr "Verrouillez la page pour permettre le lien"
+msgstr ""
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
-msgstr "'%s': Nom de page invalide : : %s"
+msgstr ""
 
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
-msgstr "Mener %s n'est pas permis"
+msgstr ""
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
-msgstr "Espace blanc converti en espace simple"
+msgstr ""
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
-msgstr "Caractères de contrôle, non autorisés"
+msgstr ""
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
-msgstr "trop long"
+msgstr ""
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
-msgstr "Illégal %s supprimées"
+msgstr "Caractères interdits %s supprimés"
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
-msgstr "Révision Non Trouvée"
+msgstr "Version non trouvée"
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "Je suis désolé. La version %d de %s n'est pas dans la base de données."
 
-#: ../lib/stdlib.php:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
-msgstr "Mauvaise Version"
+msgstr "Mauvaise version"
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr "-???"
 
-#: ../lib/stdlib.php:1423
+#: ../lib/stdlib.php:1425
 #, php-format
-msgid "%s b"
-msgstr "%s b"
+msgid "%s B"
+msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr "%s octets"
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
-msgstr "%s k"
+msgid "%s KiB"
+msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
 #, php-format
-msgid "%s Kb (%s bytes)"
-msgstr "%s Ko (%s octets)"
+msgid "%s KiB (%s bytes)"
+msgstr "%s Kio (%s octets)"
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Impossible de mélanger les chaînes de type '%s' et '%s'"
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr "%s : index d'argument hors intervalle"
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s est vide."
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr "Impossible d'ouvrir le répertoire '%s' en lecture"
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr "OK"
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr "... (%s premiers mots)"
@@ -6609,7 +6454,6 @@
 
 #: ../lib/upgrade.php:73 ../lib/upgrade.php:104 ../lib/upgrade.php:108
 #: ../lib/upgrade.php:200 ../lib/upgrade.php:1119
-#, fuzzy
 msgid " Skipped"
 msgstr "Ignoré."
 
@@ -6632,49 +6476,42 @@
 
 #: ../lib/upgrade.php:118 ../lib/upgrade.php:168 ../lib/upgrade.php:384
 #: ../lib/upgrade.php:912 ../lib/upgrade.php:1000
-#, fuzzy, php-format
+#, php-format
 msgid "Check for necessary %s updates"
-msgstr "recherche les mises à jour nécessaire des pages sources"
+msgstr ""
 
 #: ../lib/upgrade.php:119 ../themes/MonoBook/templates/actionbar.tmpl:18
 #: ../themes/MonoBook/templates/actionbar.tmpl:31
 msgid "ActionPage"
-msgstr "Page d'action"
+msgstr ""
 
-# InfosAuthentification
 #: ../lib/upgrade.php:121
-#, fuzzy
 msgid "_AuthInfo"
-msgstr "InfosAuth"
+msgstr ""
 
 #: ../lib/upgrade.php:121
-#, fuzzy
 msgid "DebugAuthInfo"
-msgstr "InfosDeDéboguage"
+msgstr ""
 
 #: ../lib/upgrade.php:124
-#, fuzzy
 msgid "_GroupInfo"
-msgstr "InfosDeDéboguageGroupe"
+msgstr ""
 
-# InfosAuthentification
 #: ../lib/upgrade.php:124
-#, fuzzy
 msgid "GroupAuthInfo"
-msgstr "InfosAuth"
+msgstr ""
 
 #: ../lib/upgrade.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Check for necessary theme %s updates"
-msgstr "recherche les mises à jour nécessaire des pages sources"
+msgstr ""
 
 #: ../lib/upgrade.php:171
-#, fuzzy
 msgid "rename to Help: pages"
-msgstr "Renommer les pages sélectionnées."
+msgstr ""
 
 #: ../lib/upgrade.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "rename %s to %s"
 msgstr "retitrez la page de '%s' à '%s'"
 
@@ -6689,7 +6526,7 @@
 
 #: ../lib/upgrade.php:385
 msgid "database"
-msgstr "Base de données"
+msgstr "base de données"
 
 #: ../lib/upgrade.php:391
 msgid "CANCEL"
@@ -6700,12 +6537,11 @@
 msgstr ""
 
 #: ../lib/upgrade.php:408 ../lib/upgrade.php:428 ../lib/upgrade.php:437
-#, fuzzy, php-format
+#, php-format
 msgid "Check for table %s"
 msgstr "vérifie la table %s"
 
 #: ../lib/upgrade.php:452
-#, fuzzy
 msgid "Check for new session.sess_ip column"
 msgstr "recherche une nouvelle colonne session.sess_ip"
 
@@ -6720,11 +6556,9 @@
 msgstr "AJOUT"
 
 #: ../lib/upgrade.php:471
-#, fuzzy
 msgid "Check for mysql session.sess_id sanity"
-msgstr "recherche une nouvelle colonne session.sess_ip"
+msgstr ""
 
-# lib/diff.php:1003 lib/diff.php:1021
 #: ../lib/upgrade.php:485 ../lib/upgrade.php:490 ../lib/upgrade.php:527
 #: ../lib/upgrade.php:536
 msgid "fixed"
@@ -6740,14 +6574,12 @@
 msgstr "version <em>%s</em> non affectée"
 
 #: ../lib/upgrade.php:559
-#, fuzzy
 msgid "Check for mysql page.id auto_increment flag"
-msgstr "vérifie le marqueur auto_increment pour page.id"
+msgstr ""
 
 #: ../lib/upgrade.php:596
-#, fuzzy
 msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
-msgstr "vérifier la recherche binaire de bug pour mysql 4.1.x (Windows)"
+msgstr ""
 
 #: ../lib/upgrade.php:599 ../lib/upgrade.php:615 ../lib/upgrade.php:636
 #, php-format
@@ -6772,12 +6604,10 @@
 msgstr ""
 
 #: ../lib/upgrade.php:678
-#, fuzzy
 msgid "FIXING"
-msgstr "MANQUANT"
+msgstr ""
 
 #: ../lib/upgrade.php:681 ../lib/upgrade.php:889
-#, fuzzy
 msgid "FAIL"
 msgstr "ÉCHOUÉ"
 
@@ -6802,7 +6632,6 @@
 msgstr "DB admin mot de passe :"
 
 #: ../lib/upgrade.php:815
-#, fuzzy
 msgid "Check for extra page.cached_html column"
 msgstr "recherche une extra colonne page.cached_html"
 
@@ -6819,19 +6648,18 @@
 msgstr ""
 
 #: ../lib/upgrade.php:913
-#, fuzzy
 msgid "plugin argument"
-msgstr "Argument non valable : %s"
+msgstr ""
 
 #: ../lib/upgrade.php:957
-#, fuzzy, php-format
+#, php-format
 msgid "file %s not found"
-msgstr "%s non trouvé"
+msgstr "fichier %s non trouvé"
 
 #: ../lib/upgrade.php:984
-#, fuzzy, php-format
+#, php-format
 msgid "%s not found in %s"
-msgstr "%s non trouvé"
+msgstr "%s non trouvé dans %s"
 
 #: ../lib/upgrade.php:991
 #, php-format
@@ -6839,14 +6667,14 @@
 msgstr "impossible de déplacer %s en %s"
 
 #: ../lib/upgrade.php:995
-#, fuzzy, php-format
+#, php-format
 msgid "file %s is not writable"
 msgstr "%s n'est pas accessible en écriture"
 
 #: ../lib/upgrade.php:1005 ../lib/upgrade.php:1015 ../lib/upgrade.php:1025
-#, fuzzy, php-format
+#, php-format
 msgid "Check for %s"
-msgstr "vérifie la table %s"
+msgstr "Cases à cocher"
 
 #: ../lib/upgrade.php:1007
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
@@ -6902,12 +6730,11 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiBD::renamePage() pas encore implémentée pour le Principal"
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
-msgstr "%s : la date de la nouvelle révision est %s"
+msgstr "%s : la date de la nouvelle version est %s"
 
-# lib/display.php:31 lib/editpage.php:50
 #: ../lib/WikiDB.php:1661 ../lib/WikiDB.php:1665
 #: ../themes/default/templates/homepage.tmpl:7
 #, php-format
@@ -6917,7 +6744,7 @@
 #: ../lib/WikiDB.php:1700
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
-msgstr "Ouille ! La révision %s de %s semble avoir été effacée !"
+msgstr "Ouille ! La version %s de %s semble avoir été effacée !"
 
 #: ../lib/WikiGroup.php:27 ../lib/WikiGroup.php:131
 msgid "No or unsupported GROUP_METHOD defined"
@@ -6929,7 +6756,7 @@
 
 #: ../lib/WikiGroup.php:31
 msgid "Anonymous Users"
-msgstr "Utilisateur anonyme"
+msgstr "Utilisateurs anonymes"
 
 #: ../lib/WikiGroup.php:32
 msgid "Bogo Users"
@@ -6937,15 +6764,15 @@
 
 #: ../lib/WikiGroup.php:33
 msgid "Signed Users"
-msgstr "Utilisateurs signés"
+msgstr "Utilisateurs inscrits"
 
 #: ../lib/WikiGroup.php:34
 msgid "Authenticated Users"
-msgstr "Utilisateurs connectés"
+msgstr "Utilisateurs authentifiés"
 
 #: ../lib/WikiGroup.php:35
 msgid "Administrators"
-msgstr "Administrateures"
+msgstr "Administrateurs"
 
 #: ../lib/WikiGroup.php:185 ../lib/WikiGroup.php:232 ../lib/WikiGroup.php:314
 #: ../lib/WikiGroup.php:373 ../lib/WikiGroup.php:389
@@ -6985,7 +6812,7 @@
 #: ../lib/WikiGroup.php:951
 #, php-format
 msgid "%s not defined"
-msgstr "%s : non défini"
+msgstr "%s non défini"
 
 #: ../lib/WikiGroup.php:961
 msgid "No LDAP in this PHP version"
@@ -6994,26 +6821,24 @@
 #: ../lib/WikiGroup.php:1050
 #, php-format
 msgid "Unable to connect to LDAP server %s"
-msgstr "Impossible de se connecter au serveur LDAP %s"
+msgstr "Impossible de se connecter à l'annuaire LDAP de l'hôte %s"
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
-msgstr ""
+msgstr "Connaissances :"
 
 #: ../lib/wikilens/PageListColumns.php:372
 msgid "# things"
-msgstr ""
+msgstr "Nb d'éléments"
 
 #: ../lib/wikilens/PageListColumns.php:378
-#, fuzzy
 msgid "Rating"
-msgstr "Statistiques d'utilisateur"
+msgstr "Classement"
 
-# lib/pageinfo.php:10 lib/stdlib.php:239
 #: ../lib/wikilens/PageListColumns.php:381
 msgid "Go?"
-msgstr "Allons-y ?"
+msgstr "Continuer?"
 
 #: ../lib/wikilens/PageListColumns.php:384
 msgid "MinMisery"
@@ -7021,13 +6846,13 @@
 
 #: ../lib/wikilens/PageListColumns.php:387
 msgid "Avg. Rating"
-msgstr "Cote moyenne"
+msgstr "Note moyenne"
 
 #: ../lib/wikilens/PageListColumns.php:390
 msgid "Top Recommendations"
-msgstr ""
+msgstr "Meilleures recommandations"
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr "Membres :"
 
@@ -7055,17 +6880,17 @@
 #: ../lib/WikiPlugin.php:357
 #, php-format
 msgid "Plugin %s failed."
-msgstr "Plugin %s a échoué."
+msgstr "Échec du greffon %s."
 
 #: ../lib/WikiPlugin.php:363
 #, php-format
 msgid "Plugin %s disabled."
-msgstr "Plugin %s désactivé."
+msgstr "Greffon %s désactivé."
 
 #: ../lib/WikiPlugin.php:486 ../lib/WikiPlugin.php:503
-#, fuzzy, php-format
+#, php-format
 msgid "Plugin '%s' does not exist."
-msgstr "Le groupe de page %s n'existe pas"
+msgstr "Le greffon %s n'existe pas."
 
 #: ../lib/WikiPlugin.php:506
 #, php-format
@@ -7077,71 +6902,64 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr "%s n'est pas une sous classe de WikiPlugin."
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 msgid "Never edited"
 msgstr "Jamais éditée"
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr "%s à %s"
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, php-format
-msgid "Version %s, saved %s"
-msgstr "Version %s, enregistrée %s"
+msgid "Version %s, saved on %s"
+msgstr "Version %s, enregistrée le %s"
 
-# lib/diff.php:1003 lib/diff.php:1021
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, php-format
 msgid "Last edited %s"
-msgstr "Dernière modification %s"
+msgstr "Dernière modification le %s"
 
 #: ../lib/WikiTheme.php:473
 #, php-format
-msgid "Version %s, saved on %s"
-msgstr "Version %s, enregistrée sur %s"
-
-# lib/diff.php:1003 lib/diff.php:1021
-#: ../lib/WikiTheme.php:475
-#, php-format
 msgid "Last edited on %s"
 msgstr "Dernière modification le %s"
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr "aujourd'hui"
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr "hier"
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, php-format
 msgid "Owner: %s"
 msgstr "Propriétaire : %s"
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
-msgstr "Aucune correspondance de lien pour %s."
+msgstr "Lien vide vers : %s"
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
-msgstr "Enregistrée : %s"
+msgstr "Créer : %s"
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr "Google: %s"
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
-msgstr "%s : Nom de page invalide"
+msgstr "'%s' : nom de page non valide"
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -7152,71 +6970,72 @@
 #: ../themes/Wordpress/templates/signin.tmpl:17
 #: ../themes/Wordpress/templates/signin.tmpl:33
 msgid "Sign Out"
-msgstr "Déconnexion"
+msgstr "Se déconnecter"
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
-msgstr "Connexion"
+msgstr "S'identifier"
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 msgid "Rename Page"
 msgstr "Renommer la page"
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Verrouiller la page"
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Déverrouiller la page"
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr "Imprimante"
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
-msgstr "Barres d'outils en haut et en bas"
+msgstr ""
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr "Moderne"
 
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s: non défini"
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr "Liens correspondants"
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr "Liens externes"
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7240,13 +7059,13 @@
 #: ../lib/WikiUser/OpenID.php:208 ../lib/WikiUser/OpenID.php:233
 #, php-format
 msgid "The PECL %s extension cannot be loaded."
-msgstr ""
+msgstr "L'extension PECL %s ne peut être chargée."
 
 #: ../lib/WikiUser/Facebook.php:40 ../lib/WikiUser/Facebook.php:81
 #: ../lib/WikiUser/OpenID.php:209 ../lib/WikiUser/OpenID.php:234
-#, fuzzy, php-format
+#, php-format
 msgid " %s AUTH ignored."
-msgstr "%s non valable ignoré"
+msgstr ""
 
 #: ../lib/WikiUser/Facebook.php:52
 #, php-format
@@ -7281,48 +7100,48 @@
 
 #: ../lib/WikiUser/LDAP.php:208
 msgid "Wrong password: "
-msgstr "Mot de passe invalide, essayez encore."
+msgstr "Mot de passe invalide : "
 
 #: ../lib/WikiUser/LDAP.php:214
 #, php-format
 msgid "Could not connect to LDAP host %s"
-msgstr "Impossible de se connecter à l'annuaire LDAP de l'hôte %s"
+msgstr ""
 
 #: ../lib/WikiUser/LDAP.php:225
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
-msgstr "Mot de identifiant d'utilisateur '%s' pour LDAP Auth invalide."
+msgstr "Utilisateur non valide '%s' dans l'annuaire LDAP"
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 msgid "Invalid password."
-msgstr "Mauvais mot de passe."
+msgstr "Mot de passe invalide."
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
-msgstr "Mot de passe ou identifiant d'utilisateur invalide."
+msgstr "Mot de passe ou utilisateur non valide :"
 
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr "Permissions insuffisantes."
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu."
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr "Les préférences par défaut seront utilisées."
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7331,12 +7150,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:1338
+#: ../lib/WikiUserNew.php:1340
 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:1339
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -7344,11 +7163,11 @@
 "Veuillez définir ENCRYPTED_PASSWD à false dans config/config.ini et "
 "probablement l'ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "Veuillez définir ENCRYPTED_PASSWD à true dans config/config.ini."
 
-#: ../lib/WikiUserNew.php:1781
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7361,15 +7180,15 @@
 "sera utilisé pour les notifications de changements de pages.\n"
 "Voir %s"
 
-#: ../lib/WikiUserNew.php:1841
+#: ../lib/WikiUserNew.php:1843
 #, php-format
-msgid "E-Mail address '%s' is not properly formatted"
-msgstr "L'adresse électronique '%s' ne semble pas être correcte."
+msgid "E-mail address '%s' is not properly formatted"
+msgstr "L'adresse électronique '%s' ne semble pas être bien formée."
 
-#: ../lib/WikiUserNew.php:1845
+#: ../lib/WikiUserNew.php:1847
 #, php-format
-msgid "E-Mail address '%s' is properly formatted"
-msgstr "L'adresse électronique '%s' semble être correcte."
+msgid "E-mail address '%s' is properly formatted"
+msgstr "L'adresse électronique '%s' semble être bien formée."
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
@@ -7404,7 +7223,6 @@
 "Vous avez oublié de mettre ENCRYPTED_PASSWD à true. Veuillez éditer votre "
 "config/config.ini"
 
-# lib/editpage.php:31 lib/savepage.php:52
 #: ../lib/WikiUser.php:380
 msgid ""
 "Your home page has not been created yet so your preferences cannot not be "
@@ -7418,13 +7236,12 @@
 msgid "Your home page is locked so your preferences cannot not be saved."
 msgstr ""
 "Cette page a été verrouillée par l'administrateur et vos changements n'ont "
-"pas pu être enregistrée."
+"pas pu être enregistrés."
 
 #: ../lib/WikiUser.php:398
 msgid "Please contact your PhpWiki administrator for assistance."
 msgstr "Veuillez contacter l'administrateur pour l'assistance."
 
-# lib/diff.php:997
 #: ../lib/WikiUser.php:456 ../themes/default/templates/homepage.tmpl:37
 msgid "CategoryHomepage"
 msgstr "CatégoriePagesAccueil"
@@ -7443,7 +7260,7 @@
 "Old UserPage %s without stored password updated with empty password. Set a "
 "password in your UserPreferences."
 msgstr ""
-"L'anciene page %s sans mot de passe attribué a été mise à jour avec un mot "
+"L'ancienne page %s sans mot de passe attribué a été mise à jour avec un mot "
 "de passe vide. Définissez un mot de passe dans vos PréférencesUtilisateurs."
 
 #: ../lib/WikiUser/POP3.php:77
@@ -7533,23 +7350,21 @@
 msgid "About"
 msgstr "À propos de"
 
-# lib/pageinfo.php:10 lib/stdlib.php:239
 #: ../themes/blog/templates/actionbar.tmpl:13
-#, fuzzy
 msgid "HowTo"
-msgstr "AllerVers"
+msgstr ""
 
 #: ../themes/blog/templates/actionbar.tmpl:15
 #: ../themes/smaller/templates/actionbar.tmpl:36
 msgid "Info"
-msgstr "Info"
+msgstr ""
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7557,25 +7372,22 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
-msgstr "Afficher la source"
+msgstr "Voir la source"
 
 #: ../themes/blog/templates/blogform.tmpl:10
 #: ../themes/default/templates/blogform.tmpl:10
 #: ../themes/fusionforge/templates/blogform.tmpl:10
-#, fuzzy
 msgid "Headline"
-msgstr "Texte de début de ligne"
+msgstr ""
 
-# lib/diff.php:997
 #: ../themes/blog/templates/blogform.tmpl:18
 #: ../themes/default/templates/blogform.tmpl:18
 #: ../themes/fusionforge/templates/blogform.tmpl:18
-#, fuzzy
 msgid "Add Entry"
-msgstr "AjoutezCatégorie"
+msgstr "Ajouter une entrée"
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7587,9 +7399,8 @@
 #: ../themes/Portland/templates/editpage.tmpl:83
 #: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/Wordpress/templates/editpage.tmpl:96
-#, fuzzy
 msgid "Help/GoodStyle"
-msgstr "StyleCorrect"
+msgstr "Aide/StyleCorrect"
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7612,9 +7423,8 @@
 #: ../themes/fusionforge/templates/editpage.tmpl:79
 #: ../themes/Portland/templates/editpage.tmpl:84
 #: ../themes/Wordpress/templates/editpage.tmpl:97
-#, fuzzy
 msgid "Help/TextFormattingRules"
-msgstr "RèglesDeFormatageDesTextes"
+msgstr "Aide/RèglesDeFormatageDesTextes"
 
 #: ../themes/blog/templates/blogform.tmpl:25
 #: ../themes/Crao/templates/editpage.tmpl:94
@@ -7632,18 +7442,16 @@
 msgid "Synopsis"
 msgstr "Vue d'ensemble"
 
-# lib/diff.php:1010 lib/diff.php:1028
 #: ../themes/blog/templates/browse.tmpl:6
 #: ../themes/blog/templates/viewsource.tmpl:7
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7654,25 +7462,22 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
-msgstr "Vous lisez une ancienne révision de cette page."
+msgstr "Vous lisez une ancienne version de cette page."
 
 # lib/pageinfo.php:64
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7683,22 +7488,22 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
-msgstr "L'exécution de la page a pris %s seconds"
+msgstr "L'exécution de la page a pris %s secondes"
 
 #: ../themes/blog/templates/info.tmpl:8
 #: ../themes/MonoBook/templates/info.tmpl:189
 #: ../themes/smaller/templates/info.tmpl:12
 msgid "Diff previous Revision"
-msgstr "Différence avec la révision précédente"
+msgstr "Différences avec la version précédente"
 
 #: ../themes/blog/templates/info.tmpl:9
 #: ../themes/MonoBook/templates/info.tmpl:190
 #: ../themes/smaller/templates/info.tmpl:13
 msgid "Diff previous Author"
-msgstr "Auteur précédent"
+msgstr "Différences avec l'auteur précédent"
 
 #: ../themes/blog/templates/navbar.tmpl:7
 #: ../themes/MonoBook/templates/navbar.tmpl:12
@@ -7710,7 +7515,7 @@
 #: ../themes/default/templates/navbar.tmpl:42
 #: ../themes/wikilens/templates/navbar.tmpl:32
 msgid "Admin"
-msgstr "Administrateur"
+msgstr "Administration"
 
 #: ../themes/blog/templates/sidebar.tmpl:8
 #: ../themes/blog/templates/sidebar.tmpl:12
@@ -7719,26 +7524,22 @@
 
 #: ../themes/blog/templates/top.tmpl:16
 msgid "Page Trail"
-msgstr "Trace Page"
+msgstr "File d'Ariane"
 
-# lib/editpage.php:31 lib/savepage.php:52
 #: ../themes/blog/templates/viewsource.tmpl:8
 #: ../themes/default/templates/viewsource.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:6
 #: ../themes/Portland/templates/viewsource.tmpl:6
 #: ../themes/Wordpress/templates/viewsource.tmpl:11
-#, fuzzy
 msgid "This page has been locked and cannot be edited."
-msgstr ""
-"Cette page a été verrouillée par l'administrateur et ne peut pas être "
-"modifiée."
+msgstr "Cette page a été verrouillée et ne peut pas être modifiée."
 
-# lib/pageinfo.php:64
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
-#, fuzzy
 msgid "View the current version."
 msgstr "Visualiser la version actuelle"
 
@@ -7757,43 +7558,43 @@
 msgid "Comments on %s by %s."
 msgstr "Commentaire le %s par %s."
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 msgid "SignOut"
-msgstr "Déconnexion"
+msgstr "Se déconnecter"
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 msgid "SignIn"
-msgstr "Connexion"
+msgstr "S'identifier"
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
-msgstr "Verrouillée"
+msgstr "Verrouiller"
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 msgid "Unlock"
 msgstr "Déverrouiller"
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 msgid "blog"
 msgstr "blog"
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr "(diff)"
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/actionbar.tmpl:18
 msgid "Edit Old Revision"
-msgstr "Éditer l'ancienne révision"
+msgstr "Modifier une ancienne version"
 
 #: ../themes/Crao/templates/actionbar.tmpl:34
 #: ../themes/default/templates/actionbar.tmpl:44
@@ -7828,7 +7629,7 @@
 #: ../themes/default/templates/editpage.tmpl:10
 #: ../themes/fusionforge/templates/editpage.tmpl:7
 msgid "edit area"
-msgstr "Zone d'édition"
+msgstr "zone d'édition"
 
 #: ../themes/Crao/templates/editpage.tmpl:9
 #: ../themes/default/templates/editpage.tmpl:9
@@ -7900,21 +7701,28 @@
 #: ../themes/default/templates/editpage.tmpl:118
 #: ../themes/Portland/templates/editpage.tmpl:79
 #: ../themes/Wordpress/templates/editpage.tmpl:92
-#, fuzzy
 msgid "Help/OldTextFormattingRules"
-msgstr "RèglesDeFormatageDesTextes"
+msgstr "Aide/RèglesDeFormatageDesTextes"
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr "CommentUtiliserWiki"
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr "WikiWikiWeb"
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7922,7 +7730,6 @@
 msgid "Today"
 msgstr "Aujourd'hui"
 
-# lib/fullsearch.php:48
 #: ../themes/Crao/templates/navbar.tmpl:47
 #: ../themes/default/templates/search.tmpl:20
 #: ../themes/default/templates/search.tmpl:25
@@ -7951,26 +7758,24 @@
 msgid "Remove Comment"
 msgstr "Supprimer le commentaire"
 
-# lib/diff.php:1003 lib/diff.php:1021
 #: ../themes/default/templates/comment.tmpl:18
 #: ../themes/default/templates/wikiblog.tmpl:18
 #, php-format
 msgid "Modified on %s by %s"
 msgstr "Modifié le %s par %s"
 
-# lib/diff.php:1006 lib/diff.php:1024
 #: ../themes/default/templates/comment.tmpl:28
 #, php-format
 msgid "%s by %s"
 msgstr "%s par %s"
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
-msgstr ", RAM: %s"
+msgstr ", mémoire : %s"
 
 #: ../themes/default/templates/dialog.tmpl:18
 msgid "Dialog"
@@ -7979,32 +7784,31 @@
 #: ../themes/default/templates/editpage.tmpl:81
 #: ../themes/fusionforge/templates/editpage.tmpl:62
 msgid "Make the page read-only?"
-msgstr ""
+msgstr "Rendre la page non modifiable ?"
 
 #: ../themes/default/templates/editpage.tmpl:83
 msgid "Export to a seperate public area?"
-msgstr ""
+msgstr "Exporter dans une zone publique distincte ?"
 
 #: ../themes/default/templates/editpage.tmpl:83
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Public"
-msgstr ""
+msgstr "Public"
 
 #: ../themes/default/templates/forumadd.tmpl:11
 #: ../themes/default/templates/wikiforum.tmpl:20
 msgid "Post new"
-msgstr "Poster un nouveau"
+msgstr "Poster une annonce"
 
 #: ../themes/default/templates/forumadd.tmpl:13
 msgid "Title:"
-msgstr "Titre :"
+msgstr "Titre :"
 
 #: ../themes/default/templates/forumadd.tmpl:17
 #: ../themes/default/templates/wikiforum.tmpl:29
 msgid "Reply"
 msgstr "Répondre"
 
-# lib/msql.php:31 lib/msql.php:37
 #: ../themes/default/templates/forumadd.tmpl:22
 msgid "Add Message"
 msgstr "Ajouter un message"
@@ -8016,12 +7820,12 @@
 
 #: ../themes/default/templates/homepage.tmpl:13
 msgid "(Your preferences are stored as hidden data within this page)."
-msgstr "Vos préférences sont enregistrées en mode invisible sur cette page."
+msgstr "(Vos préférences sont enregistrées en mode invisible sur cette page.)"
 
 #: ../themes/default/templates/homepage.tmpl:16
 #, php-format
 msgid "The %s subpage enables simple weblogging."
-msgstr "Les sous pages de %s permettent le simple weblogging."
+msgstr "Les sous-pages de %s permettent l'utilisation d'un blog simple."
 
 #: ../themes/default/templates/info.tmpl:31
 #: ../themes/MonoBook/templates/info.tmpl:38
@@ -8034,7 +7838,6 @@
 msgid "%s words"
 msgstr "%s mots"
 
-# lib/diff.php:1001 lib/diff.php:1019
 #: ../themes/default/templates/info.tmpl:37
 #: ../themes/MonoBook/templates/info.tmpl:44
 #, php-format
@@ -8070,7 +7873,7 @@
 #: ../themes/default/templates/info.tmpl:109
 #: ../themes/MonoBook/templates/info.tmpl:123
 msgid "Markup:"
-msgstr "Balises :"
+msgstr "Syntaxe :"
 
 #: ../themes/default/templates/info.tmpl:113
 #: ../themes/MonoBook/templates/info.tmpl:127
@@ -8082,21 +7885,31 @@
 msgid "Hits:"
 msgstr "Visites :"
 
-# lib/diff.php:1010 lib/diff.php:1028
+#: ../themes/default/templates/info.tmpl:133
+msgid "Is External:"
+msgstr "Externe ?"
+
 #: ../themes/default/templates/info.tmpl:134
-#, fuzzy
 msgid "No"
-msgstr "Aucune"
+msgstr "Non"
 
+#: ../themes/default/templates/info.tmpl:138
+msgid "ACL type:"
+msgstr "Type d'ACL :"
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr "ACL :"
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
-msgstr "Page d'accueil"
+msgstr "Accueil"
 
 #: ../themes/default/templates/info.tmpl:152
 #: ../themes/MonoBook/templates/info.tmpl:160
 msgid "User page"
-msgstr "Page de l'utilisateur"
+msgstr "Page d'utilisateur"
 
 #: ../themes/default/templates/info.tmpl:155
 #: ../themes/MonoBook/templates/info.tmpl:163
@@ -8116,7 +7929,7 @@
 #: ../themes/default/templates/info.tmpl:169
 #: ../themes/MonoBook/templates/info.tmpl:177
 msgid "Page Type:"
-msgstr "Type de Page :"
+msgstr "Type de page :"
 
 #: ../themes/default/templates/login.tmpl:49
 #, php-format
@@ -8143,11 +7956,11 @@
 
 #: ../themes/default/templates/login.tmpl:74
 msgid "UserId:"
-msgstr "Nom d'utilisateur :"
+msgstr "Identifiant d'utilisateur :"
 
 #: ../themes/default/templates/login.tmpl:77
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #: ../themes/default/templates/login.tmpl:77
 msgid "OpenID"
@@ -8155,7 +7968,7 @@
 
 #: ../themes/default/templates/login.tmpl:82
 msgid "Password:"
-msgstr "Mot de passe :"
+msgstr "Mot de passe :"
 
 #: ../themes/default/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/actionbar.tmpl:18
@@ -8166,7 +7979,7 @@
 
 #: ../themes/default/templates/nochanges.tmpl:4
 msgid "Edit aborted."
-msgstr "Édition annulée."
+msgstr "Modification annulée."
 
 #: ../themes/default/templates/nochanges.tmpl:5
 msgid "You have not made any changes so no new version has been saved."
@@ -8182,12 +7995,12 @@
 
 #: ../themes/default/templates/online.tmpl:17
 msgid "Switch to detailed list"
-msgstr "Passer à la liste détaillée"
+msgstr "Aller à la liste détaillée"
 
 #: ../themes/default/templates/online.tmpl:23
 #, php-format
 msgid "Our users created a total of %d pages."
-msgstr "Nos utilisateurs ont créés un total de %s pages."
+msgstr "Nos utilisateurs ont créé un total de %d pages."
 
 #: ../themes/default/templates/online.tmpl:24
 #, php-format
@@ -8231,64 +8044,35 @@
 
 #: ../themes/default/templates/online.tmpl:60
 msgid "Switch to summary"
-msgstr "Passer au Sommaire"
+msgstr "Aller au résumé"
 
 #: ../themes/default/templates/online.tmpl:64
 msgid "Registered Users"
-msgstr "Utilisateurs Enregistrés"
+msgstr "Utilisateurs inscrits"
 
 #: ../themes/default/templates/online.tmpl:79
 msgid "Guests"
 msgstr "Invités"
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr "|<<"
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
-msgstr ""
+msgid "Prev"
+msgstr "Précédent"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr "<<"
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr " - %d / %d - "
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid "Next >>"
-msgstr "Suivant >>"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ">>"
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ">>|"
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr "Votre navigateur aurait du vous redirigé vers %s."
 
-# lib/savepage.php:76
 #: ../themes/default/templates/savepage.tmpl:7
 #, php-format
 msgid "Thank you for editing %s."
 msgstr "Merci d'avoir édité %s."
 
-# lib/savepage.php:106
 #: ../themes/default/templates/savepage.tmpl:8
 msgid "Your careful attention to detail is much appreciated."
 msgstr "Votre souci particulier du détail est très apprécié."
@@ -8318,59 +8102,58 @@
 msgid "You are signed but not authenticated as %s. "
 msgstr "Vous êtes enregistré mais pas connecté en tant que %s. "
 
-# lib/diff.php:1006 lib/diff.php:1024
 #: ../themes/default/templates/signin.tmpl:40
 #: ../themes/Wordpress/templates/signin.tmpl:47
 #, php-format
 msgid "Click to authenticate as %s"
-msgstr "Cliquez pour vous conneter en tant que %s"
+msgstr "Cliquez pour vous identifier en tant que %s"
 
 #: ../themes/default/templates/signin.tmpl:59
 #: ../themes/Wordpress/templates/signin.tmpl:67
 msgid "Sign in as:"
-msgstr "Se connecter en tant que :"
+msgstr "S'identifier en tant que :"
 
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
-msgstr "<thème système>"
+msgstr "<thème du système>"
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr "Thème personnel :"
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
-msgstr "< langue du système >"
+msgstr "<langue du système>"
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
-msgstr "Langue personnelle :"
+msgstr "Ma langue :"
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
-#, fuzzy, php-format
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
+#, php-format
 msgid "User preferences for user %s"
 msgstr "Préférences de l'utilisateur %s"
 
 #: ../themes/default/templates/userprefs.tmpl:127
 msgid "UserId"
-msgstr "IdentifiantUtilisateur"
+msgstr "Identifiant d'utilisateur"
 
 #: ../themes/default/templates/userprefs.tmpl:131
 msgid "Auth Level"
-msgstr "Niveau de l'authentification"
+msgstr "Niveau d'autorisation"
 
 #: ../themes/default/templates/userprefs.tmpl:131
 msgid "Auth Method"
@@ -8382,7 +8165,7 @@
 
 #: ../themes/default/templates/userprefs.tmpl:135
 msgid "Current Theme"
-msgstr "Thème courant"
+msgstr "Mon thème"
 
 #: ../themes/default/templates/userprefs.tmpl:136
 msgid "Language"
@@ -8390,15 +8173,15 @@
 
 #: ../themes/default/templates/userprefs.tmpl:136
 msgid "Current Language"
-msgstr "Langage courant"
+msgstr "Ma langue"
 
 #: ../themes/default/templates/userprefs.tmpl:142
 msgid "Change Password"
-msgstr "Changer le mot de passe"
+msgstr "Modifier mon mot de passe"
 
 #: ../themes/default/templates/userprefs.tmpl:142
 msgid "Set Password"
-msgstr "Mot de passe"
+msgstr "Choisir un mot de passe"
 
 #: ../themes/default/templates/userprefs.tmpl:144
 msgid "New password"
@@ -8406,7 +8189,7 @@
 
 #: ../themes/default/templates/userprefs.tmpl:147
 msgid "Type it again"
-msgstr "Verification"
+msgstr "Retapez-le"
 
 #: ../themes/default/templates/userprefs.tmpl:153
 msgid "E-mail"
@@ -8414,68 +8197,70 @@
 
 #: ../themes/default/templates/userprefs.tmpl:155
 msgid "Your E-Mail:"
-msgstr "Votre adresse électronique :"
+msgstr "Adresse électronique :"
 
 #: ../themes/default/templates/userprefs.tmpl:163
 msgid "Status:"
-msgstr "Statut :"
+msgstr "État :"
 
 #: ../themes/default/templates/userprefs.tmpl:165
 msgid "Email verified."
-msgstr "Adresse électronique vérifiée."
+msgstr "Adresse électronique vérifiée"
 
 #: ../themes/default/templates/userprefs.tmpl:167
 msgid "Email not yet verified."
-msgstr "Email pas encore vérifié."
+msgstr "Adresse électronique pas encore vérifiée"
 
 #: ../themes/default/templates/userprefs.tmpl:169
 msgid "Note, that user accounts with bouncing emails will be disabled."
 msgstr ""
-"Notez que les comptes utilisateurs dont l'adresse électronique n'existe pas "
-"seront désactivés."
+"Notez que les comptes avec une adresse électronique invalide seront "
+"désactivés."
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr ""
-"Recevoir un courriel de notification lors des changements des pages "
+"Recevoir une notification par courriel pour les modifications des pages "
 "suivantes :"
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
-msgstr "Entrer les pages séparées par des virgules."
+msgstr ""
+"Entrer les pages séparées par des virgules. Les étoiles (jokers) sont "
+"autorisées."
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr "Ne pas envoyer mes propres modifications :"
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
-"Cochez la case si vous ne voulez pas recevoir vos propres modifications"
+"Cochez la case si vous ne voulez pas recevoir vos propres modifications."
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr "Ne pas envoyer les modifications mineures :"
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 "Cochez la case si vous ne voulez pas recevoir les modifications mineures"
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr "Apparence"
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr "Ici vous pouvez écraser les valeurs par défaut du site spécifié."
 
@@ -8485,7 +8270,7 @@
 msgstr "Système par défaut :"
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, php-format
 msgid "Hide %s:"
 msgstr "Cacher %s :"
@@ -8500,24 +8285,24 @@
 "connexion bas débit."
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, php-format
 msgid "Add %s:"
 msgstr "Ajouter %s :"
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
 "behind the pagename instead. See %s."
 msgstr ""
 "Ajouter un liens vers Google pour les pages inconnues derrière le '?', et "
-"l'action de création. voir %s."
+"l'action de création. Voir %s."
 
 #: ../themes/default/templates/userprefs.tmpl:225
 msgid "Enable DoubleClick Edit"
-msgstr ""
+msgstr "Autoriser la modification par double clic"
 
 #: ../themes/default/templates/userprefs.tmpl:227
 #, php-format
@@ -8527,23 +8312,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
-msgstr "Éditez la taille de la zone"
+msgstr "Modifier la taille de la zone"
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr "Hauteur"
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr "Largeur"
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8554,52 +8339,52 @@
 "concernant la largeur sera ignoré dans ce cas."
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr "Fuseau horaire"
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr ""
 "Ajouter %s heures à l'heure locale du serveur pour afficher les horodatages."
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr "L'heure actuelle du serveur est %s."
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr "Avec l'offset actuel, ceci serait affiché comme %s."
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
-msgstr "Format de date"
+msgstr "Format de la date"
 
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
-msgstr "Montre les dates relatives en utilisant 'Aujourd'hui' et 'Hier'."
+msgstr "Afficher des dates relatives avec « Aujourd'hui » et « Hier »"
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr "Mettre à jour les préférences"
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 msgid "Reset Preferences"
-msgstr "Reinitialiser les préférences"
+msgstr "Réinitialiser les préférences"
 
 # lib/diff.php:1003 lib/diff.php:1021
 #: ../themes/default/templates/wikiblog.tmpl:23
-#, fuzzy, php-format
+#, php-format
 msgid "Entry on %s by %s."
 msgstr "Commentaire le %s par %s."
 
@@ -8612,145 +8397,180 @@
 msgid "Posted: %s"
 msgstr "Posté le %s"
 
-# lib/diff.php:1001 lib/diff.php:1019
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
-msgid "/Discussion"
-msgstr ""
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 msgid "Action Page"
 msgstr "Page d'action"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 msgid "Page"
 msgstr "Page"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
-#, fuzzy
 msgid "Template/Talk"
-msgstr "Modèle"
+msgstr ""
 
-# lib/display.php:14
 #: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
 msgid "Create Page"
 msgstr "Créer une page"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
 msgid "History"
 msgstr "Historique"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
-msgstr "Dernie¨re difference"
+msgstr "Dernière différence"
 
-# lib/pageinfo.php:26 lib/pageinfo.php:75
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 msgid "Page Info"
-msgstr "InfosSurLaPage"
+msgstr "Infos sur la page"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Back Links"
-msgstr "Pages liees"
+msgstr "Pages liées"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
-msgstr "Changer le proprietaire"
+msgstr "Changer le propriétaire"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
-msgstr "Droits d'acces"
+msgstr "Droits d'accès"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 msgid "Purge"
 msgstr "Purger"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-#, fuzzy
-msgid "Watch Page"
-msgstr "Suivre"
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr "RèglesDeFormatageDesTextes"
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr "Erreur :"
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+msgid "This revision of the page does not exist."
+msgstr "Cette version de la page n'existe pas"
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
-msgstr ""
+msgstr "Rendre la page publique ?"
 
 #: ../themes/fusionforge/templates/editpage.tmpl:67
-#, fuzzy
 msgid "Make the page external?"
-msgstr "Sélectionner les pages à renommer :"
+msgstr "Rendre la page externe ?"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/fusionforge/templates/navbar.tmpl:9
+msgid "Home Page"
+msgstr "Accueil"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+msgid "Recent Changes"
+msgstr "Modifications récentes"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
 msgid "SpecialPages"
 msgstr "Pages spéciales"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+msgid "Special Pages"
+msgstr "Pages spéciales"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+msgid "Random Page"
+msgstr "Une page au hasard"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
 msgid "Like Pages"
 msgstr "Pages semblables"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
+msgid "Wiki Admin"
+msgstr "Administration du wiki"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+msgid "My User Page"
+msgstr "Ma page"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+msgid "User Preferences"
+msgstr "Mes préférences"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+msgid "User preferences for this project"
+msgstr "Préférences pour ce projet"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
 msgid "E-mail Notification"
 msgstr "Courriel de notification"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+msgid "Global user preferences (for all projects)"
+msgstr "Préférences globales (pour tous les projets)"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr "Menu du haut"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-# lib/display.php:14
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-#, fuzzy
-msgid "Random Page"
-msgstr "PageAléatoire"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr "Menu de gauche"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
-#, fuzzy
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 msgid "Check menu items to display."
-msgstr "Cliquez pour afficher"
+msgstr "Cliquez les éléments de menu à afficher"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
-#, fuzzy
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 msgid "Show Page Trail"
-msgstr "Trace Page"
+msgstr "Afficher le fil d'Ariane"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
-msgstr ""
+msgstr "Afficher le fil d'Ariane en tête de la page"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
-msgstr ""
+msgstr "Cacher ou montrer les icônes de liens."
 
-#: ../themes/fusionforge/themeinfo.php:53
-#, fuzzy
+#: ../themes/fusionforge/themeinfo.php:73
 msgid "This page is external."
-msgstr "Changement de propriétaire %s à %s."
+msgstr "Cette page est externe."
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+#, fuzzy
+msgid "This project is shared with third-party users"
 msgstr ""
+"The projet est partagé avec des utilisateurs extérieurs (ne faisant pas "
+"partie d'Alcatel-Lucent)."
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 msgid "Views"
@@ -8759,22 +8579,20 @@
 #: ../themes/MonoBook/templates/actionbar.tmpl:57
 #: ../themes/Sidebar/templates/actionbar.tmpl:30
 msgid "Watch"
-msgstr "Suivre"
+msgstr "Surveiller"
 
 #: ../themes/MonoBook/templates/actionbar.tmpl:63
 #: ../themes/Sidebar/templates/actionbar.tmpl:38
 msgid "Special Actions"
 msgstr "Actions spéciales"
 
-# lib/pageinfo.php:26 lib/pageinfo.php:75
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
-#, fuzzy
 msgid "Page info"
-msgstr "InfosSurLaPage"
+msgstr "Infos sur la page"
 
 #: ../themes/MonoBook/templates/actionbar.tmpl:78
 msgid "Author history"
-msgstr "Historique de l'auteur"
+msgstr "Historique des auteurs"
 
 #: ../themes/MonoBook/templates/actionbar.tmpl:80
 msgid "Page dump"
@@ -8796,9 +8614,8 @@
 
 #: ../themes/MonoBook/templates/navbar.tmpl:15
 msgid "Home page"
-msgstr "Page d'accueil"
+msgstr "Accueil"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 msgid "Recent changes"
 msgstr "Dernières modifications"
@@ -8810,9 +8627,8 @@
 
 #: ../themes/MonoBook/templates/navbar.tmpl:17
 msgid "Recent comments"
-msgstr "Commentaires récents"
+msgstr "Derniers commentaires"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../themes/MonoBook/templates/navbar.tmpl:18
 msgid "Recent new pages"
 msgstr "Dernières pages créées"
@@ -8821,20 +8637,17 @@
 msgid "Like pages"
 msgstr "Pages semblables"
 
-# lib/display.php:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "Random page"
 msgstr "Une page au hasard"
 
-# lib/display.php:14
 #: ../themes/MonoBook/templates/navbar.tmpl:30
 msgid "Find page"
 msgstr "Rechercher"
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../themes/MonoBook/templates/navbar.tmpl:36
 msgid "Search:"
-msgstr "Chercher :"
+msgstr "Rechercher :"
 
 #: ../themes/MonoBook/templates/navbar.tmpl:48
 #: ../themes/Sidebar/templates/navbar.tmpl:42
@@ -8846,7 +8659,6 @@
 msgid "What links here"
 msgstr "Pages liées"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 msgid "Related changes"
 msgstr "Changements liés"
@@ -8864,9 +8676,8 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "Upload images or media files"
-msgstr ""
+msgstr "Déposer des images ou des médias"
 
-# lib/pageinfo.php:64
 #: ../themes/MonoBook/templates/navbar.tmpl:64
 #: ../themes/MonoBook/templates/navbar.tmpl:69
 #: ../themes/Sidebar/templates/navbar.tmpl:55
@@ -8877,30 +8688,23 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:74
 #: ../themes/Sidebar/templates/navbar.tmpl:65
 msgid "Display as Pdf"
-msgstr ""
+msgstr "Afficher en PDF"
 
-# lib/diff.php:1001 lib/diff.php:1019
 #: ../themes/MonoBook/templates/signin.tmpl:10
-#, fuzzy
 msgid "My Discussion"
-msgstr "Discussion"
+msgstr "Ma page de discussion"
 
 #: ../themes/MonoBook/templates/signin.tmpl:11
-#, fuzzy
 msgid "My Preferences"
-msgstr "Préférences"
+msgstr "Mes préférences"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../themes/MonoBook/templates/signin.tmpl:12
-#, fuzzy
 msgid "MyRecentChanges"
-msgstr "DernièresModifs"
+msgstr ""
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../themes/MonoBook/templates/signin.tmpl:12
-#, fuzzy
 msgid "My Changes"
-msgstr "DernièresModifs"
+msgstr "Mes modifications"
 
 #: ../themes/MonoBook/templates/signin.tmpl:13
 #: ../themes/Sidebar/templates/signin.tmpl:10
@@ -8932,18 +8736,16 @@
 
 #: ../themes/shamino_com/templates/browse-footer.tmpl:11
 msgid "TermsOfUse"
-msgstr ""
+msgstr "Conditions d'utilisation"
 
 #: ../themes/Sidebar/templates/actionbar.tmpl:15
 #: ../themes/Sidebar/templates/actionbar.tmpl:17
-#, fuzzy
 msgid "View Page"
-msgstr "Pages semblables"
+msgstr "Voir la page"
 
 #: ../themes/Sidebar/templates/actionbar.tmpl:15
-#, fuzzy
 msgid "View the page"
-msgstr "voir cette page"
+msgstr "Voir la page"
 
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
 msgid "You can edit this page. Please use the preview button before saving."
@@ -8951,504 +8753,66 @@
 
 #: ../themes/Sidebar/templates/actionbar.tmpl:22
 msgid "Wysiwyg Editor"
-msgstr ""
+msgstr "Éditeur Wysiwyg"
 
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
-#, fuzzy
 msgid "Past versions of this page."
-msgstr "revenir à une précédente version de cette page."
+msgstr "Versions précédentes de cette page."
 
 #: ../themes/Sidebar/templates/actionbar.tmpl:31
 msgid "Add/Remove this to/from the list of pages you're monitoring for changes"
 msgstr ""
 
 #: ../themes/Sidebar/templates/navbar.tmpl:23
-#, fuzzy
 msgid "Main Categories"
-msgstr "Catégories populaires"
+msgstr "Catégories principales"
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../themes/Sidebar/templates/search.tmpl:36
-#, fuzzy
 msgid "Search term(s)"
-msgstr "Chercher"
+msgstr ""
 
 #: ../themes/Sidebar/templates/signin.tmpl:19
 msgid "Login required..."
 msgstr ""
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../themes/Sidebar/themeinfo.php:118
 msgid "Sidebar"
-msgstr "Barre verticale"
+msgstr ""
 
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 msgid "Edit this page"
-msgstr "Éditer cette page"
+msgstr "Modifier cette page"
 
 #: ../themes/Wordpress/templates/actionbar.tmpl:10
 msgid "Edit old revision"
-msgstr "Éditer l'ancienne révision"
+msgstr "Modifier l'ancienne version"
 
-#~ msgid "HasHomePage"
-#~ msgstr "APageAccueil"
+#~ msgid "Server rejected address: "
+#~ msgstr "Le serveur a rejeté l'adresse : "
 
-#~ msgid "List of pages owned by [%s] ({total} total):"
-#~ msgstr "Liste des pages possédées par [%s] ({total} au total) :"
+#~ msgid "No response from server"
+#~ msgstr "Pas de réponse du serveur"
 
-#~ msgid "List of pages last edited by [%s] ({total} total):"
-#~ msgstr "Liste des pages modifiées par [%s] ({total} au total) :"
+#~ msgid "Cannot connect e-mail server."
+#~ msgstr "Impossible de se connecter au serveur de courriel"
 
-#~ msgid "List of pages created by [%s] ({total} total):"
-#~ msgstr "Liste des pages créées par [%s] ({total} au total) :"
+#~ msgid "E-mail address '%s' appears to be valid."
+#~ msgstr "L'adresse électronique '%s' semble être valide."
 
-#, fuzzy
-#~ msgid "check for additional theme %s updates"
-#~ msgstr "recherche les mises à jour nécessaire des pages sources"
+#~ msgid "<< Prev"
+#~ msgstr "<< Précédent"
 
-#~ msgid "n/a"
-#~ msgstr "n/c"
+#~ msgid "<<"
+#~ msgstr "<<"
 
-# lib/msql.php:237 lib/msql.php:312
-#~ msgid "Include of '%s' failed."
-#~ msgstr "L'insertion de '%s' a échoué."
+#~ msgid "Next >>"
+#~ msgstr "Suivant >>"
 
-#~ msgid "Removed by: %s"
-#~ msgstr "Enlevé près : %s"
+#~ msgid ">>"
+#~ msgstr ">>"
 
-#~ msgid "Are you sure?"
-#~ msgstr "Êtes-vous sûr ?"
+#~ msgid "NewMarkupTestPage"
+#~ msgstr "PageTestNouvellesMarques"
 
-#~ msgid "Redirect to an external url"
-#~ msgstr "Redirige vers une url d'un site extérieur"
-
-#~ msgid "Search string '%s' not found in content of page '%s'."
-#~ msgstr "La chaîne '%s' ne se trouve pas dans la page '%s'."
-
-#, fuzzy
-#~ msgid "Change page owner from %s to %s"
-#~ msgstr "retitrez la page de '%s' à '%s'"
-
-#~ msgid "%s pages have been permanently changed."
-#~ msgstr "%s pages ont été définitivement modifiées."
-
-#, fuzzy
-#~ msgid "Purge selected pages"
-#~ msgstr "Supprimer les pages sélectionnées"
-
-#, fuzzy
-#~ msgid "Permanently purge the selected files:"
-#~ msgstr "Supprimer définitivement les fichiers sélectionnés :"
-
-#~ msgid "Permanently remove the selected files:"
-#~ msgstr "Supprimer définitivement les fichiers sélectionnés :"
-
-#~ msgid "List all pages."
-#~ msgstr "Liste de toutes les pages."
-
-#~ msgid "%s pages changed."
-#~ msgstr "%s pages modifiées."
-
-#~ msgid "The PhpWiki programming team"
-#~ msgstr "L'équipe de développement de PhpWiki"
-
-#, fuzzy
-#~ msgid "%s: "
-#~ msgstr "%s : %s"
-
-#~ msgid "Page history"
-#~ msgstr "Historique de la page"
-
-#~ msgid "User preferences for user '%s':"
-#~ msgstr "Préférences de l'utilisateur %s :"
-
-#~ msgid "Currently not recommended!"
-#~ msgstr "Non recommandé !"
-
-#~ msgid "getfacl"
-#~ msgstr "getfacl"
-
-#~ msgid "optional label | PageName"
-#~ msgstr "en option | PageName"
-
-#~ msgid "optional label | http://www.example.com"
-#~ msgstr "en option | http://www.example.com"
-
-#~ msgid "World"
-#~ msgstr "Monde"
-
-#~ msgid "Description: Provides a list of plugins on this wiki."
-#~ msgstr "Affiche la liste des Plugins de ce wiki."
-
-#~ msgid "Show minor edits for:"
-#~ msgstr "Afficher les éditions mineures pour :"
-
-#~ msgid "Show all changes for:"
-#~ msgstr "Indiquer toutes les modifications pour :"
-
-#~ msgid "Are you sure you want to permanently chown the selected files?"
-#~ msgstr ""
-#~ "Êtes-vous sûr de vouloir changer définitivement le propriétaire des pages "
-#~ "sélectionnées ?"
-
-#~ msgid "WikiAdminMarkup from %s to %s"
-#~ msgstr "WikiAdminMarkup %s par %s"
-
-#~ msgid "This page already exists"
-#~ msgstr "Cette page existe déjà"
-
-#~ msgid "WikiAdminSearchReplace %s by %s"
-#~ msgstr "WikiAdminRemplacementRecherche %s par %s"
-
-# lib/fullsearch.php:48
-#~ msgid "Full Search"
-#~ msgstr "Recherche en Texte Intégral"
-
-#~ msgid "User: %s"
-#~ msgstr "Utilisateur : %s"
-
-#~ msgid "(User: %s)"
-#~ msgstr "(Utilisateur : %s)"
-
-#~ msgid "Example.jpg"
-#~ msgstr "Example.jpg"
-
-#~ msgid "Embedded image"
-#~ msgstr "Image embarquée"
-
-#~ msgid "You must log in to %s."
-#~ msgstr "Vous devez vous connecter pour %s."
-
-#~ msgid "mode"
-#~ msgstr "mode"
-
-# lib/diff.php:1001 lib/diff.php:1019
-#~ msgid "period"
-#~ msgstr "period"
-
-#~ msgid "History of all major edits by %s to page %s."
-#~ msgstr "Historique de toutes les éditions majeures par %s sur la page %s."
-
-#~ msgid "History of major modifications for any page edited by %s."
-#~ msgstr ""
-#~ "Historique des éditions majeures de toutes les pages éditées par %s."
-
-#~ msgid "Automatically link headers at the top"
-#~ msgstr "Créer une table des matières des titres et sous-titres en haut"
-
-#~ msgid "Existing page-level metadata for %s:"
-#~ msgstr "Métadonnées existantes pour niveau de pages pour %s :"
-
-#~ msgid "Rated by %d users | Average rating %.1f stars"
-#~ msgstr "Noté par %d utilisateurs | Moyenne des notes %.1f étoiles."
-
-#~ msgid "%s prediction for you is %s stars"
-#~ msgstr "La prédiction %s pour vous est de %s étoiles."
-
-#~ msgid "%s prediction for you is %.1f stars"
-#~ msgstr "la prédiction %s pour vous est de %.1f étoiles."
-
-#~ msgid "Rate the topic of this page"
-#~ msgstr "Notez les sujets de cette page"
-
-#~ msgid " This is for small text"
-#~ msgstr "C'est pour des petits textes"
-
-#~ msgid "WatchList"
-#~ msgstr "Liste de suivi"
-
-#~ msgid "regex"
-#~ msgstr "expression régulière"
-
-#~ msgid "name"
-#~ msgstr "nom"
-
-#~ msgid "Back to the previous page."
-#~ msgstr "Retournez à la page précédente."
-
-#~ msgid "Add a Comment"
-#~ msgstr "Ajouter un commentaire"
-
-#~ msgid "Photos"
-#~ msgstr "Photos"
-
-#~ msgid "GoodStyle"
-#~ msgstr "StyleCorrect"
-
-#~ msgid "OldTextFormattingRules"
-#~ msgstr "RèglesDeFormatageDesTextes"
-
-#, fuzzy
-#~ msgid "PageChange Notification of %s Error: Couldn't send to %s"
-#~ msgstr ""
-#~ "Erreur lors des notifications de changements de page: Impossible "
-#~ "d'envoyer %s à %s"
-
-#, fuzzy
-#~ msgid "GridTable"
-#~ msgstr "BeauTableau"
-
-#, fuzzy
-#~ msgid "Layout tables using grid-like \"ASCII art\"."
-#~ msgstr "Apparences de tableaux utilisant l'ancien modèle de balisage."
-
-#, fuzzy
-#~ msgid "WikiAdminMassRevert"
-#~ msgstr "WikiAdminSupprimer"
-
-#, fuzzy
-#~ msgid "Reverted page '%s' to version '%s'."
-#~ msgstr "Page '%s' renommées en '%s' avec succès."
-
-#, fuzzy
-#~ msgid "%d pages have been reverted."
-#~ msgstr "Les pages %s ont été changées."
-
-#, fuzzy
-#~ msgid "PhpWikiAdministration/MassRevert"
-#~ msgstr "AdministrationDePhpWiki/Supprimer"
-
-#, fuzzy
-#~ msgid ""
-#~ "Are you sure you want to overwrite the selected files with the previous "
-#~ "version?"
-#~ msgstr ""
-#~ "Êtes-vous certain de renommer définitivement les pages sélectionnées ?"
-
-#, fuzzy
-#~ msgid "Revert selected pages"
-#~ msgstr "Supprimer les pages sélectionnées"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#, fuzzy
-#~ msgid "WikiUserAdministration"
-#~ msgstr "AdministrationDePhpWiki"
-
-#~ msgid "check for necessary ActionPage updates"
-#~ msgstr "vérifie les mises à jour d'ActionPage nécessaire"
-
-#~ msgid "check for necessary database updates"
-#~ msgstr "rechercher des mises à jour nécessaire dans la base de données"
-
-# ??
-#~ msgid "check for necessary plugin argument updates"
-#~ msgstr "recherche les mises à jour nécessaire des plugin argument"
-
-#~ msgid "check for necessary config updates"
-#~ msgstr "vérifie les mises à jour de configuration nécessaire"
-
-#~ msgid "Warning!"
-#~ msgstr "Attention !"
-
-#~ msgid "Signed as %s"
-#~ msgstr "Connecté comme %s"
-
-#~ msgid "Unable to load: %s"
-#~ msgstr "Impossible de charger : %s"
-
-#~ msgid "Sign in:"
-#~ msgstr "S'enregistrer :"
-
-#~ msgid "AUTH_GROUP_FILE not defined"
-#~ msgstr "AUTH_GROUP_FILE non défini"
-
-#~ msgid "LDAP_AUTH_HOST not defined"
-#~ msgstr "LDAP_AUTH_HOST non défini"
-
-#~ 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."
-
-#~ msgid "(no regex, case-sensitive)"
-#~ msgstr "(non expression régulière, sensible à la casse)"
-
-#~ msgid "Rename selected pages."
-#~ msgstr "Renommer les pages selectionnées."
-
-#~ msgid "ACL: "
-#~ msgstr "ACL: "
-
-#~ msgid "Description: "
-#~ msgstr "Description: "
-
-#, fuzzy
-#~ msgid "PgrsrcTranslation"
-#~ msgstr "TraductionPgsrc"
-
-#~ msgid "version <em>%s</em> <b>FIXED</b>"
-#~ msgstr "version <em>%s</em> <b>RÉSOLU</b>"
-
-# lib/diff.php:1003 lib/diff.php:1021
-#~ msgid "Last Modified:"
-#~ msgstr "Dernière modification :"
-
-#~ msgid "Last Author:"
-#~ msgstr "Auteur Précédent :"
-
-#~ msgid "Author:"
-#~ msgstr "Auteur :"
-
-#, fuzzy
-#~ msgid "The PhpWiki Programming Team"
-#~ msgstr "L'équipe de développement de PhpWiki"
-
-#, fuzzy
-#~ msgid "';' and ':' are deprecated"
-#~ msgstr "';' et ':' dans les noms de page est désapprouvé"
-
-# lib/editpage.php:19
-#, fuzzy
-#~ msgid "Welcome to %s"
-#~ msgstr "... copié à %s"
-
-#, fuzzy
-#~ msgid "Are you sure you want to save these access restrictions?"
-#~ msgstr ""
-#~ "Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers "
-#~ "sélectionnés ?"
-
-#, fuzzy
-#~ msgid "Continue"
-#~ msgstr "Continuer"
-
-#, fuzzy
-#~ msgid "PhpWikiAdministration/SetAclSimple"
-#~ msgstr "AdministrationDePhpWiki/DéfinirAcl"
-
-#, fuzzy
-#~ msgid "Selected Pages: %s"
-#~ msgstr "Pages sélectionnées : "
-
-#, fuzzy
-#~ msgid ""
-#~ "Description: Selected Grant checkboxes allow access, unselected "
-#~ "checkboxes deny access."
-#~ msgstr ""
-#~ "Les cases sélectionnées autorisent l'accès, sinon elles l'interdisent."
-
-#, fuzzy
-#~ msgid "Update Settings"
-#~ msgstr "Préférences générales d'auteur."
-
-#~ msgid "Encrypted passwords cannot be used: %s."
-#~ msgstr "Les mots de passe cryptés sont inutilisables : %s"
-
-#~ msgid ""
-#~ "The admin password cannot be empty. Please update your config/config.ini"
-#~ msgstr ""
-#~ "Le mot de passe administrateur ne peut être vide. Veuillez mettre à jour "
-#~ "votre config/config.ini"
-
-#~ msgid ""
-#~ "Empty db_session_table. Turn USE_DB_SESSION off or define the table name."
-#~ msgstr ""
-#~ "La table de session de la base de données est vide. Changez "
-#~ "USE_DB_SESSION à off ou définissez un nom de table pour les sessions."
-
-#~ msgid "%s: has no box method"
-#~ msgstr "%s : n'a pas de boîte"
-
-#~ msgid "the directory '%s'"
-#~ msgstr "le répertoire '%s'"
-
-#~ msgid ""
-#~ "With external authentication all users which stored their Preferences. "
-#~ "Without external authentication all once signed-in users (from version "
-#~ "1.3.4 on)."
-#~ msgstr ""
-#~ "Avec l'authentification externe : afficher tous les utilisateurs qui ont "
-#~ "stocké leurs préférences. Sans authentification externe : afficher tous "
-#~ "les utilisateurs enregistrés."
-
-#~ msgid "Fixed album location is not allowed. Please specify parameter src."
-#~ msgstr ""
-#~ "L'emplacement fixé pour l'album photo n'est pas correct. Veuillez "
-#~ "spécifier le paramère src."
-
-#~ msgid "Wrong server setting: allow_url_fopen set to Off"
-#~ msgstr "Mauvais paramètrage du serveur: allow_url_fopen mis à off"
-
-#~ msgid "You must sign in"
-#~ msgstr "Vous devez vous inscrire"
-
-#~ msgid "No pagename specified for %s"
-#~ msgstr "Aucune page spécifiée pour %s"
-
-# lib/msql.php:31 lib/msql.php:37
-#~ msgid "Messages"
-#~ msgstr "Messages"
-
-#~ msgid "Remove page"
-#~ msgstr "Supprimer la page"
-
-#~ msgid "No opinion"
-#~ msgstr "Pas d'opinion"
-
-#~ msgid "_PreferencesInfo"
-#~ msgstr "_PreferencesInfo"
-
-#~ msgid ""
-#~ "You must first obtain a license key at %s to be able to use the Google "
-#~ "API."
-#~ msgstr ""
-#~ "Vous devez d'abord obtenir une license sur %s pour pouvoir utiliser l'API "
-#~ "Google"
-
-#~ msgid "It's free however."
-#~ msgstr "C'est gratuit malgré tout"
-
-#~ msgid "(no regex) Case-exact: "
-#~ msgstr "(pas de regex) Respect de la casse :"
-
-#~ msgid "CacheTest"
-#~ msgstr "TestDeCache"
-
-#~ msgid "This is a simple example using WikiPluginCached."
-#~ msgstr "C'est un simple exemple d'utilisation du cache pour une image"
-
-#~ msgid "Calendar List"
-#~ msgstr "Affiche la liste des pages du calendrier"
-
-#~ msgid "You have to configure it before use."
-#~ msgstr "Vous devez le configurer avant de l'utiliser."
-
-#~ msgid "Pages: %s"
-#~ msgstr "Pages : %s"
-
-#~ msgid "Wiki Form"
-#~ msgstr "Pour créer des formulaires wiki"
-
-#~ msgid "CreatePagePlugin"
-#~ msgstr "PluginCréerUnePage"
-
-#~ msgid ": unknown format, skipped"
-#~ msgstr " : format inconnu, ignoré"
-
-#~ msgid "Comment:"
-#~ msgstr "Commentaire :"
-
-#~ msgid "Edit Area Size:"
-#~ msgstr "Taille de la zone d'édition :"
-
-#~ msgid "Last Summary:"
-#~ msgstr "Dernier résumé :"
-
-#~ msgid "PhpWiki News"
-#~ msgstr "News PhpWiki"
-
-#~ msgid "?"
-#~ msgstr "?"
+#~ msgid "OldMarkupTestPage"
+#~ msgstr "PageTestAnciennesMarques"

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/it.po
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/it.po	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/it.po	2011-05-18 19:36:20 UTC (rev 13355)
@@ -5,14 +5,15 @@
 # Several guessed fixes by Reini Urban for 1.3.11
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.4pre\n"
+"Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../lib/CachedMarkup.php:536
@@ -46,12 +47,12 @@
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr ""
@@ -71,8 +72,8 @@
 msgid "version %s"
 msgstr "versione %s"
 
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr "di %s"
@@ -88,7 +89,7 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr ""
 
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr "Differenza di: %s"
@@ -144,85 +145,65 @@
 msgid "Older page:"
 msgstr ""
 
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "versione corrente"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Le versioni sono identiche"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Versione"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr ""
 
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr "ModificheRecenti"
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -238,12 +219,12 @@
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
 msgstr ""
 
@@ -344,7 +325,7 @@
 msgid "Versions are identical"
 msgstr "Le versioni sono identiche"
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr "Pagina Bloccata"
 
@@ -384,19 +365,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr "Preferenze"
@@ -465,8 +446,8 @@
 msgid "Changes"
 msgstr "ModificheRecenti"
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr ""
 
@@ -515,8 +496,8 @@
 msgid "String \"%s\" not found."
 msgstr "\"%s\" non trovato."
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
 msgstr ""
 
@@ -529,8 +510,8 @@
 msgid "Replace with"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -541,9 +522,9 @@
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr ""
 
@@ -633,8 +614,8 @@
 msgid "List"
 msgstr "Ultima"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 #, fuzzy
 msgid "Table of Contents"
 msgstr "Indice"
@@ -644,8 +625,8 @@
 msgid "Page Name"
 msgstr "Nome della Pagina"
 
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr ""
 
@@ -659,62 +640,62 @@
 msgid "Template"
 msgstr ""
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 msgid "AddCategory"
 msgstr "InsertoCategoria"
 
-#: ../lib/EditToolbar.php:321
+#: ../lib/EditToolbar.php:320
 #, fuzzy
 msgid "Insert Categories"
 msgstr "Categoria"
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr "Inserto"
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 msgid "AddPlugin"
 msgstr "InsertoPlugin"
 
-#: ../lib/EditToolbar.php:371
+#: ../lib/EditToolbar.php:370
 #, fuzzy
 msgid "Insert Plugin"
 msgstr "Inserto Plugin (doppio-scatto)"
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 msgid "AddPageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:401
+#: ../lib/EditToolbar.php:400
 #, fuzzy
 msgid "Insert PageLink"
 msgstr "Inserto Pagina (doppio-scatto)"
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 #, fuzzy
 msgid "Add Image or Video"
 msgstr "AggiungaLaMascherina"
 
-#: ../lib/EditToolbar.php:439
+#: ../lib/EditToolbar.php:438
 #, fuzzy
 msgid "Insert Image or Video"
 msgstr "AggiungaLaMascherina"
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
 msgstr "AggiungaLaMascherina"
 
-#: ../lib/EditToolbar.php:474
+#: ../lib/EditToolbar.php:473
 #, fuzzy
 msgid "Insert Template"
 msgstr "Inserto Mascherina (doppio-scatto)"
@@ -724,23 +705,23 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: file non trovato"
 
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr "CategoriaGruppo"
 
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr "PaginaPrincipale"
@@ -749,7 +730,23 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:889
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+msgid ": "
+msgstr ""
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -762,7 +759,7 @@
 msgid "Dump to directory"
 msgstr ""
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 msgid "Upload File"
 msgstr ""
 
@@ -778,31 +775,31 @@
 msgid "Dump pages as XHTML"
 msgstr ""
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
 msgstr ""
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifica: %s"
@@ -820,8 +817,8 @@
 #, 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"
+"Errore Di Notifica Del Cambiamento Della Pagina:  Non ha potuto trasmettere "
+"%s a %s"
 
 #: ../lib/loadsave.php:113
 msgid "Complete."
@@ -832,86 +829,86 @@
 msgid "Return to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr ""
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr ""
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr ""
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr ""
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr ""
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr "salvata a %s"
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr ""
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr ""
 
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr "... copia di %s"
 
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, php-format
 msgid "... not copied to %s"
 msgstr "... nonc opia di %s"
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 msgid "saved as "
 msgstr "salvata a "
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr "... non trovato"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr ""
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 msgid "Invalid pagename!"
 msgstr ""
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -920,73 +917,73 @@
 msgid "InterWikiMap"
 msgstr ""
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "dalla %s"
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nuova pagina"
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr ""
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- salvata a base di dati a versione %d"
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME archivio %s"
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr "archivio del testo %s"
 
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr "La Fusione Pubblica"
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr "Restore Comunque"
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr "Scriva sopra Tutti"
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr " Spiacente, non può fondersi."
 
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
@@ -994,110 +991,110 @@
 msgid "Revert"
 msgstr "Ritorni"
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 msgid "no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 msgid "same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 #, fuzzy
 msgid "Cancelled"
 msgstr "Annulla"
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr "Si"
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1134
 #, fuzzy, php-format
 msgid "Revert: %s"
 msgstr "Ritorni"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, 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:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: non definito"
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr ""
@@ -1107,40 +1104,40 @@
 msgid "PageChange Notification of %s"
 msgstr "Pagini la notifica del cambiamento di %s trasmesso a %s"
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "%s a %s"
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Non riesco a stabilire una connessione col database: %s"
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr "Cambiamento della pagina"
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "Commenti:"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La pagina cambia titolo %s a %s"
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "Pagina rimosso %s"
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 msgid "E-Mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1155,7 +1152,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 msgid "Optimizing database"
 msgstr "Base di dati d'ottimizzazione"
 
@@ -1426,8 +1423,8 @@
 msgstr ""
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr ""
 
@@ -1449,7 +1446,7 @@
 msgstr "RicercaDelTesto"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1491,8 +1488,8 @@
 msgid "Users will not be able to sign in."
 msgstr ""
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
 #: ../lib/PageList.php:93
@@ -1518,7 +1515,7 @@
 msgid "Click to de-/select all pages"
 msgstr ""
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... i primi %d byte"
@@ -1533,20 +1530,20 @@
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
 msgid "individual page permission"
 msgstr ""
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
@@ -1557,17 +1554,17 @@
 msgstr "<nessuna corrispondenza>"
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 msgid "Content"
 msgstr "Indice"
 
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 msgid "Permission"
 msgstr ""
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr ""
 
@@ -1650,7 +1647,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
@@ -1719,7 +1716,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr ""
 
@@ -1747,12 +1744,14 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1790,7 +1789,7 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr ""
 
@@ -1850,111 +1849,111 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr "giorni"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -1982,11 +1981,11 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
 msgstr ""
@@ -2087,7 +2086,7 @@
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2222,14 +2221,14 @@
 msgstr "Modifica %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2281,9 +2280,8 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr ""
 
@@ -2331,25 +2329,49 @@
 msgid "Created by CreatePage"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+#, fuzzy
+msgid "No page specified."
+msgstr "Le %d pagine più popolari di questo wiki sono:"
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, fuzzy, php-format
+msgid "Page '%s' does not exist."
+msgstr "Plugin '%s' inabiliti."
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, php-format
+msgid "%s: no such revision %d."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr ""
 
@@ -2365,8 +2387,8 @@
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "Differenze"
 
@@ -2374,6 +2396,29 @@
 msgid "Display differences between revisions"
 msgstr ""
 
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "versione corrente"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Le versioni sono identiche"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Versione"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
 #: ../lib/plugin/DynamicIncludePage.php:35
 #, fuzzy
 msgid "DynamicIncludePage"
@@ -2397,7 +2442,7 @@
 msgid "Click to hide/show"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr ""
 
@@ -2454,7 +2499,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr ""
@@ -2519,22 +2564,34 @@
 "Displays a url in a seperate frame inside our body. Only one frame allowed."
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
-#, php-format
-msgid "recursive inclusion of page %s"
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:94
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "Cancellazione su %s fallita: %s"
+
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
 #, php-format
-msgid "recursive inclusion of url %s"
+msgid "Recursive inclusion of url %s"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2658,7 +2715,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, php-format
 msgid "%s is empty"
 msgstr ""
@@ -2723,36 +2780,39 @@
 msgid "Include text from another wiki page."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, php-format
-msgid "recursive inclusion of page %s ignored"
+msgid "Recursive inclusion of page %s ignored"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
+#: ../lib/plugin/IncludePage.php:91
 #, php-format
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
 #, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "%s(%d): no such revision"
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:157
+#, fuzzy, php-format
+msgid "Included from %s (revision %d)"
+msgstr "Inserire dalla %s"
+
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "Inserire dalla %s"
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr ""
@@ -2804,6 +2864,7 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
@@ -2843,6 +2904,8 @@
 
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3128,7 +3191,7 @@
 msgstr "%s: pagina non trovato."
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
+msgid "Download for Subversion"
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:154
@@ -3184,7 +3247,7 @@
 #: ../lib/plugin/PageDump.php:215
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
@@ -3207,12 +3270,13 @@
 msgid "Contents"
 msgstr "Indice"
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr "Seguente"
 
@@ -3521,7 +3585,7 @@
 #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124
 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "Help"
-msgstr ""
+msgstr "Aiuto"
 
 #: ../lib/plugin/PopularNearby.php:44
 msgid "PopularNearby"
@@ -3555,7 +3619,7 @@
 msgid "List the most popular tags."
 msgstr ""
 
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr ""
 
@@ -3602,7 +3666,7 @@
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr "PreferenzeInfo"
 
@@ -3636,8 +3700,8 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr ""
@@ -4003,11 +4067,11 @@
 msgid "Recursive redirect to self: '%s'"
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
 msgstr ""
 
@@ -4207,9 +4271,8 @@
 msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:287
-#, fuzzy
 msgid "Help:SemanticRelations"
-msgstr "Annulla"
+msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:335
 #, php-format
@@ -4288,74 +4351,74 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
+#: ../lib/plugin/SyncWiki.php:110
 msgid "Syncing this PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 msgid "<unknown>"
 msgstr "<sconosciuto>"
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
+#: ../lib/plugin/SyncWiki.php:209
 msgid "Now upload all locally newer uploads."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
+#: ../lib/plugin/SyncWiki.php:274
 #, php-format
 msgid "%s force"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:276
+#: ../lib/plugin/SyncWiki.php:278
 #, php-format
 msgid "Postponed %s for %s."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 msgid "skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 #, fuzzy
 msgid "same content"
 msgstr "Indice"
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr ""
@@ -4476,12 +4539,12 @@
 
 #: ../lib/plugin/SystemInfo.php:400
 #, php-format
-msgid "Application size: %d Kb"
+msgid "Application size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:402
 #, php-format
-msgid "Pagedata size: %d Kb"
+msgid "Pagedata size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:420
@@ -4588,6 +4651,11 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr ""
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr ""
@@ -4674,7 +4742,7 @@
 msgid "Transcluded from %s"
 msgstr "Inserire dalla %s"
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr ""
 
@@ -4761,78 +4829,78 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:179
+#: ../lib/plugin/UpLoad.php:178
 msgid "You cannot upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 msgid "Check you are logged in."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:213
+#: ../lib/plugin/UpLoad.php:212
 #, php-format
 msgid "ERROR uploading '%s'"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, php-format
 msgid "Files with extension %s are not allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:226
+#: ../lib/plugin/UpLoad.php:225
 #, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, php-format
 msgid "uploaded %s"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 msgid "Uploading failed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:291
+#: ../lib/plugin/UpLoad.php:290
 msgid "The upload logfile exists but is not writable."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 msgid "Can't open the upload logfile."
 msgstr ""
 
@@ -4972,7 +5040,6 @@
 msgstr ""
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr ""
 
@@ -5011,6 +5078,9 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 #, fuzzy
 msgid "WatchPage"
 msgstr "Larghezza"
@@ -5041,11 +5111,11 @@
 msgid "The page %s is already watched!"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -5053,6 +5123,12 @@
 msgid "Edit"
 msgstr "Modifica"
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#, fuzzy
+msgid "Watch Page"
+msgstr "Larghezza"
+
 #: ../lib/plugin/WatchPage.php:110
 msgid "You must sign in to watch pages."
 msgstr ""
@@ -5117,42 +5193,46 @@
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
 #, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 msgid "No pages changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Select the pages to change:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr ""
 
@@ -5183,41 +5263,42 @@
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr ""
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been changed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
 #, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:171
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
-msgstr ""
+#: ../lib/plugin/WikiAdminChown.php:173
+#, fuzzy
+msgid "Are you sure you want to change the owner of the selected pages?"
+msgstr "Il sorgente della %s"
 
-#: ../lib/plugin/WikiAdminChown.php:175
+#: ../lib/plugin/WikiAdminChown.php:177
 #, fuzzy
 msgid "Change owner of selected pages"
 msgstr "Il sorgente della %s"
 
-#: ../lib/plugin/WikiAdminChown.php:176
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:198
+#: ../lib/plugin/WikiAdminChown.php:200
 #, fuzzy
-msgid "Change owner"
+msgid "Change owner to: "
 msgstr "ModificheRecenti"
 
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
-msgstr ""
-
 #: ../lib/plugin/WikiAdminMarkup.php:36
 msgid "WikiAdminMarkup"
 msgstr "WikiAmministrazioneDisposizione"
@@ -5245,23 +5326,22 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr "AmministrazioneDiPhpWiki/Disposizione"
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+#: ../lib/plugin/WikiAdminMarkup.php:165
+msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
+#: ../lib/plugin/WikiAdminMarkup.php:169
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
-msgid "Change markup"
-msgstr ""
+#: ../lib/plugin/WikiAdminMarkup.php:192
+#, fuzzy
+msgid "Change markup to: "
+msgstr "La pagina cambia titolo %s a %s"
 
 #: ../lib/plugin/WikiAdminPurge.php:34
 #, fuzzy
@@ -5283,26 +5363,35 @@
 msgid "Didn't purge page '%s'. Access denied."
 msgstr "La pagina '%s' è stata rimossa correttamente."
 
+#: ../lib/plugin/WikiAdminPurge.php:77
+msgid "One page has been permanently purged:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminPurge.php:79
 #, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
 msgstr ""
 
+#: ../lib/plugin/WikiAdminPurge.php:85
+#, fuzzy
+msgid "No pages purged."
+msgstr "Le %d pagine più popolari di questo wiki sono:"
+
 #: ../lib/plugin/WikiAdminPurge.php:92
 #, fuzzy
 msgid "PhpWikiAdministration/Purge"
 msgstr "AmministrazioneDiPhpWiki/Disposizione"
 
-#: ../lib/plugin/WikiAdminPurge.php:144
+#: ../lib/plugin/WikiAdminPurge.php:146
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:147
+#: ../lib/plugin/WikiAdminPurge.php:149
 #, fuzzy
 msgid "Permanently purge selected pages"
 msgstr "Il sorgente della %s"
 
-#: ../lib/plugin/WikiAdminPurge.php:148
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5324,38 +5413,47 @@
 msgid "Didn't remove page '%s'. Access denied."
 msgstr "La pagina '%s' è stata rimossa correttamente."
 
+#: ../lib/plugin/WikiAdminRemove.php:121
+msgid "One page has been removed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminRemove.php:123
 #, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+#: ../lib/plugin/WikiAdminRemove.php:129
+#, fuzzy
+msgid "No pages removed."
+msgstr "Le %d pagine più popolari di questo wiki sono:"
+
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
 msgstr "AmministrazioneDiPhpWiki/Rimuovi"
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "Cancella"
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+#: ../lib/plugin/WikiAdminRemove.php:199
+msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:201
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:211
+#: ../lib/plugin/WikiAdminRemove.php:213
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -5364,84 +5462,92 @@
 msgid "WikiAdminRename"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 msgid "Rename selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:79
+#: ../lib/plugin/WikiAdminRename.php:80
 #, php-format
 msgid "Page '%s' already exists. Ignored."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:82
+#: ../lib/plugin/WikiAdminRename.php:83
 #, php-format
 msgid "Access denied to rename page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:91
+#: ../lib/plugin/WikiAdminRename.php:92
 #, fuzzy, php-format
 msgid "Renamed page from '%s' to '%s'"
 msgstr "Sto inserendo la pagina %s, versione %s da %s"
 
-#: ../lib/plugin/WikiAdminRename.php:100
+#: ../lib/plugin/WikiAdminRename.php:101
 #, fuzzy, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr "Sto inserendo la pagina %s, versione %s da %s"
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:126
+#: ../lib/plugin/WikiAdminRename.php:124
+msgid "One page has been renamed:"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:127
 #, php-format
-msgid "%s pages have been permanently renamed:"
+msgid "%d pages have been renamed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:132
+#: ../lib/plugin/WikiAdminRename.php:133
 msgid "No pages renamed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:209
-msgid "Are you sure you want to permanently rename the selected pages?"
+#: ../lib/plugin/WikiAdminRename.php:211
+msgid "Are you sure you want to rename the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:213
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 #, fuzzy
 msgid "Rename page"
 msgstr "Cancella la Pagina"
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 msgid "from"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 msgid "Regex?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
 msgstr ""
 
@@ -5467,32 +5573,31 @@
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 msgid "Select the pages to search and replace"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 msgid "Replace"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr ""
 
@@ -5552,46 +5657,46 @@
 msgid "Invalid ACL"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 msgid "PhpWikiAdministration/SetAcl"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 msgid "Change Access Rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 msgid "Select the pages where to change access rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 msgid "Selected Pages: "
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 msgid "Type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 msgid "(Currently not working)"
 msgstr ""
 
@@ -5615,12 +5720,12 @@
 msgid "PhpWikiAdministration/SetExternal"
 msgstr "AmministrazioneDiPhpWiki/Rimuovi"
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 #, fuzzy
 msgid "Set pages to external"
 msgstr "Pagina sbloccata."
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 msgid "Select the pages to set as external"
 msgstr ""
 
@@ -5632,121 +5737,121 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, php-format
 msgid "Bad action requested: %s"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:100
+#: ../lib/plugin/WikiAdminUtils.php:102
 #, php-format
 msgid "WikiAdminUtils %s returned:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:102
+#: ../lib/plugin/WikiAdminUtils.php:104
 msgid "Back"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 msgid "Purge all Pages With Invalid Names"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 msgid "No pages with bad names had to be deleted."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:147
+#: ../lib/plugin/WikiAdminUtils.php:149
 #, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 msgid "No empty, unreferenced pages were found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:180
+#: ../lib/plugin/WikiAdminUtils.php:182
 #, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, php-format
 msgid "Converted successfully %d pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:233
+#: ../lib/plugin/WikiAdminUtils.php:235
 #, fuzzy
 msgid "Username"
 msgstr "Nome"
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr ""
 
@@ -5854,305 +5959,240 @@
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:47
-msgid "AddCommentPlugin"
+msgid "AllPagesCreatedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:48
-msgid "AddingPages"
+msgid "AllPagesLastEditedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:49
-msgid "AllPagesCreatedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:50
-msgid "AllPagesLastEditedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:51
 msgid "AllPagesOwnedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:52
-msgid "AuthorHistoryPlugin"
+msgid "CategoryHomePages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:54
-msgid "CalendarListPlugin"
-msgstr "CalendarioListPlugin"
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
+#: ../themes/Crao/templates/navbar.tmpl:41
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/MonoBook/templates/navbar.tmpl:30
+#: ../themes/MonoBook/templates/navbar.tmpl:36
+#: ../themes/Portland/templates/navbar.tmpl:6
+#: ../themes/shamino_com/templates/top.tmpl:21
+#: ../themes/Sidebar/templates/search.tmpl:6
+#: ../themes/smaller/templates/navbar.tmpl:9
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
+#: ../themes/wikilens/templates/navbar.tmpl:19
+msgid "FindPage"
+msgstr "TrovaPagina"
 
-#: ../lib/plugin/_WikiTranslation.php:55
-msgid "CalendarPlugin"
-msgstr "CalendarioPlugin"
+#: ../lib/plugin/_WikiTranslation.php:56
+msgid "FullRecentChanges"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:57
-msgid "CategoryHomePages"
+msgid "Help/AddingPages"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:58
-msgid "CommentPlugin"
+msgid "Help/AddCommentPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:59
-msgid "CreateTocPlugin"
+msgid "Help/AuthorHistoryPlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:60
+msgid "Help/CalendarListPlugin"
+msgstr "Aiuto/CalendarioListPlugin"
+
+#: ../lib/plugin/_WikiTranslation.php:61
+msgid "Help/CalendarPlugin"
+msgstr "Aiuto/CalendarioPlugin"
+
 #: ../lib/plugin/_WikiTranslation.php:62
-msgid "EditMetaDataPlugin"
+msgid "Help/CommentPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
+msgid "Help/CreateTocPlugin"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
-#: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
-#: ../themes/MonoBook/templates/navbar.tmpl:30
-#: ../themes/MonoBook/templates/navbar.tmpl:36
-#: ../themes/Portland/templates/navbar.tmpl:6
-#: ../themes/shamino_com/templates/top.tmpl:21
-#: ../themes/Sidebar/templates/search.tmpl:6
-#: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
-#: ../themes/wikilens/templates/navbar.tmpl:19
-msgid "FindPage"
-msgstr "TrovaPagina"
+#: ../lib/plugin/_WikiTranslation.php:64
+msgid "Help/EditMetaDataPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:65
-msgid "FoafViewerPlugin"
+msgid "Help/ExternalSearchPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
+msgid "Help/FoafViewerPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:67
-msgid "FullRecentChanges"
+msgid "Help/FrameIncludePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:68
-msgid "HelloWorldPlugin"
+msgid "Help/HelloWorldPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:69
-msgid "HomePageAlias"
-msgstr "AliasPaginaPrincipale"
+msgid "Help/IncludePagePlugin"
+msgstr "Aiuto/InserireLaPaginaPlugin"
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
-msgstr "InserireLaPaginaPlugin"
+msgid "Help/LinkIcons"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:71
-msgid "InterWiki"
+msgid "Help/MagicPhpWikiURLs"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
+msgid "Help/MoreAboutMechanics"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
+msgid "Help/OldStyleTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
+msgid "Help/PhotoAlbumPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
+msgid "Help/PhpHighlightPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
+msgid "Help/PhpWeatherPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:77
-msgid "OldStyleTablePlugin"
+msgid "Help/PhpWiki"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:78
+msgid "Help/PloticusPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:79
-msgid "PageGroupTest"
+msgid "Help/RawHtmlPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:80
-msgid "PageGroupTest/Four"
+msgid "Help/RedirectToPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:81
-msgid "PageGroupTest/One"
+msgid "Help/RichTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:82
-msgid "PageGroupTest/Three"
+msgid "Help/SystemInfoPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:83
-msgid "PageGroupTest/Two"
+msgid "Help/TranscludePlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:85
-msgid "PhotoAlbumPlugin"
+msgid "Help/UpLoadPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:86
-msgid "PhpHighlightPlugin"
+msgid "Help/WabiSabi"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
+msgid "Help/WikiBlogPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
+msgid "Help/WikiPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:89
-msgid "PhpWikiAdministration/Chmod"
+msgid "Help/WikiWikiWeb"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:92
-msgid "PhpWikiAdministration/Rename"
+#: ../lib/plugin/_WikiTranslation.php:90
+msgid "HomePageAlias"
+msgstr "AliasPaginaPrincipale"
+
+#: ../lib/plugin/_WikiTranslation.php:91
+msgid "InterWiki"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:93
-msgid "PhpWikiAdministration/Replace"
+msgid "PhpWikiAdministration/Chmod"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:95
-#: ../themes/MonoBook/templates/navbar.tmpl:21
-msgid "PhpWikiDocumentation"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:96
-msgid "PhpWikiPoll"
+msgid "PhpWikiAdministration/Rename"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:97
-msgid "PloticusPlugin"
+msgid "PhpWikiAdministration/Replace"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:99
-msgid "PgsrcTranslation/de"
+#: ../themes/MonoBook/templates/navbar.tmpl:21
+msgid "PhpWikiDocumentation"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:100
-msgid "PgsrcTranslation/fr"
+msgid "PhpWikiPoll"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:101
-msgid "PgsrcTranslation/it"
-msgstr ""
+msgid "RecentVisitors"
+msgstr "VisitatoriRecenti"
 
 #: ../lib/plugin/_WikiTranslation.php:102
-msgid "PgsrcTranslation/es"
+msgid "ReleaseNotes"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:103
-msgid "PgsrcTranslation/nl"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:104
-msgid "PgsrcTranslation/sv"
+msgid "SteveWainstead"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:105
-msgid "PgsrcTranslation/ja"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:106
-msgid "PgsrcTranslation/zh"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:107
-msgid "RawHtmlPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:108
-msgid "RecentVisitors"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:109
-msgid "RedirectToPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:110
-msgid "ReleaseNotes"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:111
-msgid "RichTablePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:113
-msgid "SteveWainstead"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:114
-msgid "SystemInfoPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "UpLoad"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:119
-msgid "UpLoadPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:121
-msgid "WikiBlogPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:122
-msgid "WikiPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr ""
@@ -6181,7 +6221,7 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 #, fuzzy
 msgid "Purge Page"
 msgstr "Cambiamento della pagina"
@@ -6203,7 +6243,7 @@
 "the database."
 msgstr ""
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr "Cancella la Pagina"
 
@@ -6215,8 +6255,8 @@
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 
@@ -6245,138 +6285,138 @@
 msgid "the file '%s'"
 msgstr ""
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr ""
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr ""
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr ""
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1423
+#: ../lib/stdlib.php:1425
 #, php-format
-msgid "%s b"
+msgid "%s B"
 msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr "%s byte"
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
+msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
-#, php-format
-msgid "%s Kb (%s bytes)"
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
+#, fuzzy, php-format
+msgid "%s KiB (%s bytes)"
 msgstr "%s Kb (%s byte)"
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr ""
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -6675,7 +6715,7 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
@@ -6768,8 +6808,8 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
 msgstr ""
 
@@ -6797,7 +6837,7 @@
 msgid "Top Recommendations"
 msgstr ""
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr ""
 
@@ -6847,69 +6887,64 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, php-format
-msgid "Version %s, saved %s"
-msgstr "Versione %s, salvata %s"
+msgid "Version %s, saved on %s"
+msgstr "Versione %s, salvata su %s"
 
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, php-format
 msgid "Last edited %s"
 msgstr "Ultima modifica %s"
 
 #: ../lib/WikiTheme.php:473
 #, php-format
-msgid "Version %s, saved on %s"
-msgstr "Versione %s, salvata su %s"
-
-#: ../lib/WikiTheme.php:475
-#, php-format
 msgid "Last edited on %s"
 msgstr "Ultima modifica %s"
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr "oggi"
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr "ieri"
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, php-format
 msgid "Owner: %s"
 msgstr "Owner: %s"
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
 msgstr "Salvata: %s"
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -6922,70 +6957,71 @@
 msgid "Sign Out"
 msgstr "Logout"
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Login"
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 #, fuzzy
 msgid "Rename Page"
 msgstr "Cancella la Pagina"
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Blocca la Pagina"
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Sblocca la Pagina"
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr "Stampante"
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr "Moderno"
 
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin '%s': non definito"
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr "Collegamenti Relativi"
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr "Collegamenti Esterni"
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7063,57 +7099,57 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 msgid "Invalid password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr "Password o nome utente errati."
 
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr "Permessi insufficienti."
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 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:1338
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1781
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7122,14 +7158,14 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1841
+#: ../lib/WikiUserNew.php:1843
 #, php-format
-msgid "E-Mail address '%s' is not properly formatted"
+msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1845
+#: ../lib/WikiUserNew.php:1847
 #, php-format
-msgid "E-Mail address '%s' is properly formatted"
+msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
@@ -7297,10 +7333,10 @@
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7308,7 +7344,7 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
 msgstr ""
@@ -7336,9 +7372,8 @@
 #: ../themes/Portland/templates/editpage.tmpl:83
 #: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/Wordpress/templates/editpage.tmpl:96
-#, fuzzy
 msgid "Help/GoodStyle"
-msgstr "BuonStile"
+msgstr "Aiuto/BuonStile"
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7361,9 +7396,8 @@
 #: ../themes/fusionforge/templates/editpage.tmpl:79
 #: ../themes/Portland/templates/editpage.tmpl:84
 #: ../themes/Wordpress/templates/editpage.tmpl:97
-#, fuzzy
 msgid "Help/TextFormattingRules"
-msgstr "RegoleFormattazioneTesto"
+msgstr "Aiuto/RegoleFormattazioneTesto"
 
 #: ../themes/blog/templates/blogform.tmpl:25
 #: ../themes/Crao/templates/editpage.tmpl:94
@@ -7386,12 +7420,11 @@
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7402,12 +7435,11 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
@@ -7416,10 +7448,8 @@
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7430,7 +7460,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7481,6 +7511,8 @@
 
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
 #, fuzzy
@@ -7500,36 +7532,36 @@
 msgid "Comments on %s by %s."
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 msgid "SignOut"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 msgid "SignIn"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr "Bloccata"
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 msgid "Unlock"
 msgstr "Sblocca"
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 msgid "blog"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr "(diff)"
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -7640,21 +7672,28 @@
 #: ../themes/default/templates/editpage.tmpl:118
 #: ../themes/Portland/templates/editpage.tmpl:79
 #: ../themes/Wordpress/templates/editpage.tmpl:92
-#, fuzzy
 msgid "Help/OldTextFormattingRules"
-msgstr "RegoleFormattazioneTesto"
+msgstr "Aiuto/RegoleFormattazioneTesto"
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr ""
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr ""
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7703,9 +7742,9 @@
 msgstr ""
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ", RAM: %s"
@@ -7818,11 +7857,24 @@
 msgid "Hits:"
 msgstr ""
 
+#: ../themes/default/templates/info.tmpl:133
+#, fuzzy
+msgid "Is External:"
+msgstr "Collegamenti Esterni"
+
 #: ../themes/default/templates/info.tmpl:134
 #, fuzzy
 msgid "No"
 msgstr "Nessuno"
 
+#: ../themes/default/templates/info.tmpl:138
+msgid "ACL type:"
+msgstr ""
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
@@ -7968,44 +8020,17 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Anteprima"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-#, fuzzy
-msgid "Next >>"
-msgstr "Seguente"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ""
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr ""
@@ -8056,34 +8081,34 @@
 
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
 #, fuzzy, php-format
 msgid "User preferences for user %s"
 msgstr "Preferenze"
@@ -8157,43 +8182,43 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr ""
 
@@ -8203,7 +8228,7 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, php-format
 msgid "Hide %s:"
 msgstr ""
@@ -8215,13 +8240,13 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, php-format
 msgid "Add %s:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
@@ -8240,23 +8265,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr "Altezza"
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr "Larghezza"
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8264,45 +8289,45 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr "Fuso Orario"
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
 msgstr "Formato della Data"
 
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 #, fuzzy
 msgid "Reset Preferences"
 msgstr "Preferenze"
@@ -8321,24 +8346,19 @@
 msgid "Posted: %s"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
-msgid "/Discussion"
-msgstr ""
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
 msgid "Action Page"
 msgstr "TrovaPagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
 msgid "Page"
 msgstr "PaginaPrincipale"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
 #, fuzzy
 msgid "Template/Talk"
@@ -8351,53 +8371,56 @@
 msgid "Create Page"
 msgstr "CategoriaPagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
 #, fuzzy
 msgid "History"
 msgstr "StoricoPagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 #, fuzzy
 msgid "Page Info"
 msgstr "InfoPagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 #, fuzzy
 msgid "Back Links"
 msgstr "Collegamenti Relativi"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 #, fuzzy
 msgid "Change Owner"
 msgstr "ModificheRecenti"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 msgid "Purge"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-#, fuzzy
-msgid "Watch Page"
-msgstr "Larghezza"
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr "RegoleFormattazioneTesto"
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr ""
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+msgid "This revision of the page does not exist."
+msgstr ""
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
 msgstr ""
@@ -8406,59 +8429,111 @@
 msgid "Make the page external?"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/fusionforge/templates/navbar.tmpl:9
+#, fuzzy
+msgid "Home Page"
+msgstr "PaginaPrincipale"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+#, fuzzy
+msgid "Recent Changes"
+msgstr "ModificheRecenti"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
 msgid "SpecialPages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+msgid "Special Pages"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+#, fuzzy
+msgid "Random Page"
+msgstr "Rimuovi la pagina"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
 msgid "Like Pages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
+#, fuzzy
+msgid "Wiki Admin"
+msgstr "WikiAmministrazioneDisposizione"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+#, fuzzy
+msgid "My User Page"
+msgstr "Nome"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+#, fuzzy
+msgid "User Preferences"
+msgstr "Preferenze"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Preferenze"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
 msgid "E-mail Notification"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "Preferenze"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-#, fuzzy
-msgid "Random Page"
-msgstr "Rimuovi la pagina"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 msgid "Check menu items to display."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 msgid "Show Page Trail"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:73
 #, fuzzy
 msgid "This page is external."
 msgstr "Pagina sbloccata."
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -8701,6 +8776,13 @@
 msgid "Edit old revision"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Seguente"
+
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Versione %s, salvata %s"
+
 #~ msgid "Insert Categories (double-click)"
 #~ msgstr "Inserimento Categorie (doppio-click)"
 
@@ -8811,10 +8893,6 @@
 #~ msgstr "Commenti:"
 
 #, fuzzy
-#~ msgid "No dsn specified"
-#~ msgstr "Le %d pagine più popolari di questo wiki sono:"
-
-#, fuzzy
 #~ msgid "Remove the page now"
 #~ msgstr "Rimuovi la pagina"
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/ja.po
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/ja.po	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/ja.po	2011-05-18 19:36:20 UTC (rev 13355)
@@ -4,14 +4,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.11\n"
+"Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <webmaster at elf.no-ip.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../lib/CachedMarkup.php:536
@@ -45,12 +46,12 @@
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, fuzzy, php-format
 msgid "Supported handlers are: %s"
 msgstr "サポートテーマ一覧"
@@ -70,8 +71,8 @@
 msgid "version %s"
 msgstr "バージョン %s"
 
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr ""
@@ -87,7 +88,7 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr ""
 
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr "差分: %s"
@@ -143,86 +144,67 @@
 msgid "Older page:"
 msgstr ""
 
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "バージョン %d"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " is identical."
-msgstr ""
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "バージョン"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
 # This entry is important for French punctuation rules which stipulate
 # a space before each colon.
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr ""
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr ""
 
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr "変更履歴"
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, fuzzy, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "サポート言語一覧"
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -238,12 +220,12 @@
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
 msgstr ""
 
@@ -344,7 +326,7 @@
 msgid "Versions are identical"
 msgstr ""
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr "ページをロックしました。"
 
@@ -381,19 +363,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr "ユーザー設定"
@@ -454,8 +436,8 @@
 msgid "Changes"
 msgstr "変更履歴"
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr "アップロード"
 
@@ -504,8 +486,8 @@
 msgid "String \"%s\" not found."
 msgstr "ページはロック解除中です。"
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
 msgstr ""
 
@@ -518,8 +500,8 @@
 msgid "Replace with"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -530,9 +512,9 @@
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr ""
 
@@ -624,8 +606,8 @@
 msgid "List"
 msgstr "最後へ"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 #, fuzzy
 msgid "Table of Contents"
 msgstr "コンテンツ"
@@ -635,8 +617,8 @@
 msgid "Page Name"
 msgstr "ページ名"
 
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr "転送"
 
@@ -651,65 +633,65 @@
 msgid "Template"
 msgstr "テーマ"
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 #, fuzzy
 msgid "AddCategory"
 msgstr "ホームページ作成:"
 
-#: ../lib/EditToolbar.php:321
+#: ../lib/EditToolbar.php:320
 #, fuzzy
 msgid "Insert Categories"
 msgstr "ホームページ作成:"
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 #, fuzzy
 msgid "AddPlugin"
 msgstr "プラグイン"
 
-#: ../lib/EditToolbar.php:371
+#: ../lib/EditToolbar.php:370
 #, fuzzy
 msgid "Insert Plugin"
 msgstr "このプラグインを使う"
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 #, fuzzy
 msgid "AddPageLink"
 msgstr "ページを編集しています。"
 
-#: ../lib/EditToolbar.php:401
+#: ../lib/EditToolbar.php:400
 #, fuzzy
 msgid "Insert PageLink"
 msgstr "ページを編集しています。"
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 #, fuzzy
 msgid "Add Image or Video"
 msgstr "ページを編集しています。"
 
-#: ../lib/EditToolbar.php:439
+#: ../lib/EditToolbar.php:438
 #, fuzzy
 msgid "Insert Image or Video"
 msgstr "ページを編集しています。"
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:474
+#: ../lib/EditToolbar.php:473
 #, fuzzy
 msgid "Insert Template"
 msgstr "テーマ"
@@ -719,24 +701,24 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: ファイルが見つかりません。"
 
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 #, fuzzy
 msgid "CategoryGroup"
 msgstr "ホームページ作成:"
 
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr "ホームページ"
@@ -745,7 +727,24 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:889
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+#, fuzzy
+msgid ": "
+msgstr "%s バイト"
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -759,7 +758,7 @@
 msgid "Dump to directory"
 msgstr "ディレクトリ '%s' を作成出来ません。"
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 #, fuzzy
 msgid "Upload File"
 msgstr "ファイル読込み"
@@ -778,31 +777,31 @@
 msgid "Dump pages as XHTML"
 msgstr "XHTMLで出力"
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
 msgstr ""
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, fuzzy, php-format
 msgid "Edited by: %s"
 msgstr "編集: %s"
@@ -831,89 +830,89 @@
 msgid "Return to %s"
 msgstr "%s に戻る"
 
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr ""
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr ""
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr ""
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr "ディレクトリ '%s' を作成出来ません。"
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr ""
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
 msgstr "ディレクトリ '%s' を使用しています。"
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr ""
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr "%s を保存しました。"
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr ""
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr "%s  バイト書き込みました。"
 
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, fuzzy, php-format
 msgid "... not copied to %s"
 msgstr "%s: ファイルが見つかりません。"
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 #, fuzzy
 msgid "saved as "
 msgstr "%s を保存しました。"
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 #, fuzzy
 msgid "... not found"
 msgstr "%s: ファイルが見つかりません。"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr "ページ名が未指定です!"
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 #, fuzzy
 msgid "Invalid pagename!"
 msgstr "ユーザーIDかパスワードが無効です。"
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -922,74 +921,74 @@
 msgid "InterWikiMap"
 msgstr ""
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "%s から"
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 #, fuzzy
 msgid "New page"
 msgstr "新規ページ"
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr ""
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "MIMEファイル %s"
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr "シリアライズファイル %s"
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr "プレインファイル %s"
 
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr ""
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
@@ -998,111 +997,111 @@
 msgid "Revert"
 msgstr "転送"
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 #, fuzzy
 msgid "no page content"
 msgstr "コンテンツ"
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 #, fuzzy
 msgid "same version page"
 msgstr "ユーザーページ"
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 msgid "Cancelled"
 msgstr ""
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr ""
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr ""
 
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, fuzzy, php-format
 msgid "revert to version %d"
 msgstr "バージョン %d"
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1134
 #, fuzzy, php-format
 msgid "Revert: %s"
 msgstr "転送"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: 未定義でした。"
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr "'%s' を読込み中です。"
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr "%s をアップロード中です。"
@@ -1112,42 +1111,42 @@
 msgid "PageChange Notification of %s"
 msgstr "メール通知"
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "%s に戻る"
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "メール通知"
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 #, fuzzy
 msgid "Page change"
 msgstr "変更しませんでした。"
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "要約"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, fuzzy, php-format
 msgid "Page rename %s to %s"
 msgstr "%s から読込まれました。"
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "ページをロックしました。"
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 #, fuzzy
 msgid "E-Mail address confirmation"
 msgstr "メールアドレスを確認出来ました。"
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1162,7 +1161,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 #, fuzzy
 msgid "Optimizing database"
 msgstr "%s を最適化中です"
@@ -1450,8 +1449,8 @@
 msgstr ""
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 #, fuzzy
 msgid "Rename"
 msgstr "名称"
@@ -1475,7 +1474,7 @@
 msgstr "全文検索"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1517,8 +1516,8 @@
 msgid "Users will not be able to sign in."
 msgstr ""
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
 #: ../lib/PageList.php:93
@@ -1544,7 +1543,7 @@
 msgid "Click to de-/select all pages"
 msgstr ""
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr ""
@@ -1559,21 +1558,21 @@
 msgid "%s not found"
 msgstr "%s: ファイルが見つかりません。"
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
 #, fuzzy
 msgid "individual page permission"
 msgstr "ページバージョン:"
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
@@ -1584,19 +1583,19 @@
 msgstr "<一致しません>"
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 #, fuzzy
 msgid "Content"
 msgstr "コンテンツ"
 
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 #, fuzzy
 msgid "Permission"
 msgstr "バージョン"
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr ""
 
@@ -1678,7 +1677,7 @@
 msgstr "マークアップ"
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
@@ -1752,7 +1751,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "説明"
 
@@ -1780,12 +1779,14 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1827,7 +1828,7 @@
 msgid "Click to display all comments"
 msgstr "ページのロックを解除中です。"
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 #, fuzzy
 msgid "Click to display"
 msgstr "ページのロックを解除中です。"
@@ -1890,112 +1891,112 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 #, fuzzy
 msgid "users"
 msgstr "全ユーザー"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -2024,12 +2025,12 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 #, fuzzy
 msgid "Page successfully updated."
 msgstr "パスワード"
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
 msgstr ""
@@ -2135,7 +2136,7 @@
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2273,14 +2274,14 @@
 msgstr "%s を編集"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2334,9 +2335,8 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr ""
 
@@ -2388,26 +2388,50 @@
 msgid "Created by CreatePage"
 msgstr "ページを作成しています。"
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 #, fuzzy
 msgid "CreateToc"
 msgstr "作成: %s"
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+#, fuzzy
+msgid "No page specified."
+msgstr "変更点が見つかりませんでした。"
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, fuzzy, php-format
+msgid "Page '%s' does not exist."
+msgstr "プラグイン %s は無効になっています。"
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, php-format
+msgid "%s: no such revision %d."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:485
 #, fuzzy
 msgid "Click to display to TOC"
 msgstr "ページのロックを解除中です。"
@@ -2426,8 +2450,8 @@
 msgid "DeadEndPages"
 msgstr "ランダムページ"
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "差分"
 
@@ -2435,6 +2459,28 @@
 msgid "Display differences between revisions"
 msgstr ""
 
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "バージョン %d"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+msgid " is identical."
+msgstr ""
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "バージョン"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
 #: ../lib/plugin/DynamicIncludePage.php:35
 #, fuzzy
 msgid "DynamicIncludePage"
@@ -2459,7 +2505,7 @@
 msgid "Click to hide/show"
 msgstr "ページのロックを解除中です。"
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr "METAデータの編集"
 
@@ -2517,7 +2563,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr ""
@@ -2583,22 +2629,34 @@
 "Displays a url in a seperate frame inside our body. Only one frame allowed."
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
-#, php-format
-msgid "recursive inclusion of page %s"
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:94
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "バージョン %s"
+
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
 #, php-format
-msgid "recursive inclusion of url %s"
+msgid "Recursive inclusion of url %s"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2724,7 +2782,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, fuzzy, php-format
 msgid "%s is empty"
 msgstr "%s が空です。"
@@ -2790,36 +2848,39 @@
 msgid "Include text from another wiki page."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, php-format
-msgid "recursive inclusion of page %s ignored"
+msgid "Recursive inclusion of page %s ignored"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
+#: ../lib/plugin/IncludePage.php:91
 #, php-format
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
 #, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "%s(%d): no such revision"
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:157
+#, fuzzy, php-format
+msgid "Included from %s (revision %d)"
+msgstr "%s から読込まれました。"
+
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "%s から読込まれました。"
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr ""
@@ -2873,6 +2934,7 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
@@ -2914,6 +2976,8 @@
 
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3206,7 +3270,7 @@
 msgstr "ページはロック解除中です。"
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
+msgid "Download for Subversion"
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:154
@@ -3262,7 +3326,7 @@
 #: ../lib/plugin/PageDump.php:215
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
@@ -3286,12 +3350,13 @@
 msgid "Contents"
 msgstr "コンテンツ"
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr "次へ"
 
@@ -3634,7 +3699,7 @@
 msgid "List the most popular tags."
 msgstr ""
 
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 #, fuzzy
 msgid "CategoryCategory"
 msgstr "ホームページ作成:"
@@ -3686,7 +3751,7 @@
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr ""
 
@@ -3721,8 +3786,8 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr "ランダムページ"
@@ -4098,11 +4163,11 @@
 msgid "Recursive redirect to self: '%s'"
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
 msgstr ""
 
@@ -4384,75 +4449,75 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
+#: ../lib/plugin/SyncWiki.php:110
 msgid "Syncing this PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 #, fuzzy
 msgid "<unknown>"
 msgstr "<なし>"
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
+#: ../lib/plugin/SyncWiki.php:209
 msgid "Now upload all locally newer uploads."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
+#: ../lib/plugin/SyncWiki.php:274
 #, php-format
 msgid "%s force"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:276
+#: ../lib/plugin/SyncWiki.php:278
 #, fuzzy, php-format
 msgid "Postponed %s for %s."
 msgstr "%s のページ履歴一覧"
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 msgid "skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 #, fuzzy
 msgid "same content"
 msgstr "コンテンツ"
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr ""
@@ -4573,13 +4638,13 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:400
-#, php-format
-msgid "Application size: %d Kb"
+#, fuzzy, php-format
+msgid "Application size: %d KiB"
 msgstr "アプリケーションサイズ: %d キロバイト"
 
 #: ../lib/plugin/SystemInfo.php:402
 #, fuzzy, php-format
-msgid "Pagedata size: %d Kb"
+msgid "Pagedata size: %d KiB"
 msgstr "ページデーターサイズ: %s キロバイト"
 
 #: ../lib/plugin/SystemInfo.php:420
@@ -4686,6 +4751,11 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr ""
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr ""
@@ -4772,7 +4842,7 @@
 msgid "Transcluded from %s"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr ""
 
@@ -4859,79 +4929,79 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:179
+#: ../lib/plugin/UpLoad.php:178
 msgid "You cannot upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 msgid "Check you are logged in."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:213
+#: ../lib/plugin/UpLoad.php:212
 #, fuzzy, php-format
 msgid "ERROR uploading '%s'"
 msgstr "'%s' を読込み中です。"
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, php-format
 msgid "Files with extension %s are not allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:226
+#: ../lib/plugin/UpLoad.php:225
 #, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, fuzzy, php-format
 msgid "uploaded %s"
 msgstr "%s をアップロード中です。"
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 #, fuzzy
 msgid "Uploading failed."
 msgstr "ファイルを読込み中です。"
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:291
+#: ../lib/plugin/UpLoad.php:290
 msgid "The upload logfile exists but is not writable."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 msgid "Can't open the upload logfile."
 msgstr ""
 
@@ -5076,7 +5146,6 @@
 msgstr ""
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr ""
 
@@ -5115,6 +5184,9 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 #, fuzzy
 msgid "WatchPage"
 msgstr "幅"
@@ -5145,11 +5217,11 @@
 msgid "The page %s is already watched!"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -5157,6 +5229,12 @@
 msgid "Edit"
 msgstr "編集"
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#, fuzzy
+msgid "Watch Page"
+msgstr "幅"
+
 #: ../lib/plugin/WatchPage.php:110
 #, fuzzy
 msgid "You must sign in to watch pages."
@@ -5221,45 +5299,49 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
-#, php-format
-msgid "%s pages have been changed."
-msgstr ""
+#, fuzzy, php-format
+msgid "%d pages have been changed."
+msgstr "変更しませんでした。"
 
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 #, fuzzy
 msgid "No pages changed."
 msgstr "変更しませんでした。"
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 #, fuzzy
 msgid "Select the pages to change:"
 msgstr "貴方個人の言語を選択"
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr ""
 
@@ -5290,42 +5372,44 @@
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr "'%s' の削除に成功しました。"
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+#, fuzzy
+msgid "One page has been changed:"
+msgstr "変更しませんでした。"
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
-#, php-format
-msgid "%s pages have been permanently changed:"
-msgstr ""
+#, fuzzy, php-format
+msgid "%d pages have been changed:"
+msgstr "変更しませんでした。"
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:171
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
-msgstr ""
+#: ../lib/plugin/WikiAdminChown.php:173
+#, fuzzy
+msgid "Are you sure you want to change the owner of the selected pages?"
+msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminChown.php:175
+#: ../lib/plugin/WikiAdminChown.php:177
 #, fuzzy
 msgid "Change owner of selected pages"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminChown.php:176
+#: ../lib/plugin/WikiAdminChown.php:178
 #, fuzzy
 msgid "Select the pages to change the owner"
 msgstr "貴方個人の言語を選択"
 
-#: ../lib/plugin/WikiAdminChown.php:198
+#: ../lib/plugin/WikiAdminChown.php:200
 #, fuzzy
-msgid "Change owner"
+msgid "Change owner to: "
 msgstr "国名変更"
 
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
-msgstr ""
-
 #: ../lib/plugin/WikiAdminMarkup.php:36
 msgid "WikiAdminMarkup"
 msgstr ""
@@ -5354,25 +5438,24 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
-msgstr ""
+#: ../lib/plugin/WikiAdminMarkup.php:165
+#, fuzzy
+msgid "Are you sure you want to change the markup type of the selected files?"
+msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
+#: ../lib/plugin/WikiAdminMarkup.php:169
 #, fuzzy
 msgid "Change markup type"
 msgstr "国名変更"
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
+#: ../lib/plugin/WikiAdminMarkup.php:170
 #, fuzzy
 msgid "Select the pages to change the markup type"
 msgstr "貴方個人の言語を選択"
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
+#: ../lib/plugin/WikiAdminMarkup.php:192
 #, fuzzy
-msgid "Change markup"
+msgid "Change markup to: "
 msgstr "パスワード変更"
 
 #: ../lib/plugin/WikiAdminPurge.php:34
@@ -5394,25 +5477,35 @@
 msgid "Didn't purge page '%s'. Access denied."
 msgstr "'%s' の削除に成功しました。"
 
+#: ../lib/plugin/WikiAdminPurge.php:77
+#, fuzzy
+msgid "One page has been permanently purged:"
+msgstr "変更しませんでした。"
+
 #: ../lib/plugin/WikiAdminPurge.php:79
 #, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
 msgstr ""
 
+#: ../lib/plugin/WikiAdminPurge.php:85
+#, fuzzy
+msgid "No pages purged."
+msgstr "変更しませんでした。"
+
 #: ../lib/plugin/WikiAdminPurge.php:92
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:144
+#: ../lib/plugin/WikiAdminPurge.php:146
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:147
+#: ../lib/plugin/WikiAdminPurge.php:149
 #, fuzzy
 msgid "Permanently purge selected pages"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminPurge.php:148
+#: ../lib/plugin/WikiAdminPurge.php:150
 #, fuzzy
 msgid "Select the files to purge"
 msgstr "貴方個人の言語を選択"
@@ -5435,40 +5528,50 @@
 msgid "Didn't remove page '%s'. Access denied."
 msgstr "'%s' の削除に成功しました。"
 
+#: ../lib/plugin/WikiAdminRemove.php:121
+#, fuzzy
+msgid "One page has been removed:"
+msgstr "変更しませんでした。"
+
 #: ../lib/plugin/WikiAdminRemove.php:123
 #, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+#: ../lib/plugin/WikiAdminRemove.php:129
+#, fuzzy
+msgid "No pages removed."
+msgstr "変更点が見つかりませんでした。"
+
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 #, fuzzy
 msgid "Remove"
 msgstr "ページ削除"
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+#: ../lib/plugin/WikiAdminRemove.php:199
+msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminRemove.php:201
+#: ../lib/plugin/WikiAdminRemove.php:203
 #, fuzzy
 msgid "Select the files to remove"
 msgstr "あなたの個人のテーマを選択:"
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:211
+#: ../lib/plugin/WikiAdminRemove.php:213
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -5477,89 +5580,98 @@
 msgid "WikiAdminRename"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 #, fuzzy
 msgid "Rename selected pages"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminRename.php:79
+#: ../lib/plugin/WikiAdminRename.php:80
 #, php-format
 msgid "Page '%s' already exists. Ignored."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:82
+#: ../lib/plugin/WikiAdminRename.php:83
 #, fuzzy, php-format
 msgid "Access denied to rename page '%s'."
 msgstr "全ページ一覧"
 
-#: ../lib/plugin/WikiAdminRename.php:91
+#: ../lib/plugin/WikiAdminRename.php:92
 #, fuzzy, php-format
 msgid "Renamed page from '%s' to '%s'"
 msgstr "'%s' の削除に成功しました。"
 
-#: ../lib/plugin/WikiAdminRename.php:100
+#: ../lib/plugin/WikiAdminRename.php:101
 #, fuzzy, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr "'%s' の削除に成功しました。"
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, fuzzy, php-format
 msgid "Renamed page '%s' to '%s'."
 msgstr "'%s' の削除に成功しました。"
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:126
-#, php-format
-msgid "%s pages have been permanently renamed:"
-msgstr ""
+#: ../lib/plugin/WikiAdminRename.php:124
+#, fuzzy
+msgid "One page has been renamed:"
+msgstr "変更しませんでした。"
 
-#: ../lib/plugin/WikiAdminRename.php:132
+#: ../lib/plugin/WikiAdminRename.php:127
+#, fuzzy, php-format
+msgid "%d pages have been renamed:"
+msgstr "変更点が見つかりませんでした。"
+
+#: ../lib/plugin/WikiAdminRename.php:133
 #, fuzzy
 msgid "No pages renamed."
 msgstr "変更点が見つかりませんでした。"
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:209
-msgid "Are you sure you want to permanently rename the selected pages?"
+#: ../lib/plugin/WikiAdminRename.php:211
+msgid "Are you sure you want to rename the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:213
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 #, fuzzy
 msgid "Rename page"
 msgstr "ページ削除"
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 #, fuzzy
 msgid "Select the pages to rename:"
 msgstr "あなたの個人のテーマを選択:"
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 #, fuzzy
 msgid "from"
 msgstr "%s から"
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 #, fuzzy
 msgid "Regex?"
 msgstr "前後"
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
 msgstr ""
 
@@ -5585,34 +5697,33 @@
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 #, fuzzy
 msgid "Select the pages to search and replace"
 msgstr "貴方個人の言語を選択"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 #, fuzzy
 msgid "Replace"
 msgstr "テーマ"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr ""
 
@@ -5672,49 +5783,49 @@
 msgid "Invalid ACL"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 msgid "PhpWikiAdministration/SetAcl"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 msgid "Change Access Rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 #, fuzzy
 msgid "Select the pages where to change access rights"
 msgstr "貴方個人の言語を選択"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 #, fuzzy
 msgid "Selected Pages: "
 msgstr "保存しました: 5s"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 #, fuzzy
 msgid "Type"
 msgstr "ページの種類<:"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 msgid "(Currently not working)"
 msgstr ""
 
@@ -5736,12 +5847,12 @@
 msgid "PhpWikiAdministration/SetExternal"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 #, fuzzy
 msgid "Set pages to external"
 msgstr "あなたの個人のテーマを選択:"
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 #, fuzzy
 msgid "Select the pages to set as external"
 msgstr "あなたの個人のテーマを選択:"
@@ -5754,122 +5865,122 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, php-format
 msgid "Bad action requested: %s"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:100
+#: ../lib/plugin/WikiAdminUtils.php:102
 #, php-format
 msgid "WikiAdminUtils %s returned:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:102
+#: ../lib/plugin/WikiAdminUtils.php:104
 msgid "Back"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr "マークアップキャッシュの破棄"
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 msgid "Purge all Pages With Invalid Names"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 #, fuzzy
 msgid "Email Verification"
 msgstr "メールアドレスを確認出来ました。"
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr "マークアップキャッシュを破棄しました!"
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 msgid "No pages with bad names had to be deleted."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:147
-#, php-format
-msgid "Deleted %s pages with invalid names:"
-msgstr ""
+#: ../lib/plugin/WikiAdminUtils.php:149
+#, fuzzy, php-format
+msgid "Deleted %d pages with invalid names:"
+msgstr "あなたの個人のテーマを選択:"
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 msgid "No empty, unreferenced pages were found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:180
+#: ../lib/plugin/WikiAdminUtils.php:182
 #, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, php-format
 msgid "Converted successfully %d pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr "メール"
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:233
+#: ../lib/plugin/WikiAdminUtils.php:235
 #, fuzzy
 msgid "Username"
 msgstr "名称"
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr ""
 
@@ -5978,337 +6089,270 @@
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:47
-#, fuzzy
-msgid "AddCommentPlugin"
-msgstr "コメント"
-
-#: ../lib/plugin/_WikiTranslation.php:48
-#, fuzzy
-msgid "AddingPages"
-msgstr "ページを編集しています。"
-
-#: ../lib/plugin/_WikiTranslation.php:49
 msgid "AllPagesCreatedByMe"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:50
+#: ../lib/plugin/_WikiTranslation.php:48
 msgid "AllPagesLastEditedByMe"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:51
+#: ../lib/plugin/_WikiTranslation.php:49
 #, fuzzy
 msgid "AllPagesOwnedByMe"
 msgstr "全ページ"
 
 #: ../lib/plugin/_WikiTranslation.php:52
 #, fuzzy
-msgid "AuthorHistoryPlugin"
-msgstr "編集者:"
+msgid "CategoryHomePages"
+msgstr "ホームページ作成:"
 
-#: ../lib/plugin/_WikiTranslation.php:54
-#, fuzzy
-msgid "CalendarListPlugin"
-msgstr "カレンダー"
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
+#: ../themes/Crao/templates/navbar.tmpl:41
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/MonoBook/templates/navbar.tmpl:30
+#: ../themes/MonoBook/templates/navbar.tmpl:36
+#: ../themes/Portland/templates/navbar.tmpl:6
+#: ../themes/shamino_com/templates/top.tmpl:21
+#: ../themes/Sidebar/templates/search.tmpl:6
+#: ../themes/smaller/templates/navbar.tmpl:9
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
+#: ../themes/wikilens/templates/navbar.tmpl:19
+msgid "FindPage"
+msgstr "ページ検索"
 
-#: ../lib/plugin/_WikiTranslation.php:55
+#: ../lib/plugin/_WikiTranslation.php:56
 #, fuzzy
-msgid "CalendarPlugin"
-msgstr "カレンダー"
+msgid "FullRecentChanges"
+msgstr "変更履歴"
 
 #: ../lib/plugin/_WikiTranslation.php:57
 #, fuzzy
-msgid "CategoryHomePages"
-msgstr "ホームページ作成:"
+msgid "Help/AddingPages"
+msgstr "ページを編集しています。"
 
 #: ../lib/plugin/_WikiTranslation.php:58
 #, fuzzy
-msgid "CommentPlugin"
+msgid "Help/AddCommentPlugin"
 msgstr "コメント"
 
 #: ../lib/plugin/_WikiTranslation.php:59
 #, fuzzy
-msgid "CreateTocPlugin"
-msgstr "作成: %s"
+msgid "Help/AuthorHistoryPlugin"
+msgstr "編集者:"
 
+#: ../lib/plugin/_WikiTranslation.php:60
+#, fuzzy
+msgid "Help/CalendarListPlugin"
+msgstr "カレンダー"
+
+#: ../lib/plugin/_WikiTranslation.php:61
+#, fuzzy
+msgid "Help/CalendarPlugin"
+msgstr "カレンダー"
+
 #: ../lib/plugin/_WikiTranslation.php:62
 #, fuzzy
-msgid "EditMetaDataPlugin"
-msgstr "METAデータの編集"
+msgid "Help/CommentPlugin"
+msgstr "コメント"
 
 #: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
-msgstr ""
+#, fuzzy
+msgid "Help/CreateTocPlugin"
+msgstr "作成: %s"
 
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
-#: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
-#: ../themes/MonoBook/templates/navbar.tmpl:30
-#: ../themes/MonoBook/templates/navbar.tmpl:36
-#: ../themes/Portland/templates/navbar.tmpl:6
-#: ../themes/shamino_com/templates/top.tmpl:21
-#: ../themes/Sidebar/templates/search.tmpl:6
-#: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
-#: ../themes/wikilens/templates/navbar.tmpl:19
-msgid "FindPage"
-msgstr "ページ検索"
+#: ../lib/plugin/_WikiTranslation.php:64
+#, fuzzy
+msgid "Help/EditMetaDataPlugin"
+msgstr "METAデータの編集"
 
 #: ../lib/plugin/_WikiTranslation.php:65
+msgid "Help/ExternalSearchPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:66
 #, fuzzy
-msgid "FoafViewerPlugin"
+msgid "Help/FoafViewerPlugin"
 msgstr "カレンダー"
 
-#: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:67
 #, fuzzy
-msgid "FullRecentChanges"
-msgstr "変更履歴"
+msgid "Help/FrameIncludePlugin"
+msgstr "プラグイン"
 
 #: ../lib/plugin/_WikiTranslation.php:68
 #, fuzzy
-msgid "HelloWorldPlugin"
+msgid "Help/HelloWorldPlugin"
 msgstr "プラグイン"
 
 #: ../lib/plugin/_WikiTranslation.php:69
 #, fuzzy
-msgid "HomePageAlias"
-msgstr "ホームページ"
+msgid "Help/IncludePagePlugin"
+msgstr "インライン画像一覧"
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
+msgid "Help/LinkIcons"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:71
-#, fuzzy
-msgid "InterWiki"
-msgstr "InterWiki検索"
+msgid "Help/MagicPhpWikiURLs"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
+msgid "Help/MoreAboutMechanics"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
-msgstr ""
+#, fuzzy
+msgid "Help/OldStyleTablePlugin"
+msgstr "旧スタイルのテーブル"
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
-msgstr ""
+#, fuzzy
+msgid "Help/PhotoAlbumPlugin"
+msgstr "フォトアルバム"
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
-msgstr ""
+#, fuzzy
+msgid "Help/PhpHighlightPlugin"
+msgstr "PHPハイライト"
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
+msgid "Help/PhpWeatherPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:77
+msgid "Help/PhpWiki"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:78
 #, fuzzy
-msgid "OldStyleTablePlugin"
-msgstr "旧スタイルのテーブル"
+msgid "Help/PloticusPlugin"
+msgstr "フォトアルバム"
 
 #: ../lib/plugin/_WikiTranslation.php:79
 #, fuzzy
-msgid "PageGroupTest"
-msgstr "ページグループ"
+msgid "Help/RawHtmlPlugin"
+msgstr "プラグイン"
 
 #: ../lib/plugin/_WikiTranslation.php:80
 #, fuzzy
-msgid "PageGroupTest/Four"
-msgstr "ページグループ"
+msgid "Help/RedirectToPlugin"
+msgstr "転送"
 
 #: ../lib/plugin/_WikiTranslation.php:81
 #, fuzzy
-msgid "PageGroupTest/One"
-msgstr "ページグループ"
+msgid "Help/RichTablePlugin"
+msgstr "有効なプラグイン一覧"
 
 #: ../lib/plugin/_WikiTranslation.php:82
 #, fuzzy
-msgid "PageGroupTest/Three"
-msgstr "ページグループ"
+msgid "Help/SystemInfoPlugin"
+msgstr "システム情報"
 
 #: ../lib/plugin/_WikiTranslation.php:83
 #, fuzzy
-msgid "PageGroupTest/Two"
-msgstr "ページグループ"
+msgid "Help/TranscludePlugin"
+msgstr "プラグイン"
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:85
 #, fuzzy
-msgid "PhotoAlbumPlugin"
-msgstr "フォトアルバム"
+msgid "Help/UpLoadPlugin"
+msgstr "アップロード"
 
 #: ../lib/plugin/_WikiTranslation.php:86
-#, fuzzy
-msgid "PhpHighlightPlugin"
-msgstr "PHPハイライト"
+msgid "Help/WabiSabi"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
-msgstr ""
+#, fuzzy
+msgid "Help/WikiBlogPlugin"
+msgstr "プラグイン"
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
-msgstr ""
+#, fuzzy
+msgid "Help/WikiPlugin"
+msgstr "プラグイン"
 
 #: ../lib/plugin/_WikiTranslation.php:89
-msgid "PhpWikiAdministration/Chmod"
+msgid "Help/WikiWikiWeb"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:92
-msgid "PhpWikiAdministration/Rename"
-msgstr ""
+#: ../lib/plugin/_WikiTranslation.php:90
+#, fuzzy
+msgid "HomePageAlias"
+msgstr "ホームページ"
 
+#: ../lib/plugin/_WikiTranslation.php:91
+#, fuzzy
+msgid "InterWiki"
+msgstr "InterWiki検索"
+
 #: ../lib/plugin/_WikiTranslation.php:93
-msgid "PhpWikiAdministration/Replace"
+msgid "PhpWikiAdministration/Chmod"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:95
-#: ../themes/MonoBook/templates/navbar.tmpl:21
-msgid "PhpWikiDocumentation"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:96
-msgid "PhpWikiPoll"
+msgid "PhpWikiAdministration/Rename"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:97
-#, fuzzy
-msgid "PloticusPlugin"
-msgstr "フォトアルバム"
+msgid "PhpWikiAdministration/Replace"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:99
-msgid "PgsrcTranslation/de"
+#: ../themes/MonoBook/templates/navbar.tmpl:21
+msgid "PhpWikiDocumentation"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:100
-msgid "PgsrcTranslation/fr"
+msgid "PhpWikiPoll"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:101
-msgid "PgsrcTranslation/it"
+msgid "RecentVisitors"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:102
-msgid "PgsrcTranslation/es"
+msgid "ReleaseNotes"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:103
-msgid "PgsrcTranslation/nl"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:104
-msgid "PgsrcTranslation/sv"
+msgid "SteveWainstead"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:105
-msgid "PgsrcTranslation/ja"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:106
-msgid "PgsrcTranslation/zh"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:107
-#, fuzzy
-msgid "RawHtmlPlugin"
-msgstr "プラグイン"
-
-#: ../lib/plugin/_WikiTranslation.php:108
-msgid "RecentVisitors"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:109
-#, fuzzy
-msgid "RedirectToPlugin"
-msgstr "転送"
-
-#: ../lib/plugin/_WikiTranslation.php:110
-msgid "ReleaseNotes"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:111
-#, fuzzy
-msgid "RichTablePlugin"
-msgstr "有効なプラグイン一覧"
-
-#: ../lib/plugin/_WikiTranslation.php:113
-msgid "SteveWainstead"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:114
-#, fuzzy
-msgid "SystemInfoPlugin"
-msgstr "システム情報"
-
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 #, fuzzy
 msgid "UpLoad"
 msgstr "アップロード"
 
-#: ../lib/plugin/_WikiTranslation.php:119
-#, fuzzy
-msgid "UpLoadPlugin"
-msgstr "アップロード"
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:121
-#, fuzzy
-msgid "WikiBlogPlugin"
-msgstr "プラグイン"
-
-#: ../lib/plugin/_WikiTranslation.php:122
-#, fuzzy
-msgid "WikiPlugin"
-msgstr "プラグイン"
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr ""
@@ -6337,7 +6381,7 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 #, fuzzy
 msgid "Purge Page"
 msgstr "変更しませんでした。"
@@ -6359,7 +6403,7 @@
 "the database."
 msgstr ""
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr "ページ削除"
 
@@ -6371,8 +6415,8 @@
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 
@@ -6401,139 +6445,139 @@
 msgid "the file '%s'"
 msgstr "MIMEファイル %s"
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, fuzzy, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr "インライン画像一覧"
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 #, fuzzy
 msgid "Invalid image size"
 msgstr "インライン画像一覧"
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr "長すぎます。"
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, fuzzy, php-format
 msgid "Illegal chars %s removed"
 msgstr "ページ名が正しくありません。"
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr "リビジョンが見つかりません"
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr "バージョンが正しくありません。"
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1423
-#, fuzzy, php-format
-msgid "%s b"
-msgstr "%s バイト"
+#: ../lib/stdlib.php:1425
+#, php-format
+msgid "%s B"
+msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr "%s バイト"
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
+msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
-#, php-format
-msgid "%s Kb (%s bytes)"
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
+#, fuzzy, php-format
+msgid "%s KiB (%s bytes)"
 msgstr "%s キロバイト(%s バイト)"
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s が空です。"
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr "おっけー"
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -6838,7 +6882,7 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
@@ -6931,8 +6975,8 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
 msgstr ""
 
@@ -6962,7 +7006,7 @@
 msgid "Top Recommendations"
 msgstr "変更点が見つかりませんでした。"
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr ""
 
@@ -7012,69 +7056,64 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, fuzzy, php-format
-msgid "Version %s, saved %s"
-msgstr "バージョン %s"
+msgid "Version %s, saved on %s"
+msgstr "バージョン %d"
 
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, fuzzy, php-format
 msgid "Last edited %s"
 msgstr "最終編集日時"
 
 #: ../lib/WikiTheme.php:473
 #, fuzzy, php-format
-msgid "Version %s, saved on %s"
-msgstr "バージョン %d"
-
-#: ../lib/WikiTheme.php:475
-#, fuzzy, php-format
 msgid "Last edited on %s"
 msgstr "最終編集日時: %s"
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr "今日"
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr "昨日"
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, fuzzy, php-format
 msgid "Owner: %s"
 msgstr "ユーザーID:"
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
 msgstr "作成: %s"
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "'%s': ページ名が正しくありません"
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -7087,70 +7126,71 @@
 msgid "Sign Out"
 msgstr "サインサウト"
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "サインイン"
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 #, fuzzy
 msgid "Rename Page"
 msgstr "ページ削除"
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "ページロック"
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "ページロック解除"
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr "プリンター"
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr "上部と下部のツールバー"
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, fuzzy, php-format
 msgid "Plugin %s: undefined"
 msgstr "プラグイン %s が失敗しました。"
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr ""
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7230,58 +7270,58 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr "ユーザーIDかパスワードが無効です。"
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 #, fuzzy
 msgid "Invalid password."
 msgstr "ユーザーIDかパスワードが無効です。"
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr "ユーザーIDかパスワードが無効です。"
 
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 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:1338
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1781
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7290,14 +7330,14 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1841
+#: ../lib/WikiUserNew.php:1843
 #, php-format
-msgid "E-Mail address '%s' is not properly formatted"
+msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1845
+#: ../lib/WikiUserNew.php:1847
 #, php-format
-msgid "E-Mail address '%s' is properly formatted"
+msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
@@ -7472,10 +7512,10 @@
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7483,7 +7523,7 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
 msgstr "ソースを見る"
@@ -7559,12 +7599,11 @@
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7575,12 +7614,11 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
@@ -7589,10 +7627,8 @@
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7603,7 +7639,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7655,6 +7691,8 @@
 
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
 #, fuzzy
@@ -7674,41 +7712,41 @@
 msgid "Comments on %s by %s."
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 #, fuzzy
 msgid "SignOut"
 msgstr "サインサウト"
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 #, fuzzy
 msgid "SignIn"
 msgstr "サインイン"
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 #, fuzzy
 msgid "Lock"
 msgstr "ロックしました"
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 #, fuzzy
 msgid "Unlock"
 msgstr "ページロック解除"
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 #, fuzzy
 msgid "blog"
 msgstr "ダイアログ"
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr "(差分)"
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -7824,17 +7862,25 @@
 msgid "Help/OldTextFormattingRules"
 msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr ""
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr ""
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7885,9 +7931,9 @@
 msgstr "%s バイト"
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, fuzzy, php-format
 msgid ", Memory: %s"
 msgstr "編集: %s"
@@ -8000,11 +8046,24 @@
 msgid "Hits:"
 msgstr "ヒット数:"
 
+#: ../themes/default/templates/info.tmpl:133
+msgid "Is External:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:134
 #, fuzzy
 msgid "No"
 msgstr "なし"
 
+#: ../themes/default/templates/info.tmpl:138
+#, fuzzy
+msgid "ACL type:"
+msgstr "データベースタイプ"
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
@@ -8150,44 +8209,17 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "プレビューする"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-#, fuzzy
-msgid "Next >>"
-msgstr "次へ"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ""
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr ""
@@ -8240,34 +8272,34 @@
 
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
 msgstr "<システムテーマ>"
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr "個人テーマ"
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
 msgstr "<システム言語>"
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
 msgstr "個人言語"
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
 #, fuzzy, php-format
 msgid "User preferences for user %s"
 msgstr "ユーザー設定"
@@ -8343,43 +8375,43 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr "外観"
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr ""
 
@@ -8389,7 +8421,7 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, fuzzy, php-format
 msgid "Hide %s:"
 msgstr "ヒット数:"
@@ -8401,13 +8433,13 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, fuzzy, php-format
 msgid "Add %s:"
 msgstr "ヒット数:"
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
@@ -8426,23 +8458,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
 msgstr "編集エリアのサイズ"
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr "高さ"
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr "幅"
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8450,45 +8482,45 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr "タイムゾーン"
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
 msgstr "データフォーマット"
 
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr "設定を更新しました"
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 #, fuzzy
 msgid "Reset Preferences"
 msgstr "参照一覧"
@@ -8507,25 +8539,19 @@
 msgid "Posted: %s"
 msgstr "ユーザーID:"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
-msgid "/Discussion"
-msgstr "バージョン"
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
-#, fuzzy
 msgid "Action Page"
 msgstr "操作ページ"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
 msgid "Page"
 msgstr "ホームページ"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
 #, fuzzy
 msgid "Template/Talk"
@@ -8538,55 +8564,58 @@
 msgid "Create Page"
 msgstr "ページを作成しています。"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
 #, fuzzy
 msgid "History"
 msgstr "ページ履歴"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 #, fuzzy
 msgid "Last Difference"
 msgstr "設定を更新しました"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 #, fuzzy
 msgid "Page Info"
 msgstr "ページ情報"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 #, fuzzy
 msgid "Back Links"
 msgstr "ログイン"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 #, fuzzy
 msgid "Change Owner"
 msgstr "国名変更"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 #, fuzzy
 msgid "Purge"
 msgstr "前後"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-#, fuzzy
-msgid "Watch Page"
-msgstr "幅"
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr ""
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr ""
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+msgid "This revision of the page does not exist."
+msgstr ""
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
 msgstr ""
@@ -8596,64 +8625,117 @@
 msgid "Make the page external?"
 msgstr "あなたの個人のテーマを選択:"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #, fuzzy
+msgid "Home Page"
+msgstr "ホームページ"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+#, fuzzy
+msgid "Recent Changes"
+msgstr "変更履歴"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+#, fuzzy
 msgid "SpecialPages"
 msgstr "シリアライズページを出力しています。"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:11
 #, fuzzy
+msgid "Special Pages"
+msgstr "シリアライズページを出力しています。"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+#, fuzzy
+msgid "Random Page"
+msgstr "ランダムページ"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
+#, fuzzy
 msgid "Like Pages"
 msgstr "ページロック"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #, fuzzy
+msgid "Wiki Admin"
+msgstr "管理"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+#, fuzzy
+msgid "My User Page"
+msgstr "ユーザーページ"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+#, fuzzy
+msgid "User Preferences"
+msgstr "ユーザー設定"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "ユーザー設定"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
+#, fuzzy
 msgid "E-mail Notification"
 msgstr "メールアドレスを確認出来ました。"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "ユーザー設定"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-#, fuzzy
-msgid "Random Page"
-msgstr "ランダムページ"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 #, fuzzy
 msgid "Check menu items to display."
 msgstr "ページのロックを解除中です。"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 #, fuzzy
 msgid "Show Page Trail"
 msgstr "ページ名"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:73
 #, fuzzy
 msgid "This page is external."
 msgstr "'%s' の削除に成功しました。"
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -8897,6 +8979,46 @@
 msgstr "古いリビジョンを編集する"
 
 #, fuzzy
+#~ msgid "Server rejected address: "
+#~ msgstr "選択ページを全て削除"
+
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "次へ"
+
+#, fuzzy
+#~ msgid "Version %s, saved %s"
+#~ msgstr "バージョン %s"
+
+#, fuzzy
+#~ msgid "PageGroupTest"
+#~ msgstr "ページグループ"
+
+#, fuzzy
+#~ msgid "PageGroupTest/Four"
+#~ msgstr "ページグループ"
+
+#, fuzzy
+#~ msgid "PageGroupTest/One"
+#~ msgstr "ページグループ"
+
+#, fuzzy
+#~ msgid "PageGroupTest/Three"
+#~ msgstr "ページグループ"
+
+#, fuzzy
+#~ msgid "PageGroupTest/Two"
+#~ msgstr "ページグループ"
+
+#, fuzzy
+#~ msgid "%s b"
+#~ msgstr "%s バイト"
+
+#, fuzzy
+#~ msgid "/Discussion"
+#~ msgstr "バージョン"
+
+#, fuzzy
 #~ msgid "HasHomePage"
 #~ msgstr "ホームページ"
 
@@ -8925,10 +9047,6 @@
 #~ msgstr "全ページ一覧"
 
 #, fuzzy
-#~ msgid "%s: "
-#~ msgstr "%s バイト"
-
-#, fuzzy
 #~ msgid "Page history"
 #~ msgstr "ページ履歴"
 
@@ -8980,10 +9098,6 @@
 #~ msgstr "'%s' の削除に成功しました。"
 
 #, fuzzy
-#~ msgid "Revert selected pages"
-#~ msgstr "選択ページを全て削除"
-
-#, fuzzy
 #~ msgid "Ok"
 #~ msgstr "おっけー"
 
@@ -8998,9 +9112,6 @@
 #~ msgid "Sign in:"
 #~ msgstr "サインイン"
 
-#~ msgid "db type:"
-#~ msgstr "データベースタイプ"
-
 #~ msgid "db backend:"
 #~ msgstr "データベースバックエンド"
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/nl.po
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/nl.po	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/nl.po	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,14 +6,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.4pre\n"
+"Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <janneke at gnu.org>\n"
 "Language-Team: Dutch <nl at li.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Date: 1998-05-26 11:26:28+0200\n"
 "From:  <janneke at gnu.org>\n"
@@ -49,12 +50,12 @@
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr ""
@@ -74,8 +75,8 @@
 msgid "version %s"
 msgstr "versie %s"
 
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr "door %s"
@@ -91,7 +92,7 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr ""
 
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr "Diff van: %s"
@@ -147,85 +148,65 @@
 msgid "Older page:"
 msgstr ""
 
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "huidige versie"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Versies zijn identiek"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Versie"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr ""
 
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr "RecenteVeranderingen"
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -241,14 +222,14 @@
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
-msgstr ""
+msgstr "ZandBak"
 
 #: ../lib/editpage.php:163 ../lib/editpage.php:584
 msgid "Your version"
@@ -343,7 +324,7 @@
 msgid "Versions are identical"
 msgstr "Versies zijn identiek"
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr "Sidan är Låst"
 
@@ -383,19 +364,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr "GebruikersVoorkeuren"
@@ -451,12 +432,11 @@
 msgstr "Bewaar"
 
 #: ../lib/editpage.php:709
-#, fuzzy
 msgid "Changes"
-msgstr "RecenteVeranderingen"
+msgstr "Veranderingen"
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr ""
 
@@ -504,8 +484,8 @@
 msgid "String \"%s\" not found."
 msgstr ""
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
 msgstr "Zoek & Vervangt"
 
@@ -518,8 +498,8 @@
 msgid "Replace with"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -530,9 +510,9 @@
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr ""
 
@@ -621,8 +601,8 @@
 msgid "List"
 msgstr "Links"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 msgid "Table of Contents"
 msgstr ""
 
@@ -631,8 +611,8 @@
 msgid "Page Name"
 msgstr "Pagina Naam"
 
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr ""
 
@@ -646,57 +626,57 @@
 msgid "Template"
 msgstr ""
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 msgid "AddCategory"
 msgstr ""
 
-#: ../lib/EditToolbar.php:321
+#: ../lib/EditToolbar.php:320
 msgid "Insert Categories"
 msgstr ""
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 msgid "AddPlugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:371
+#: ../lib/EditToolbar.php:370
 msgid "Insert Plugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 msgid "AddPageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:401
+#: ../lib/EditToolbar.php:400
 msgid "Insert PageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 msgid "Add Image or Video"
 msgstr ""
 
-#: ../lib/EditToolbar.php:439
+#: ../lib/EditToolbar.php:438
 msgid "Insert Image or Video"
 msgstr ""
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:474
+#: ../lib/EditToolbar.php:473
 msgid "Insert Template"
 msgstr ""
 
@@ -705,23 +685,23 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr ""
 
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr "Naamloos PhpWiki"
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr "ThuisPagina"
@@ -730,7 +710,23 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:889
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+msgid ": "
+msgstr ""
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -743,7 +739,7 @@
 msgid "Dump to directory"
 msgstr ""
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 msgid "Upload File"
 msgstr ""
 
@@ -759,31 +755,31 @@
 msgid "Dump pages as XHTML"
 msgstr ""
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
 msgstr "PhpWikiBeheer"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
 msgstr "Verander von: %s"
@@ -811,86 +807,86 @@
 msgid "Return to %s"
 msgstr "Terug naar %s"
 
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr ""
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr ""
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr "Je moet een directory specificeren om in te storten"
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr ""
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr ""
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr "bewaard als %s"
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr ""
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr ""
 
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, php-format
 msgid "... not copied to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 msgid "saved as "
 msgstr ""
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr ""
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr ""
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 msgid "Invalid pagename!"
 msgstr ""
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -899,73 +895,73 @@
 msgid "InterWikiMap"
 msgstr ""
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "van %s"
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nieuw pagina"
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr ""
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- bewaard in de data base als versie %d"
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME bestand %s"
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr "Geserialiseerd bestand %s"
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr "plat bestand %s"
 
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr ""
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
@@ -973,110 +969,110 @@
 msgid "Revert"
 msgstr ""
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 msgid "no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 msgid "same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 #, fuzzy
 msgid "Cancelled"
 msgstr "Annuleer"
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr ""
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1134
 #, fuzzy, php-format
 msgid "Revert: %s"
 msgstr "Verwijder von: %s"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr ""
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr "Overgeslagen"
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr "Laden van maagdelijke wiki"
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr ""
@@ -1086,40 +1082,40 @@
 msgid "PageChange Notification of %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "Terug naar %s"
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Kan verbinding naar data base %s niet tot stand brengen, geef op."
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr ""
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "Vorige Auteur"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "Verwijder %s"
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 msgid "E-Mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1134,7 +1130,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 msgid "Optimizing database"
 msgstr ""
 
@@ -1404,8 +1400,8 @@
 msgstr ""
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr ""
 
@@ -1427,7 +1423,7 @@
 msgstr "VolledigeTekstZoek"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1469,8 +1465,8 @@
 msgid "Users will not be able to sign in."
 msgstr ""
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
 #: ../lib/PageList.php:93
@@ -1495,7 +1491,7 @@
 msgid "Click to de-/select all pages"
 msgstr ""
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr ""
@@ -1510,20 +1506,20 @@
 msgid "%s not found"
 msgstr ""
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
 msgid "individual page permission"
 msgstr ""
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
@@ -1534,17 +1530,17 @@
 msgstr ""
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 msgid "Content"
 msgstr ""
 
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 msgid "Permission"
 msgstr ""
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr ""
 
@@ -1625,7 +1621,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
@@ -1694,7 +1690,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr ""
 
@@ -1722,12 +1718,14 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1765,7 +1763,7 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr ""
 
@@ -1825,111 +1823,111 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -1957,11 +1955,11 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, fuzzy, php-format
 msgid "Go to %s."
 msgstr "Terug naar %s."
@@ -2062,7 +2060,7 @@
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2197,14 +2195,14 @@
 msgstr "Verander %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2256,9 +2254,8 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr ""
 
@@ -2306,25 +2303,50 @@
 msgid "Created by CreatePage"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+#, fuzzy
+msgid "No page specified."
+msgstr "Je bent ingelogd als %s."
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, php-format
+msgid "Page '%s' does not exist."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
+#: ../lib/plugin/CreateToc.php:407
+#, fuzzy
+msgid "Error: version must be a positive integer."
+msgstr "Je moet een bron specificeren om van te lezen."
+
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, php-format
+msgid "%s: no such revision %d."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr ""
 
@@ -2340,8 +2362,8 @@
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "Diff"
 
@@ -2349,6 +2371,29 @@
 msgid "Display differences between revisions"
 msgstr ""
 
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "huidige versie"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Versies zijn identiek"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Versie"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
 #: ../lib/plugin/DynamicIncludePage.php:35
 msgid "DynamicIncludePage"
 msgstr ""
@@ -2371,7 +2416,7 @@
 msgid "Click to hide/show"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr ""
 
@@ -2428,7 +2473,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr ""
@@ -2493,22 +2538,34 @@
 "Displays a url in a seperate frame inside our body. Only one frame allowed."
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
-#, php-format
-msgid "recursive inclusion of page %s"
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:94
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "Delete op %s gefaald: %s"
+
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
 #, php-format
-msgid "recursive inclusion of url %s"
+msgid "Recursive inclusion of url %s"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2632,7 +2689,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, php-format
 msgid "%s is empty"
 msgstr ""
@@ -2697,36 +2754,40 @@
 msgid "Include text from another wiki page."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, php-format
-msgid "recursive inclusion of page %s ignored"
+msgid "Recursive inclusion of page %s ignored"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
+#: ../lib/plugin/IncludePage.php:91
 #, php-format
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
 #, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "%s(%d): no such revision"
-msgstr ""
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+#, fuzzy
+msgid "Error: rev must be a positive integer."
+msgstr "Je moet een bron specificeren om van te lezen."
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:157
+#, fuzzy, php-format
+msgid "Included from %s (revision %d)"
+msgstr "van %s"
+
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr ""
@@ -2776,6 +2837,7 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
@@ -2815,6 +2877,8 @@
 
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3023,7 +3087,7 @@
 
 #: ../lib/plugin/MostPopular.php:30
 msgid "MostPopular"
-msgstr "Meestbezochte"
+msgstr "MeestBezocht"
 
 #: ../lib/plugin/MostPopular.php:34
 msgid "List the most popular pages."
@@ -3100,7 +3164,7 @@
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
+msgid "Download for Subversion"
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:154
@@ -3156,7 +3220,7 @@
 #: ../lib/plugin/PageDump.php:215
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
@@ -3179,12 +3243,13 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr "Volgende"
 
@@ -3492,7 +3557,7 @@
 #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124
 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "Help"
-msgstr ""
+msgstr "Help"
 
 #: ../lib/plugin/PopularNearby.php:44
 msgid "PopularNearby"
@@ -3526,7 +3591,7 @@
 msgid "List the most popular tags."
 msgstr ""
 
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr ""
 
@@ -3574,7 +3639,7 @@
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr ""
 
@@ -3608,8 +3673,8 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr ""
@@ -3711,9 +3776,8 @@
 #: ../lib/plugin/RecentChanges.php:59
 #: ../themes/MonoBook/templates/navbar.tmpl:18
 #: ../themes/Sidebar/templates/navbar.tmpl:46
-#, fuzzy
 msgid "RecentNewPages"
-msgstr "RecenteVeranderingen"
+msgstr ""
 
 #: ../lib/plugin/RecentChanges.php:61 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentEdits.php:29
@@ -3907,9 +3971,8 @@
 msgstr "Sidan är Låst"
 
 #: ../lib/plugin/RecentChanges.php:1483
-#, fuzzy
 msgid "Full changes"
-msgstr "RecenteVeranderingen"
+msgstr ""
 
 #: ../lib/plugin/RecentChanges.php:1494
 #, fuzzy
@@ -3976,11 +4039,11 @@
 msgid "Recursive redirect to self: '%s'"
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
 msgstr ""
 
@@ -4256,73 +4319,73 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
+#: ../lib/plugin/SyncWiki.php:110
 msgid "Syncing this PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 msgid "<unknown>"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
+#: ../lib/plugin/SyncWiki.php:209
 msgid "Now upload all locally newer uploads."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
+#: ../lib/plugin/SyncWiki.php:274
 #, php-format
 msgid "%s force"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:276
+#: ../lib/plugin/SyncWiki.php:278
 #, php-format
 msgid "Postponed %s for %s."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 msgid "skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 msgid "same content"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr ""
@@ -4443,12 +4506,12 @@
 
 #: ../lib/plugin/SystemInfo.php:400
 #, php-format
-msgid "Application size: %d Kb"
+msgid "Application size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:402
 #, php-format
-msgid "Pagedata size: %d Kb"
+msgid "Pagedata size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:420
@@ -4555,6 +4618,11 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr ""
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr ""
@@ -4641,7 +4709,7 @@
 msgid "Transcluded from %s"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr ""
 
@@ -4728,78 +4796,78 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:179
+#: ../lib/plugin/UpLoad.php:178
 msgid "You cannot upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 msgid "Check you are logged in."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:213
+#: ../lib/plugin/UpLoad.php:212
 #, php-format
 msgid "ERROR uploading '%s'"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, php-format
 msgid "Files with extension %s are not allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:226
+#: ../lib/plugin/UpLoad.php:225
 #, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, php-format
 msgid "uploaded %s"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 msgid "Uploading failed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:291
+#: ../lib/plugin/UpLoad.php:290
 msgid "The upload logfile exists but is not writable."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 msgid "Can't open the upload logfile."
 msgstr ""
 
@@ -4939,7 +5007,6 @@
 msgstr ""
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr ""
 
@@ -4977,6 +5044,9 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 #, fuzzy
 msgid "WatchPage"
 msgstr "Breedte"
@@ -5007,11 +5077,11 @@
 msgid "The page %s is already watched!"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -5019,6 +5089,12 @@
 msgid "Edit"
 msgstr "Verander"
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#, fuzzy
+msgid "Watch Page"
+msgstr "Breedte"
+
 #: ../lib/plugin/WatchPage.php:110
 msgid "You must sign in to watch pages."
 msgstr ""
@@ -5083,42 +5159,46 @@
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
 #, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 msgid "No pages changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Select the pages to change:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr ""
 
@@ -5149,40 +5229,39 @@
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr ""
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been changed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
 #, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:171
+#: ../lib/plugin/WikiAdminChown.php:173
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr "Verwijder pagina"
 
-#: ../lib/plugin/WikiAdminChown.php:175
+#: ../lib/plugin/WikiAdminChown.php:177
 #, fuzzy
 msgid "Change owner of selected pages"
 msgstr "PaginaGeschiedenis"
 
-#: ../lib/plugin/WikiAdminChown.php:176
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:198
-#, fuzzy
-msgid "Change owner"
-msgstr "RecenteVeranderingen"
-
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
+#: ../lib/plugin/WikiAdminChown.php:200
+msgid "Change owner to: "
 msgstr ""
 
 #: ../lib/plugin/WikiAdminMarkup.php:36
@@ -5209,33 +5288,28 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminMarkup.php:109
-#, fuzzy
 msgid "PhpWikiAdministration/Markup"
-msgstr "PhpWikiBeheer"
+msgstr "PhpWikiBeheer/Markup"
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
-msgstr "Verwijder pagina"
+#: ../lib/plugin/WikiAdminMarkup.php:165
+msgid "Are you sure you want to change the markup type of the selected files?"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
+#: ../lib/plugin/WikiAdminMarkup.php:169
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
-msgid "Change markup"
+#: ../lib/plugin/WikiAdminMarkup.php:192
+msgid "Change markup to: "
 msgstr ""
 
 #: ../lib/plugin/WikiAdminPurge.php:34
-#, fuzzy
 msgid "WikiAdminPurge"
-msgstr "PhpWikiBeheer"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminPurge.php:38
 #, fuzzy
@@ -5252,27 +5326,33 @@
 msgid "Didn't purge page '%s'. Access denied."
 msgstr "Pagina '%s' verwijderd."
 
+#: ../lib/plugin/WikiAdminPurge.php:77
+msgid "One page has been permanently purged:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminPurge.php:79
 #, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
 msgstr ""
 
+#: ../lib/plugin/WikiAdminPurge.php:85
+#, fuzzy
+msgid "No pages purged."
+msgstr "Je bent ingelogd als %s."
+
 #: ../lib/plugin/WikiAdminPurge.php:92
-#, fuzzy
 msgid "PhpWikiAdministration/Purge"
-msgstr "PhpWikiBeheer"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:144
-#, fuzzy
+#: ../lib/plugin/WikiAdminPurge.php:146
 msgid "Are you sure you want to permanently purge the following files?"
-msgstr "Verwijder pagina"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:147
-#, fuzzy
+#: ../lib/plugin/WikiAdminPurge.php:149
 msgid "Permanently purge selected pages"
-msgstr "PaginaGeschiedenis"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:148
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5294,38 +5374,48 @@
 msgid "Didn't remove page '%s'. Access denied."
 msgstr "Pagina '%s' verwijderd."
 
+#: ../lib/plugin/WikiAdminRemove.php:121
+msgid "One page has been removed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminRemove.php:123
 #, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+#: ../lib/plugin/WikiAdminRemove.php:129
+#, fuzzy
+msgid "No pages removed."
+msgstr "Je bent ingelogd als %s."
+
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
-msgstr ""
+#: ../lib/plugin/WikiAdminRemove.php:199
+#, fuzzy
+msgid "Are you sure you want to remove the selected files?"
+msgstr "Verwijder pagina"
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:201
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:211
+#: ../lib/plugin/WikiAdminRemove.php:213
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -5334,85 +5424,93 @@
 msgid "WikiAdminRename"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 msgid "Rename selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:79
+#: ../lib/plugin/WikiAdminRename.php:80
 #, php-format
 msgid "Page '%s' already exists. Ignored."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:82
+#: ../lib/plugin/WikiAdminRename.php:83
 #, php-format
 msgid "Access denied to rename page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:91
+#: ../lib/plugin/WikiAdminRename.php:92
 #, fuzzy, php-format
 msgid "Renamed page from '%s' to '%s'"
 msgstr "Pagina '%s' verwijderd."
 
-#: ../lib/plugin/WikiAdminRename.php:100
+#: ../lib/plugin/WikiAdminRename.php:101
 #, fuzzy, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr "Pagina '%s' verwijderd."
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:126
+#: ../lib/plugin/WikiAdminRename.php:124
+msgid "One page has been renamed:"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:127
 #, php-format
-msgid "%s pages have been permanently renamed:"
+msgid "%d pages have been renamed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:132
+#: ../lib/plugin/WikiAdminRename.php:133
 msgid "No pages renamed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:209
+#: ../lib/plugin/WikiAdminRename.php:211
 #, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
 msgstr "Verwijder pagina"
 
-#: ../lib/plugin/WikiAdminRename.php:213
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 #, fuzzy
 msgid "Rename page"
 msgstr "Verwijder Pagina"
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 msgid "from"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 msgid "Regex?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
 msgstr ""
 
@@ -5438,34 +5536,33 @@
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr "Verwijder pagina"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 msgid "Select the pages to search and replace"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 #, fuzzy
 msgid "Replace"
 msgstr "Zoek & Vervangt"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr ""
 
@@ -5525,47 +5622,47 @@
 msgid "Invalid ACL"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 msgid "PhpWikiAdministration/SetAcl"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
 msgstr "Verwijder pagina"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 msgid "Change Access Rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 msgid "Select the pages where to change access rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 msgid "Selected Pages: "
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 msgid "Type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 msgid "(Currently not working)"
 msgstr ""
 
@@ -5584,16 +5681,14 @@
 msgstr "Pagina '%s' verwijderd."
 
 #: ../lib/plugin/WikiAdminSetExternal.php:95
-#, fuzzy
 msgid "PhpWikiAdministration/SetExternal"
-msgstr "PhpWikiBeheer"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
-#, fuzzy
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 msgid "Set pages to external"
-msgstr "Nieuw pagina"
+msgstr ""
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 msgid "Select the pages to set as external"
 msgstr ""
 
@@ -5605,121 +5700,121 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, php-format
 msgid "Bad action requested: %s"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:100
+#: ../lib/plugin/WikiAdminUtils.php:102
 #, php-format
 msgid "WikiAdminUtils %s returned:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:102
+#: ../lib/plugin/WikiAdminUtils.php:104
 #, fuzzy
 msgid "Back"
 msgstr "TerugLinks"
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 msgid "Purge all Pages With Invalid Names"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 msgid "No pages with bad names had to be deleted."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:147
+#: ../lib/plugin/WikiAdminUtils.php:149
 #, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 msgid "No empty, unreferenced pages were found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:180
+#: ../lib/plugin/WikiAdminUtils.php:182
 #, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, php-format
 msgid "Converted successfully %d pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:233
+#: ../lib/plugin/WikiAdminUtils.php:235
 msgid "Username"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr ""
 
@@ -5827,305 +5922,240 @@
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:47
-msgid "AddCommentPlugin"
+msgid "AllPagesCreatedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:48
-msgid "AddingPages"
+msgid "AllPagesLastEditedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:49
-msgid "AllPagesCreatedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:50
-msgid "AllPagesLastEditedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:51
 msgid "AllPagesOwnedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:52
-msgid "AuthorHistoryPlugin"
+msgid "CategoryHomePages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:54
-msgid "CalendarListPlugin"
-msgstr ""
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
+#: ../themes/Crao/templates/navbar.tmpl:41
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/MonoBook/templates/navbar.tmpl:30
+#: ../themes/MonoBook/templates/navbar.tmpl:36
+#: ../themes/Portland/templates/navbar.tmpl:6
+#: ../themes/shamino_com/templates/top.tmpl:21
+#: ../themes/Sidebar/templates/search.tmpl:6
+#: ../themes/smaller/templates/navbar.tmpl:9
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
+#: ../themes/wikilens/templates/navbar.tmpl:19
+msgid "FindPage"
+msgstr "ZoekPagina"
 
-#: ../lib/plugin/_WikiTranslation.php:55
-msgid "CalendarPlugin"
+#: ../lib/plugin/_WikiTranslation.php:56
+msgid "FullRecentChanges"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:57
-msgid "CategoryHomePages"
+msgid "Help/AddingPages"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:58
-msgid "CommentPlugin"
+msgid "Help/AddCommentPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:59
-msgid "CreateTocPlugin"
+msgid "Help/AuthorHistoryPlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:60
+msgid "Help/CalendarListPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:61
+msgid "Help/CalendarPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:62
-msgid "EditMetaDataPlugin"
+msgid "Help/CommentPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
+msgid "Help/CreateTocPlugin"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
-#: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
-#: ../themes/MonoBook/templates/navbar.tmpl:30
-#: ../themes/MonoBook/templates/navbar.tmpl:36
-#: ../themes/Portland/templates/navbar.tmpl:6
-#: ../themes/shamino_com/templates/top.tmpl:21
-#: ../themes/Sidebar/templates/search.tmpl:6
-#: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
-#: ../themes/wikilens/templates/navbar.tmpl:19
-msgid "FindPage"
-msgstr "ZoekPagina"
+#: ../lib/plugin/_WikiTranslation.php:64
+msgid "Help/EditMetaDataPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:65
-msgid "FoafViewerPlugin"
+msgid "Help/ExternalSearchPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
+msgid "Help/FoafViewerPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:67
-msgid "FullRecentChanges"
+msgid "Help/FrameIncludePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:68
-msgid "HelloWorldPlugin"
+msgid "Help/HelloWorldPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:69
-msgid "HomePageAlias"
+msgid "Help/IncludePagePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
+msgid "Help/LinkIcons"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:71
-msgid "InterWiki"
+msgid "Help/MagicPhpWikiURLs"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
+msgid "Help/MoreAboutMechanics"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
+msgid "Help/OldStyleTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
+msgid "Help/PhotoAlbumPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
+msgid "Help/PhpHighlightPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
+msgid "Help/PhpWeatherPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:77
-msgid "OldStyleTablePlugin"
+msgid "Help/PhpWiki"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:78
+msgid "Help/PloticusPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:79
-msgid "PageGroupTest"
+msgid "Help/RawHtmlPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:80
-msgid "PageGroupTest/Four"
+msgid "Help/RedirectToPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:81
-msgid "PageGroupTest/One"
+msgid "Help/RichTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:82
-msgid "PageGroupTest/Three"
+msgid "Help/SystemInfoPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:83
-msgid "PageGroupTest/Two"
+msgid "Help/TranscludePlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:85
-msgid "PhotoAlbumPlugin"
+msgid "Help/UpLoadPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:86
-msgid "PhpHighlightPlugin"
-msgstr ""
+msgid "Help/WabiSabi"
+msgstr "Help/WabiSabi"
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
+msgid "Help/WikiBlogPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
+msgid "Help/WikiPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:89
+msgid "Help/WikiWikiWeb"
+msgstr "Help/WikiWikiWeb"
+
+#: ../lib/plugin/_WikiTranslation.php:90
+msgid "HomePageAlias"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:91
+msgid "InterWiki"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:93
 msgid "PhpWikiAdministration/Chmod"
 msgstr "PhpWikiBeheer/Chmod"
 
-#: ../lib/plugin/_WikiTranslation.php:92
+#: ../lib/plugin/_WikiTranslation.php:96
 msgid "PhpWikiAdministration/Rename"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:93
+#: ../lib/plugin/_WikiTranslation.php:97
 msgid "PhpWikiAdministration/Replace"
 msgstr "PhpWikiBeheer/Vervangt"
 
-#: ../lib/plugin/_WikiTranslation.php:95
+#: ../lib/plugin/_WikiTranslation.php:99
 #: ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "PhpWikiDocumentation"
 msgstr "PhpWikiDocumentatie"
 
-#: ../lib/plugin/_WikiTranslation.php:96
+#: ../lib/plugin/_WikiTranslation.php:100
 msgid "PhpWikiPoll"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:97
-msgid "PloticusPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:99
-msgid "PgsrcTranslation/de"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:100
-msgid "PgsrcTranslation/fr"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:101
-msgid "PgsrcTranslation/it"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:102
-msgid "PgsrcTranslation/es"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:103
-msgid "PgsrcTranslation/nl"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:104
-msgid "PgsrcTranslation/sv"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:105
-msgid "PgsrcTranslation/ja"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:106
-msgid "PgsrcTranslation/zh"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:107
-msgid "RawHtmlPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:108
 msgid "RecentVisitors"
 msgstr "RecenteBezoekers"
 
-#: ../lib/plugin/_WikiTranslation.php:109
-msgid "RedirectToPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:110
+#: ../lib/plugin/_WikiTranslation.php:102
 msgid "ReleaseNotes"
 msgstr "UitgaveNoten"
 
-#: ../lib/plugin/_WikiTranslation.php:111
-msgid "RichTablePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:113
+#: ../lib/plugin/_WikiTranslation.php:104
 msgid "SteveWainstead"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:114
-msgid "SystemInfoPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../lib/plugin/_WikiTranslation.php:106
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "UpLoad"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:119
-msgid "UpLoadPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:121
-msgid "WikiBlogPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:122
-msgid "WikiPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr ""
@@ -6154,7 +6184,7 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 #, fuzzy
 msgid "Purge Page"
 msgstr "Nieuw pagina."
@@ -6176,7 +6206,7 @@
 "the database."
 msgstr ""
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr "Verwijder Pagina"
 
@@ -6188,8 +6218,8 @@
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 
@@ -6218,138 +6248,138 @@
 msgid "the file '%s'"
 msgstr ""
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr ""
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr ""
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr ""
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1423
+#: ../lib/stdlib.php:1425
 #, php-format
-msgid "%s b"
+msgid "%s B"
 msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr ""
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
+msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
 #, php-format
-msgid "%s Kb (%s bytes)"
+msgid "%s KiB (%s bytes)"
 msgstr ""
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr ""
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -6398,14 +6428,12 @@
 
 #: ../lib/upgrade.php:119 ../themes/MonoBook/templates/actionbar.tmpl:18
 #: ../themes/MonoBook/templates/actionbar.tmpl:31
-#, fuzzy
 msgid "ActionPage"
-msgstr "ZoekPagina"
+msgstr ""
 
 #: ../lib/upgrade.php:121
-#, fuzzy
 msgid "_AuthInfo"
-msgstr "Vorige Auteur"
+msgstr ""
 
 #: ../lib/upgrade.php:121
 msgid "DebugAuthInfo"
@@ -6645,7 +6673,7 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
@@ -6738,8 +6766,8 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
 msgstr ""
 
@@ -6767,7 +6795,7 @@
 msgid "Top Recommendations"
 msgstr ""
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr ""
 
@@ -6817,69 +6845,64 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, php-format
-msgid "Version %s, saved %s"
-msgstr "Versie %s, bewarrd %s"
+msgid "Version %s, saved on %s"
+msgstr "Versie %s, bewarrd op %s"
 
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, php-format
 msgid "Last edited %s"
 msgstr "Meest recente verandering %s"
 
 #: ../lib/WikiTheme.php:473
 #, php-format
-msgid "Version %s, saved on %s"
-msgstr "Versie %s, bewarrd op %s"
-
-#: ../lib/WikiTheme.php:475
-#, php-format
 msgid "Last edited on %s"
 msgstr "Meest recente verandering op %s"
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr ""
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr ""
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, php-format
 msgid "Owner: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, fuzzy, php-format
 msgid "Create: %s"
 msgstr "Bewaard: %s"
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -6892,70 +6915,71 @@
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 #, fuzzy
 msgid "Rename Page"
 msgstr "Verwijder Pagina"
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Open Pagina"
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Sluit Pagina Af"
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr "Drukker"
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr ""
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7032,57 +7056,57 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 msgid "Invalid password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 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:1338
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1781
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7091,14 +7115,14 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1841
+#: ../lib/WikiUserNew.php:1843
 #, php-format
-msgid "E-Mail address '%s' is not properly formatted"
+msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1845
+#: ../lib/WikiUserNew.php:1847
 #, php-format
-msgid "E-Mail address '%s' is properly formatted"
+msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
@@ -7269,10 +7293,10 @@
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7280,7 +7304,7 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
 msgstr "Bron Tekst"
@@ -7307,9 +7331,8 @@
 #: ../themes/Portland/templates/editpage.tmpl:83
 #: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/Wordpress/templates/editpage.tmpl:96
-#, fuzzy
 msgid "Help/GoodStyle"
-msgstr "GoedeStijl"
+msgstr "Help/GoedeStijl"
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7332,9 +7355,8 @@
 #: ../themes/fusionforge/templates/editpage.tmpl:79
 #: ../themes/Portland/templates/editpage.tmpl:84
 #: ../themes/Wordpress/templates/editpage.tmpl:97
-#, fuzzy
 msgid "Help/TextFormattingRules"
-msgstr "TekstFormatteringsRegels"
+msgstr "Help/TekstFormatteringsRegels"
 
 #: ../themes/blog/templates/blogform.tmpl:25
 #: ../themes/Crao/templates/editpage.tmpl:94
@@ -7357,12 +7379,11 @@
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7373,12 +7394,11 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
@@ -7387,10 +7407,8 @@
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7401,7 +7419,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7451,6 +7469,8 @@
 
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
 #, fuzzy
@@ -7470,38 +7490,38 @@
 msgid "Comments on %s by %s."
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 msgid "SignOut"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 msgid "SignIn"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 #, fuzzy
 msgid "Lock"
 msgstr "Låst"
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 #, fuzzy
 msgid "Unlock"
 msgstr "Sluit Pagina Af"
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 msgid "blog"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr "(diff)"
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -7612,21 +7632,28 @@
 #: ../themes/default/templates/editpage.tmpl:118
 #: ../themes/Portland/templates/editpage.tmpl:79
 #: ../themes/Wordpress/templates/editpage.tmpl:92
-#, fuzzy
 msgid "Help/OldTextFormattingRules"
-msgstr "OudTekstFormatteringsRegels"
+msgstr "Help/OudTekstFormatteringsRegels"
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr ""
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr ""
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7675,9 +7702,9 @@
 msgstr ""
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ""
@@ -7790,11 +7817,23 @@
 msgid "Hits:"
 msgstr "Teller:"
 
+#: ../themes/default/templates/info.tmpl:133
+msgid "Is External:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:134
 #, fuzzy
 msgid "No"
 msgstr "Geen"
 
+#: ../themes/default/templates/info.tmpl:138
+msgid "ACL type:"
+msgstr ""
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
@@ -7940,44 +7979,17 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Voorvertonig"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-#, fuzzy
-msgid "Next >>"
-msgstr "Volgende"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ""
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr ""
@@ -8028,34 +8040,34 @@
 
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
 #, fuzzy, php-format
 msgid "User preferences for user %s"
 msgstr "GebruikersVoorkeuren"
@@ -8129,43 +8141,43 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr ""
 
@@ -8175,7 +8187,7 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, php-format
 msgid "Hide %s:"
 msgstr ""
@@ -8187,13 +8199,13 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, php-format
 msgid "Add %s:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
@@ -8212,23 +8224,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr "Hoogte"
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr "Breedte"
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8236,45 +8248,45 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr "Zet Voorkeuren"
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 #, fuzzy
 msgid "Reset Preferences"
 msgstr "GebruikersVoorkeuren"
@@ -8293,84 +8305,75 @@
 msgid "Posted: %s"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
-msgid "/Discussion"
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
+msgid "Action Page"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
-#, fuzzy
-msgid "Action Page"
-msgstr "ZoekPagina"
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 msgid "Page"
-msgstr "ThuisPagina"
+msgstr "Pagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
-#, fuzzy
 msgid "Template/Talk"
-msgstr "Pagina Naam"
+msgstr ""
 
 #: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
-#, fuzzy
 msgid "Create Page"
-msgstr "Bewaard: %s"
+msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
-#, fuzzy
 msgid "History"
-msgstr "PaginaGeschiedenis"
+msgstr "Geschiedenis"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 #, fuzzy
 msgid "Last Difference"
 msgstr "Zet Voorkeuren"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 #, fuzzy
 msgid "Page Info"
 msgstr "Sidan är Låst"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Back Links"
-msgstr "TerugLinks"
+msgstr "Terug Links"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
-#, fuzzy
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
-msgstr "RecenteVeranderingen"
+msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 msgid "Purge"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-#, fuzzy
-msgid "Watch Page"
-msgstr "Breedte"
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr "TekstFormatteringsRegels"
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr ""
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+msgid "This revision of the page does not exist."
+msgstr ""
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
 msgstr ""
@@ -8379,59 +8382,107 @@
 msgid "Make the page external?"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/fusionforge/templates/navbar.tmpl:9
+msgid "Home Page"
+msgstr "Thuis Pagina"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+msgid "Recent Changes"
+msgstr "Recente Veranderingen"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
 msgid "SpecialPages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+msgid "Special Pages"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+#, fuzzy
+msgid "Random Page"
+msgstr "Verwijder pagina"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
 msgid "Like Pages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
+msgid "Wiki Admin"
+msgstr "PhpWiki Beheer"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+msgid "My User Page"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+#, fuzzy
+msgid "User Preferences"
+msgstr "GebruikersVoorkeuren"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "GebruikersVoorkeuren"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
 msgid "E-mail Notification"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "GebruikersVoorkeuren"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-#, fuzzy
-msgid "Random Page"
-msgstr "Verwijder pagina"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 msgid "Check menu items to display."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 msgid "Show Page Trail"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:73
 #, fuzzy
 msgid "This page is external."
 msgstr "Pagina '%s' verwijderd."
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -8478,14 +8529,12 @@
 msgstr ""
 
 #: ../themes/MonoBook/templates/navbar.tmpl:15
-#, fuzzy
 msgid "Home page"
-msgstr "ThuisPagina"
+msgstr "Thuis Pagina"
 
 #: ../themes/MonoBook/templates/navbar.tmpl:16
-#, fuzzy
 msgid "Recent changes"
-msgstr "RecenteVeranderingen"
+msgstr "Recente Veranderingen"
 
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Sidebar/templates/navbar.tmpl:45
@@ -8494,14 +8543,12 @@
 msgstr "De %d meestbezochte pagina's van deze Wiki:"
 
 #: ../themes/MonoBook/templates/navbar.tmpl:17
-#, fuzzy
 msgid "Recent comments"
-msgstr "RecenteVeranderingen"
+msgstr ""
 
 #: ../themes/MonoBook/templates/navbar.tmpl:18
-#, fuzzy
 msgid "Recent new pages"
-msgstr "RecenteVeranderingen"
+msgstr ""
 
 #: ../themes/MonoBook/templates/navbar.tmpl:19
 #, fuzzy
@@ -8534,15 +8581,13 @@
 msgstr ""
 
 #: ../themes/MonoBook/templates/navbar.tmpl:55
-#, fuzzy
 msgid "Related changes"
-msgstr "RecenteVeranderingen"
+msgstr ""
 
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Sidebar/templates/navbar.tmpl:71
-#, fuzzy
 msgid "Administration"
-msgstr "PhpWikiBeheer"
+msgstr "Beheer"
 
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
@@ -8578,14 +8623,12 @@
 msgstr "GebruikersVoorkeuren"
 
 #: ../themes/MonoBook/templates/signin.tmpl:12
-#, fuzzy
 msgid "MyRecentChanges"
-msgstr "RecenteVeranderingen"
+msgstr "MijnRecenteVeranderingen"
 
 #: ../themes/MonoBook/templates/signin.tmpl:12
-#, fuzzy
 msgid "My Changes"
-msgstr "RecenteVeranderingen"
+msgstr "Mijn Veranderingen"
 
 #: ../themes/MonoBook/templates/signin.tmpl:13
 #: ../themes/Sidebar/templates/signin.tmpl:10
@@ -8670,6 +8713,13 @@
 msgid "Edit old revision"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Volgende"
+
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Versie %s, bewarrd %s"
+
 #~ msgid "Include of '%s' failed."
 #~ msgstr "Insert van '%s' gefaald."
 
@@ -8751,10 +8801,6 @@
 #~ msgstr "Vorige Auteur"
 
 #, fuzzy
-#~ msgid "No dsn specified"
-#~ msgstr "Je bent ingelogd als %s."
-
-#, fuzzy
 #~ msgid "not yet implemented"
 #~ msgstr "Functie nog niet gemplementeerd."
 
@@ -8783,10 +8829,6 @@
 #~ msgstr "Je moet een bron specificeren om van te lezen."
 
 #, fuzzy
-#~ msgid "Error: You must specify a last name."
-#~ msgstr "Je moet een bron specificeren om van te lezen."
-
-#, fuzzy
 #~ msgid "Your home page is: "
 #~ msgstr "Fout bij schrijven pagina '%s'"
 
@@ -8822,10 +8864,6 @@
 #~ msgstr "Lijsten nesten te diep in SetHTMLOutputMode"
 
 #, fuzzy
-#~ msgid "Included frame from %s"
-#~ msgstr "van %s"
-
-#, fuzzy
 #~ msgid "Orphaned Pages"
 #~ msgstr "ZoekPagina"
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/phpwiki.pot
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/phpwiki.pot	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/phpwiki.pot	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,17 +1,18 @@
 # English PhpWiki locale
 # This file is part of PhpWiki.
-# Copyright (C) Copyright 1999, 2000, 2001, 2002 ThePhpWikiProgrammingTeam.
+# Copyright (C) Copyright 1999, 2000, 2001, 2002, 2011 ThePhpWikiProgrammingTeam.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.11\n"
+"Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <rurban at users.sf.net>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../lib/CachedMarkup.php:536
@@ -45,12 +46,12 @@
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr ""
@@ -70,8 +71,8 @@
 msgid "version %s"
 msgstr ""
 
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr ""
@@ -87,7 +88,7 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr ""
 
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr ""
@@ -143,84 +144,67 @@
 msgid "Older page:"
 msgstr ""
 
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-msgid "Content of versions "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " is identical."
-msgstr ""
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-msgid "Version "
-msgstr ""
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
 # This entry is important for French punctuation rules which stipulate
 # a space before each colon.
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr ""
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr ""
 
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr ""
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -236,12 +220,12 @@
 msgid "(Redirected from %s)"
 msgstr ""
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
 msgstr ""
 
@@ -338,7 +322,7 @@
 msgid "Versions are identical"
 msgstr ""
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr ""
 
@@ -374,19 +358,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr ""
@@ -445,8 +429,8 @@
 msgid "Changes"
 msgstr ""
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr ""
 
@@ -494,8 +478,8 @@
 msgid "String \"%s\" not found."
 msgstr ""
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
 msgstr ""
 
@@ -507,8 +491,8 @@
 msgid "Replace with"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -519,9 +503,9 @@
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr ""
 
@@ -609,8 +593,8 @@
 msgid "List"
 msgstr ""
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 msgid "Table of Contents"
 msgstr ""
 
@@ -619,8 +603,8 @@
 msgid "Page Name"
 msgstr ""
 
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr ""
 
@@ -633,57 +617,57 @@
 msgid "Template"
 msgstr ""
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 msgid "AddCategory"
 msgstr ""
 
-#: ../lib/EditToolbar.php:321
+#: ../lib/EditToolbar.php:320
 msgid "Insert Categories"
 msgstr ""
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 msgid "AddPlugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:371
+#: ../lib/EditToolbar.php:370
 msgid "Insert Plugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 msgid "AddPageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:401
+#: ../lib/EditToolbar.php:400
 msgid "Insert PageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 msgid "Add Image or Video"
 msgstr ""
 
-#: ../lib/EditToolbar.php:439
+#: ../lib/EditToolbar.php:438
 msgid "Insert Image or Video"
 msgstr ""
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:474
+#: ../lib/EditToolbar.php:473
 msgid "Insert Template"
 msgstr ""
 
@@ -692,23 +676,23 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr ""
 
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr ""
@@ -717,7 +701,23 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:889
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+msgid ": "
+msgstr ""
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -730,7 +730,7 @@
 msgid "Dump to directory"
 msgstr ""
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 msgid "Upload File"
 msgstr ""
 
@@ -746,31 +746,31 @@
 msgid "Dump pages as XHTML"
 msgstr ""
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
 msgstr ""
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
 msgstr ""
@@ -798,86 +798,86 @@
 msgid "Return to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr ""
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr ""
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr ""
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr ""
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr ""
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr ""
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr ""
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr ""
 
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, php-format
 msgid "... not copied to %s"
 msgstr ""
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 msgid "saved as "
 msgstr ""
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr ""
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr ""
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 msgid "Invalid pagename!"
 msgstr ""
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -886,73 +886,73 @@
 msgid "InterWikiMap"
 msgstr ""
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr ""
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr ""
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr ""
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr ""
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
@@ -960,109 +960,109 @@
 msgid "Revert"
 msgstr ""
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 msgid "no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 msgid "same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 msgid "Cancelled"
 msgstr ""
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr ""
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr ""
 
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1134
 #, php-format
 msgid "Revert: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr ""
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr ""
@@ -1072,40 +1072,40 @@
 msgid "PageChange Notification of %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr ""
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, php-format
 msgid "User %s removed page %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 msgid "E-Mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1120,7 +1120,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 msgid "Optimizing database"
 msgstr ""
 
@@ -1388,8 +1388,8 @@
 msgstr ""
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr ""
 
@@ -1411,7 +1411,7 @@
 msgstr ""
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1453,8 +1453,8 @@
 msgid "Users will not be able to sign in."
 msgstr ""
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
 #: ../lib/PageList.php:93
@@ -1479,7 +1479,7 @@
 msgid "Click to de-/select all pages"
 msgstr ""
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr ""
@@ -1494,20 +1494,20 @@
 msgid "%s not found"
 msgstr ""
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
 msgid "individual page permission"
 msgstr ""
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
@@ -1518,17 +1518,17 @@
 msgstr ""
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 msgid "Content"
 msgstr ""
 
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 msgid "Permission"
 msgstr ""
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr ""
 
@@ -1609,7 +1609,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
@@ -1676,7 +1676,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr ""
 
@@ -1704,12 +1704,14 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1747,7 +1749,7 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr ""
 
@@ -1807,111 +1809,111 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -1939,11 +1941,11 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
 msgstr ""
@@ -2044,7 +2046,7 @@
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2179,14 +2181,14 @@
 msgstr ""
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2236,9 +2238,8 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr ""
 
@@ -2285,25 +2286,48 @@
 msgid "Created by CreatePage"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+msgid "No page specified."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, php-format
+msgid "Page '%s' does not exist."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, php-format
+msgid "%s: no such revision %d."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr ""
 
@@ -2319,8 +2343,8 @@
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr ""
 
@@ -2328,6 +2352,26 @@
 msgid "Display differences between revisions"
 msgstr ""
 
+#: ../lib/plugin/Diff.php:182
+msgid "Content of versions "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+msgid " is identical."
+msgstr ""
+
+#: ../lib/plugin/Diff.php:188
+msgid "Version "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
 #: ../lib/plugin/DynamicIncludePage.php:35
 msgid "DynamicIncludePage"
 msgstr ""
@@ -2350,7 +2394,7 @@
 msgid "Click to hide/show"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr ""
 
@@ -2407,7 +2451,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr ""
@@ -2471,22 +2515,34 @@
 "Displays a url in a seperate frame inside our body. Only one frame allowed."
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
 #, php-format
-msgid "recursive inclusion of page %s"
+msgid "Recursive inclusion of page %s"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:94
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
 #, php-format
-msgid "recursive inclusion of url %s"
+msgid "Recursive inclusion of url %s"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2610,7 +2666,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, php-format
 msgid "%s is empty"
 msgstr ""
@@ -2675,36 +2731,39 @@
 msgid "Include text from another wiki page."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, php-format
-msgid "recursive inclusion of page %s ignored"
+msgid "Recursive inclusion of page %s ignored"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
+#: ../lib/plugin/IncludePage.php:91
 #, php-format
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
 #, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
+msgstr ""
+
+#: ../lib/plugin/IncludePage.php:157
 #, php-format
-msgid "%s(%d): no such revision"
+msgid "Included from %s (revision %d)"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr ""
@@ -2754,6 +2813,7 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
@@ -2792,6 +2852,8 @@
 
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3074,7 +3136,7 @@
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
+msgid "Download for Subversion"
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:154
@@ -3130,7 +3192,7 @@
 #: ../lib/plugin/PageDump.php:215
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
@@ -3153,12 +3215,13 @@
 msgid "Contents"
 msgstr ""
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr ""
 
@@ -3498,7 +3561,7 @@
 msgid "List the most popular tags."
 msgstr ""
 
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr ""
 
@@ -3545,7 +3608,7 @@
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr ""
 
@@ -3579,8 +3642,8 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr ""
@@ -3933,11 +3996,11 @@
 msgid "Recursive redirect to self: '%s'"
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
 msgstr ""
 
@@ -4210,73 +4273,73 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
+#: ../lib/plugin/SyncWiki.php:110
 msgid "Syncing this PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 msgid "<unknown>"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
+#: ../lib/plugin/SyncWiki.php:209
 msgid "Now upload all locally newer uploads."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
+#: ../lib/plugin/SyncWiki.php:274
 #, php-format
 msgid "%s force"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:276
+#: ../lib/plugin/SyncWiki.php:278
 #, php-format
 msgid "Postponed %s for %s."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 msgid "skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 msgid "same content"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr ""
@@ -4397,12 +4460,12 @@
 
 #: ../lib/plugin/SystemInfo.php:400
 #, php-format
-msgid "Application size: %d Kb"
+msgid "Application size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:402
 #, php-format
-msgid "Pagedata size: %d Kb"
+msgid "Pagedata size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:420
@@ -4509,6 +4572,11 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr ""
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr ""
@@ -4595,7 +4663,7 @@
 msgid "Transcluded from %s"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr ""
 
@@ -4682,78 +4750,78 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:179
+#: ../lib/plugin/UpLoad.php:178
 msgid "You cannot upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 msgid "Check you are logged in."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:213
+#: ../lib/plugin/UpLoad.php:212
 #, php-format
 msgid "ERROR uploading '%s'"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, php-format
 msgid "Files with extension %s are not allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:226
+#: ../lib/plugin/UpLoad.php:225
 #, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, php-format
 msgid "uploaded %s"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 msgid "Uploading failed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:291
+#: ../lib/plugin/UpLoad.php:290
 msgid "The upload logfile exists but is not writable."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 msgid "Can't open the upload logfile."
 msgstr ""
 
@@ -4892,7 +4960,6 @@
 msgstr ""
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr ""
 
@@ -4930,6 +4997,9 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 msgid "WatchPage"
 msgstr ""
 
@@ -4959,11 +5029,11 @@
 msgid "The page %s is already watched!"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -4971,6 +5041,11 @@
 msgid "Edit"
 msgstr ""
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+msgid "Watch Page"
+msgstr ""
+
 #: ../lib/plugin/WatchPage.php:110
 msgid "You must sign in to watch pages."
 msgstr ""
@@ -5035,42 +5110,46 @@
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
 #, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 msgid "No pages changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Select the pages to change:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr ""
 
@@ -5100,39 +5179,39 @@
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr ""
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been changed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
 #, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:171
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+#: ../lib/plugin/WikiAdminChown.php:173
+msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:175
+#: ../lib/plugin/WikiAdminChown.php:177
 msgid "Change owner of selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:176
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:198
-msgid "Change owner"
+#: ../lib/plugin/WikiAdminChown.php:200
+msgid "Change owner to: "
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
-msgstr ""
-
 #: ../lib/plugin/WikiAdminMarkup.php:36
 msgid "WikiAdminMarkup"
 msgstr ""
@@ -5160,22 +5239,20 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+#: ../lib/plugin/WikiAdminMarkup.php:165
+msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
+#: ../lib/plugin/WikiAdminMarkup.php:169
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
-msgid "Change markup"
+#: ../lib/plugin/WikiAdminMarkup.php:192
+msgid "Change markup to: "
 msgstr ""
 
 #: ../lib/plugin/WikiAdminPurge.php:34
@@ -5196,24 +5273,32 @@
 msgid "Didn't purge page '%s'. Access denied."
 msgstr ""
 
+#: ../lib/plugin/WikiAdminPurge.php:77
+msgid "One page has been permanently purged:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminPurge.php:79
 #, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
 msgstr ""
 
+#: ../lib/plugin/WikiAdminPurge.php:85
+msgid "No pages purged."
+msgstr ""
+
 #: ../lib/plugin/WikiAdminPurge.php:92
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:144
+#: ../lib/plugin/WikiAdminPurge.php:146
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:147
+#: ../lib/plugin/WikiAdminPurge.php:149
 msgid "Permanently purge selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:148
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5235,38 +5320,46 @@
 msgid "Didn't remove page '%s'. Access denied."
 msgstr ""
 
+#: ../lib/plugin/WikiAdminRemove.php:121
+msgid "One page has been removed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminRemove.php:123
 #, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+#: ../lib/plugin/WikiAdminRemove.php:129
+msgid "No pages removed."
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+#: ../lib/plugin/WikiAdminRemove.php:199
+msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:201
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:211
+#: ../lib/plugin/WikiAdminRemove.php:213
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -5275,83 +5368,91 @@
 msgid "WikiAdminRename"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 msgid "Rename selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:79
+#: ../lib/plugin/WikiAdminRename.php:80
 #, php-format
 msgid "Page '%s' already exists. Ignored."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:82
+#: ../lib/plugin/WikiAdminRename.php:83
 #, php-format
 msgid "Access denied to rename page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:91
+#: ../lib/plugin/WikiAdminRename.php:92
 #, php-format
 msgid "Renamed page from '%s' to '%s'"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:100
+#: ../lib/plugin/WikiAdminRename.php:101
 #, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:126
+#: ../lib/plugin/WikiAdminRename.php:124
+msgid "One page has been renamed:"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:127
 #, php-format
-msgid "%s pages have been permanently renamed:"
+msgid "%d pages have been renamed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:132
+#: ../lib/plugin/WikiAdminRename.php:133
 msgid "No pages renamed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:209
-msgid "Are you sure you want to permanently rename the selected pages?"
+#: ../lib/plugin/WikiAdminRename.php:211
+msgid "Are you sure you want to rename the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:213
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 msgid "Rename page"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 msgid "from"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 msgid "Regex?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
 msgstr ""
 
@@ -5377,32 +5478,31 @@
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 msgid "Select the pages to search and replace"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 msgid "Replace"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr ""
 
@@ -5462,46 +5562,46 @@
 msgid "Invalid ACL"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 msgid "PhpWikiAdministration/SetAcl"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 msgid "Change Access Rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 msgid "Select the pages where to change access rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 msgid "Selected Pages: "
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 msgid "Type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 msgid "(Currently not working)"
 msgstr ""
 
@@ -5522,11 +5622,11 @@
 msgid "PhpWikiAdministration/SetExternal"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 msgid "Set pages to external"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 msgid "Select the pages to set as external"
 msgstr ""
 
@@ -5538,120 +5638,120 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, php-format
 msgid "Bad action requested: %s"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:100
+#: ../lib/plugin/WikiAdminUtils.php:102
 #, php-format
 msgid "WikiAdminUtils %s returned:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:102
+#: ../lib/plugin/WikiAdminUtils.php:104
 msgid "Back"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 msgid "Purge all Pages With Invalid Names"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 msgid "No pages with bad names had to be deleted."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:147
+#: ../lib/plugin/WikiAdminUtils.php:149
 #, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 msgid "No empty, unreferenced pages were found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:180
+#: ../lib/plugin/WikiAdminUtils.php:182
 #, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, php-format
 msgid "Converted successfully %d pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:233
+#: ../lib/plugin/WikiAdminUtils.php:235
 msgid "Username"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr ""
 
@@ -5759,305 +5859,240 @@
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:47
-msgid "AddCommentPlugin"
+msgid "AllPagesCreatedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:48
-msgid "AddingPages"
+msgid "AllPagesLastEditedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:49
-msgid "AllPagesCreatedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:50
-msgid "AllPagesLastEditedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:51
 msgid "AllPagesOwnedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:52
-msgid "AuthorHistoryPlugin"
+msgid "CategoryHomePages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:54
-msgid "CalendarListPlugin"
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
+#: ../themes/Crao/templates/navbar.tmpl:41
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/MonoBook/templates/navbar.tmpl:30
+#: ../themes/MonoBook/templates/navbar.tmpl:36
+#: ../themes/Portland/templates/navbar.tmpl:6
+#: ../themes/shamino_com/templates/top.tmpl:21
+#: ../themes/Sidebar/templates/search.tmpl:6
+#: ../themes/smaller/templates/navbar.tmpl:9
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
+#: ../themes/wikilens/templates/navbar.tmpl:19
+msgid "FindPage"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:55
-msgid "CalendarPlugin"
+#: ../lib/plugin/_WikiTranslation.php:56
+msgid "FullRecentChanges"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:57
-msgid "CategoryHomePages"
+msgid "Help/AddingPages"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:58
-msgid "CommentPlugin"
+msgid "Help/AddCommentPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:59
-msgid "CreateTocPlugin"
+msgid "Help/AuthorHistoryPlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:60
+msgid "Help/CalendarListPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:61
+msgid "Help/CalendarPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:62
-msgid "EditMetaDataPlugin"
+msgid "Help/CommentPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
+msgid "Help/CreateTocPlugin"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
-#: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
-#: ../themes/MonoBook/templates/navbar.tmpl:30
-#: ../themes/MonoBook/templates/navbar.tmpl:36
-#: ../themes/Portland/templates/navbar.tmpl:6
-#: ../themes/shamino_com/templates/top.tmpl:21
-#: ../themes/Sidebar/templates/search.tmpl:6
-#: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
-#: ../themes/wikilens/templates/navbar.tmpl:19
-msgid "FindPage"
+#: ../lib/plugin/_WikiTranslation.php:64
+msgid "Help/EditMetaDataPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:65
-msgid "FoafViewerPlugin"
+msgid "Help/ExternalSearchPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
+msgid "Help/FoafViewerPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:67
-msgid "FullRecentChanges"
+msgid "Help/FrameIncludePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:68
-msgid "HelloWorldPlugin"
+msgid "Help/HelloWorldPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:69
-msgid "HomePageAlias"
+msgid "Help/IncludePagePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
+msgid "Help/LinkIcons"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:71
-msgid "InterWiki"
+msgid "Help/MagicPhpWikiURLs"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
+msgid "Help/MoreAboutMechanics"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
+msgid "Help/OldStyleTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
+msgid "Help/PhotoAlbumPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
+msgid "Help/PhpHighlightPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
+msgid "Help/PhpWeatherPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:77
-msgid "OldStyleTablePlugin"
+msgid "Help/PhpWiki"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:78
+msgid "Help/PloticusPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:79
-msgid "PageGroupTest"
+msgid "Help/RawHtmlPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:80
-msgid "PageGroupTest/Four"
+msgid "Help/RedirectToPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:81
-msgid "PageGroupTest/One"
+msgid "Help/RichTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:82
-msgid "PageGroupTest/Three"
+msgid "Help/SystemInfoPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:83
-msgid "PageGroupTest/Two"
+msgid "Help/TranscludePlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:85
-msgid "PhotoAlbumPlugin"
+msgid "Help/UpLoadPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:86
-msgid "PhpHighlightPlugin"
+msgid "Help/WabiSabi"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
+msgid "Help/WikiBlogPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
+msgid "Help/WikiPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:89
-msgid "PhpWikiAdministration/Chmod"
+msgid "Help/WikiWikiWeb"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:92
-msgid "PhpWikiAdministration/Rename"
+#: ../lib/plugin/_WikiTranslation.php:90
+msgid "HomePageAlias"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:93
-msgid "PhpWikiAdministration/Replace"
+#: ../lib/plugin/_WikiTranslation.php:91
+msgid "InterWiki"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:95
-#: ../themes/MonoBook/templates/navbar.tmpl:21
-msgid "PhpWikiDocumentation"
+#: ../lib/plugin/_WikiTranslation.php:93
+msgid "PhpWikiAdministration/Chmod"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:96
-msgid "PhpWikiPoll"
+msgid "PhpWikiAdministration/Rename"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:97
-msgid "PloticusPlugin"
+msgid "PhpWikiAdministration/Replace"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:99
-msgid "PgsrcTranslation/de"
+#: ../themes/MonoBook/templates/navbar.tmpl:21
+msgid "PhpWikiDocumentation"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:100
-msgid "PgsrcTranslation/fr"
+msgid "PhpWikiPoll"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:101
-msgid "PgsrcTranslation/it"
+msgid "RecentVisitors"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:102
-msgid "PgsrcTranslation/es"
+msgid "ReleaseNotes"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:103
-msgid "PgsrcTranslation/nl"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:104
-msgid "PgsrcTranslation/sv"
+msgid "SteveWainstead"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:105
-msgid "PgsrcTranslation/ja"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:106
-msgid "PgsrcTranslation/zh"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:107
-msgid "RawHtmlPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:108
-msgid "RecentVisitors"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:109
-msgid "RedirectToPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:110
-msgid "ReleaseNotes"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:111
-msgid "RichTablePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:113
-msgid "SteveWainstead"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:114
-msgid "SystemInfoPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "UpLoad"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:119
-msgid "UpLoadPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:121
-msgid "WikiBlogPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:122
-msgid "WikiPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr ""
@@ -6086,7 +6121,7 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 msgid "Purge Page"
 msgstr ""
 
@@ -6107,7 +6142,7 @@
 "the database."
 msgstr ""
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr ""
 
@@ -6119,8 +6154,8 @@
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 
@@ -6149,138 +6184,138 @@
 msgid "the file '%s'"
 msgstr ""
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr ""
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr ""
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr ""
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1423
+#: ../lib/stdlib.php:1425
 #, php-format
-msgid "%s b"
+msgid "%s B"
 msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr ""
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
+msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
 #, php-format
-msgid "%s Kb (%s bytes)"
+msgid "%s KiB (%s bytes)"
 msgstr ""
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr ""
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -6573,7 +6608,7 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
@@ -6666,8 +6701,8 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
 msgstr ""
 
@@ -6695,7 +6730,7 @@
 msgid "Top Recommendations"
 msgstr ""
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr ""
 
@@ -6745,69 +6780,64 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, php-format
-msgid "Version %s, saved %s"
+msgid "Version %s, saved on %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, php-format
 msgid "Last edited %s"
 msgstr ""
 
 #: ../lib/WikiTheme.php:473
 #, php-format
-msgid "Version %s, saved on %s"
-msgstr ""
-
-#: ../lib/WikiTheme.php:475
-#, php-format
 msgid "Last edited on %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr ""
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr ""
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, php-format
 msgid "Owner: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -6820,69 +6850,70 @@
 msgid "Sign Out"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 msgid "Rename Page"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr ""
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -6959,57 +6990,57 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 msgid "Invalid password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 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:1338
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1781
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7018,14 +7049,14 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1841
+#: ../lib/WikiUserNew.php:1843
 #, php-format
-msgid "E-Mail address '%s' is not properly formatted"
+msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1845
+#: ../lib/WikiUserNew.php:1847
 #, php-format
-msgid "E-Mail address '%s' is properly formatted"
+msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
@@ -7188,10 +7219,10 @@
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7199,7 +7230,7 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
 msgstr ""
@@ -7274,12 +7305,11 @@
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7290,12 +7320,11 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
@@ -7304,10 +7333,8 @@
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7318,7 +7345,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7366,6 +7393,8 @@
 
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
 msgid "View the current version."
@@ -7384,36 +7413,36 @@
 msgid "Comments on %s by %s."
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 msgid "SignOut"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 msgid "SignIn"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 msgid "Unlock"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 msgid "blog"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr ""
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -7527,17 +7556,25 @@
 msgid "Help/OldTextFormattingRules"
 msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr ""
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr ""
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7585,9 +7622,9 @@
 msgstr ""
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ""
@@ -7700,10 +7737,22 @@
 msgid "Hits:"
 msgstr ""
 
+#: ../themes/default/templates/info.tmpl:133
+msgid "Is External:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:134
 msgid "No"
 msgstr ""
 
+#: ../themes/default/templates/info.tmpl:138
+msgid "ACL type:"
+msgstr ""
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
@@ -7849,43 +7898,16 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
+msgid "Prev"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid "Next >>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ""
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr ""
@@ -7936,34 +7958,34 @@
 
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
 #, php-format
 msgid "User preferences for user %s"
 msgstr ""
@@ -8037,43 +8059,43 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr ""
 
@@ -8083,7 +8105,7 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, php-format
 msgid "Hide %s:"
 msgstr ""
@@ -8095,13 +8117,13 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, php-format
 msgid "Add %s:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
@@ -8120,23 +8142,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8144,45 +8166,45 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 msgid "Reset Preferences"
 msgstr ""
 
@@ -8200,22 +8222,17 @@
 msgid "Posted: %s"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
-msgid "/Discussion"
-msgstr ""
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 msgid "Action Page"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 msgid "Page"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
 msgid "Template/Talk"
 msgstr ""
@@ -8226,48 +8243,52 @@
 msgid "Create Page"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
 msgid "History"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 msgid "Page Info"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Back Links"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 msgid "Purge"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-msgid "Watch Page"
-msgstr ""
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr ""
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr ""
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+msgid "This revision of the page does not exist."
+msgstr ""
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
 msgstr ""
@@ -8276,57 +8297,102 @@
 msgid "Make the page external?"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/fusionforge/templates/navbar.tmpl:9
+msgid "Home Page"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+msgid "Recent Changes"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
 msgid "SpecialPages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+msgid "Special Pages"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+msgid "Random Page"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
 msgid "Like Pages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
+msgid "Wiki Admin"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+msgid "My User Page"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+msgid "User Preferences"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+msgid "User preferences for this project"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
 msgid "E-mail Notification"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+msgid "Global user preferences (for all projects)"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-msgid "Random Page"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 msgid "Check menu items to display."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 msgid "Show Page Trail"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:73
 msgid "This page is external."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 msgid "Views"

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/sv.po
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/sv.po	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/sv.po	2011-05-18 19:36:20 UTC (rev 13355)
@@ -5,14 +5,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.4pre\n"
+"Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jooon at hem.passagen.se>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../lib/CachedMarkup.php:536
@@ -46,12 +47,12 @@
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, php-format
 msgid "Supported handlers are: %s"
 msgstr ""
@@ -71,8 +72,8 @@
 msgid "version %s"
 msgstr "version %s"
 
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr "av %s"
@@ -88,7 +89,7 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr ""
 
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr "Diff av: %s"
@@ -144,85 +145,65 @@
 msgid "Older page:"
 msgstr ""
 
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "nuvarande version"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "Versionerna är identiska"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "Version"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr ""
 
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr "SenasteÄndringar"
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr ""
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -238,12 +219,12 @@
 msgid "(Redirected from %s)"
 msgstr "(Insättning från %s)"
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
 msgstr ""
 
@@ -340,7 +321,7 @@
 msgid "Versions are identical"
 msgstr "Versionerna är identiska"
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr "Sidan är Låst"
 
@@ -367,9 +348,8 @@
 #: ../lib/plugin/ModeratedPage.php:261 ../lib/plugin/ModeratedPage.php:263
 #: ../lib/plugin/ModeratedPage.php:347 ../lib/plugin/ModeratedPage.php:351
 #: ../lib/plugin/ModeratedPage.php:406 ../lib/plugin/ModeratedPage.php:431
-#, fuzzy
 msgid "ModeratedPage"
-msgstr "SökEfterSida"
+msgstr ""
 
 #: ../lib/editpage.php:569
 #, php-format
@@ -381,19 +361,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr ""
@@ -450,12 +430,11 @@
 msgstr "Spara"
 
 #: ../lib/editpage.php:709
-#, fuzzy
 msgid "Changes"
-msgstr "SenasteÄndringar"
+msgstr "Ändringar"
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr ""
 
@@ -503,8 +482,8 @@
 msgid "String \"%s\" not found."
 msgstr "\"%s\" ingen funna."
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
 msgstr ""
 
@@ -517,8 +496,8 @@
 msgid "Replace with"
 msgstr ""
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -529,9 +508,9 @@
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr ""
 
@@ -620,9 +599,8 @@
 msgid "List"
 msgstr "Senaste"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
-#, fuzzy
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 msgid "Table of Contents"
 msgstr "Innehåll"
 
@@ -631,8 +609,8 @@
 msgid "Page Name"
 msgstr "Namn på Sidan"
 
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr ""
 
@@ -646,59 +624,59 @@
 msgid "Template"
 msgstr ""
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 msgid "Undo Search & Replace"
 msgstr ""
 
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 #, fuzzy
 msgid "AddCategory"
 msgstr "Nuvarande sida:"
 
-#: ../lib/EditToolbar.php:321
+#: ../lib/EditToolbar.php:320
 #, fuzzy
 msgid "Insert Categories"
 msgstr "Nuvarande sida:"
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 msgid "AddPlugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:371
+#: ../lib/EditToolbar.php:370
 msgid "Insert Plugin"
 msgstr ""
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 msgid "AddPageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:401
+#: ../lib/EditToolbar.php:400
 msgid "Insert PageLink"
 msgstr ""
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 msgid "Add Image or Video"
 msgstr ""
 
-#: ../lib/EditToolbar.php:439
+#: ../lib/EditToolbar.php:438
 msgid "Insert Image or Video"
 msgstr ""
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:474
+#: ../lib/EditToolbar.php:473
 msgid "Insert Template"
 msgstr ""
 
@@ -707,23 +685,23 @@
 msgid "%s: error while handling error:"
 msgstr ""
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: fila ingen funna"
 
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr ""
 
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr ""
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr "Framsida"
@@ -732,7 +710,23 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:889
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+msgid ": "
+msgstr ""
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -745,7 +739,7 @@
 msgid "Dump to directory"
 msgstr ""
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 msgid "Upload File"
 msgstr ""
 
@@ -761,31 +755,31 @@
 msgid "Dump pages as XHTML"
 msgstr ""
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
 msgstr ""
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, fuzzy, php-format
 msgid "Edited by: %s"
 msgstr "Redigera: %s"
@@ -813,88 +807,88 @@
 msgid "Return to %s"
 msgstr "Tillbaka till %s"
 
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr ""
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr ""
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr ""
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr ""
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr ""
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 msgid "Skipped."
 msgstr ""
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr ""
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr ""
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr ""
 
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, fuzzy, php-format
 msgid "... copied to %s"
 msgstr "Kopia är [%s]"
 
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, fuzzy, php-format
 msgid "... not copied to %s"
 msgstr "Kopia är [%s]"
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 msgid "saved as "
 msgstr ""
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 #, fuzzy
 msgid "... not found"
 msgstr "%s: fila ingen funna"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr "Ange ett sidnamn!"
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 #, fuzzy
 msgid "Invalid pagename!"
 msgstr "Ange ett sidnamn!"
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -903,74 +897,74 @@
 msgid "InterWikiMap"
 msgstr ""
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "från %s"
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 #, fuzzy
 msgid "New page"
 msgstr "Ta bort sida"
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr ""
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr ""
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, fuzzy, php-format
 msgid "plain file %s"
 msgstr "senast ändrad %s"
 
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr ""
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr ""
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
@@ -978,110 +972,110 @@
 msgid "Revert"
 msgstr ""
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 msgid "no page content"
 msgstr ""
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 msgid "same version page"
 msgstr ""
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 #, fuzzy
 msgid "Cancelled"
 msgstr "Avbyrt"
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr ""
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr "Avbyrt"
 
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, php-format
 msgid "revert to version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1134
 #, fuzzy, php-format
 msgid "Revert: %s"
 msgstr "Redigera: %s"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr ""
 
-#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, fuzzy, php-format
 msgid "%s: not defined"
 msgstr "%s: fila ingen funna"
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr ""
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr ""
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr ""
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr ""
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr ""
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr ""
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr ""
@@ -1091,40 +1085,40 @@
 msgid "PageChange Notification of %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "Tillbaka till %s"
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr ""
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "Kommentar:"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "Sidan är Låst"
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 msgid "E-Mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1139,7 +1133,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 msgid "Optimizing database"
 msgstr ""
 
@@ -1411,8 +1405,8 @@
 msgstr ""
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr ""
 
@@ -1434,7 +1428,7 @@
 msgstr "Fulltextsökning"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1476,8 +1470,8 @@
 msgid "Users will not be able to sign in."
 msgstr ""
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
 #: ../lib/PageList.php:93
@@ -1502,7 +1496,7 @@
 msgid "Click to de-/select all pages"
 msgstr ""
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr ""
@@ -1517,20 +1511,20 @@
 msgid "%s not found"
 msgstr "%s: fila ingen funna"
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
 msgid "individual page permission"
 msgstr ""
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
@@ -1541,18 +1535,18 @@
 msgstr "<ingen matchar>"
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 #, fuzzy
 msgid "Content"
 msgstr "Innehåll"
 
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 msgid "Permission"
 msgstr ""
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr ""
 
@@ -1633,7 +1627,7 @@
 msgstr ""
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
@@ -1702,7 +1696,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr ""
 
@@ -1730,12 +1724,14 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1773,7 +1769,7 @@
 msgid "Click to display all comments"
 msgstr ""
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr ""
 
@@ -1833,111 +1829,111 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 msgid "users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 msgid "minutes"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 msgid "Show summary information from the access log table."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -1965,11 +1961,11 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 msgid "Page successfully updated."
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, fuzzy, php-format
 msgid "Go to %s."
 msgstr "Tillbaka till %s."
@@ -2070,7 +2066,7 @@
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr ""
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2205,14 +2201,14 @@
 msgstr "Redigera %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2263,9 +2259,8 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr ""
 
@@ -2313,25 +2308,49 @@
 msgid "Created by CreatePage"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+#, fuzzy
+msgid "No page specified."
+msgstr "De %d mest populära sidorna för den här wikin:"
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, php-format
+msgid "Page '%s' does not exist."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, php-format
+msgid "%s: no such revision %d."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:485
 msgid "Click to display to TOC"
 msgstr ""
 
@@ -2347,8 +2366,8 @@
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "Diff"
 
@@ -2356,6 +2375,29 @@
 msgid "Display differences between revisions"
 msgstr ""
 
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "nuvarande version"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "Versionerna är identiska"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "Version"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
 #: ../lib/plugin/DynamicIncludePage.php:35
 #, fuzzy
 msgid "DynamicIncludePage"
@@ -2379,7 +2421,7 @@
 msgid "Click to hide/show"
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr ""
 
@@ -2436,7 +2478,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr ""
@@ -2501,22 +2543,34 @@
 "Displays a url in a seperate frame inside our body. Only one frame allowed."
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
-#, php-format
-msgid "recursive inclusion of page %s"
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:94
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "Borttagning på %s misslyckades: %s"
+
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
 #, php-format
-msgid "recursive inclusion of url %s"
+msgid "Recursive inclusion of url %s"
 msgstr ""
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2641,7 +2695,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, php-format
 msgid "%s is empty"
 msgstr ""
@@ -2706,36 +2760,39 @@
 msgid "Include text from another wiki page."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
 #, php-format
-msgid "recursive inclusion of page %s ignored"
+msgid "Recursive inclusion of page %s ignored"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
+#: ../lib/plugin/IncludePage.php:91
 #, php-format
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
 #, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "%s(%d): no such revision"
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:157
+#, fuzzy, php-format
+msgid "Included from %s (revision %d)"
+msgstr "Insättning från %s"
+
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "Insättning från %s"
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr ""
@@ -2788,6 +2845,7 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
@@ -2828,6 +2886,8 @@
 
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3111,7 +3171,7 @@
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
+msgid "Download for Subversion"
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:154
@@ -3167,7 +3227,7 @@
 #: ../lib/plugin/PageDump.php:215
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
 #: ../lib/plugin/PageDump.php:223 ../lib/plugin/PasswordReset.php:130
@@ -3190,12 +3250,13 @@
 msgid "Contents"
 msgstr "Innehåll"
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr "Nästa"
 
@@ -3503,7 +3564,7 @@
 #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124
 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "Help"
-msgstr ""
+msgstr "Hjälp"
 
 #: ../lib/plugin/PopularNearby.php:44
 msgid "PopularNearby"
@@ -3529,22 +3590,20 @@
 msgstr "De %d mest populära grannarna: "
 
 #: ../lib/plugin/PopularTags.php:33
-#, fuzzy
 msgid "PopularTags"
-msgstr "MestPopulär"
+msgstr ""
 
 #: ../lib/plugin/PopularTags.php:37
 msgid "List the most popular tags."
 msgstr ""
 
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr ""
 
 #: ../lib/plugin/PopularTags.php:71
-#, fuzzy
 msgid "Category"
-msgstr "Nuvarande sida:"
+msgstr ""
 
 #: ../lib/plugin/PopularTags.php:72
 msgid "Topic"
@@ -3586,7 +3645,7 @@
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr ""
 
@@ -3620,8 +3679,8 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr ""
@@ -3987,11 +4046,11 @@
 msgid "Recursive redirect to self: '%s'"
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr ""
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
 msgstr ""
 
@@ -4267,74 +4326,74 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
+#: ../lib/plugin/SyncWiki.php:110
 msgid "Syncing this PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 msgid "<unknown>"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
+#: ../lib/plugin/SyncWiki.php:209
 msgid "Now upload all locally newer uploads."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
+#: ../lib/plugin/SyncWiki.php:274
 #, php-format
 msgid "%s force"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:276
+#: ../lib/plugin/SyncWiki.php:278
 #, php-format
 msgid "Postponed %s for %s."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 msgid "skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 #, fuzzy
 msgid "same content"
 msgstr "Innehåll"
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr ""
@@ -4455,12 +4514,12 @@
 
 #: ../lib/plugin/SystemInfo.php:400
 #, php-format
-msgid "Application size: %d Kb"
+msgid "Application size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:402
 #, php-format
-msgid "Pagedata size: %d Kb"
+msgid "Pagedata size: %d KiB"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:420
@@ -4567,6 +4626,11 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr ""
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr ""
@@ -4653,7 +4717,7 @@
 msgid "Transcluded from %s"
 msgstr ""
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr ""
 
@@ -4740,78 +4804,78 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:179
+#: ../lib/plugin/UpLoad.php:178
 msgid "You cannot upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 msgid "Check you are logged in."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:213
+#: ../lib/plugin/UpLoad.php:212
 #, php-format
 msgid "ERROR uploading '%s'"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, php-format
 msgid "Files with extension %s are not allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:226
+#: ../lib/plugin/UpLoad.php:225
 #, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, php-format
 msgid "uploaded %s"
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 msgid "Uploading failed."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:291
+#: ../lib/plugin/UpLoad.php:290
 msgid "The upload logfile exists but is not writable."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 msgid "Can't open the upload logfile."
 msgstr ""
 
@@ -4951,7 +5015,6 @@
 msgstr ""
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr ""
 
@@ -4990,6 +5053,9 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 #, fuzzy
 msgid "WatchPage"
 msgstr "Bredd"
@@ -5020,11 +5086,11 @@
 msgid "The page %s is already watched!"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -5032,6 +5098,12 @@
 msgid "Edit"
 msgstr "Redigera"
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#, fuzzy
+msgid "Watch Page"
+msgstr "Bredd"
+
 #: ../lib/plugin/WatchPage.php:110
 msgid "You must sign in to watch pages."
 msgstr ""
@@ -5096,42 +5168,46 @@
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
 #, php-format
-msgid "%s pages have been changed."
+msgid "%d pages have been changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 msgid "No pages changed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Select the pages to change:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr ""
 
@@ -5162,42 +5238,42 @@
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr ""
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+msgid "One page has been changed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
 #, php-format
-msgid "%s pages have been permanently changed:"
+msgid "%d pages have been changed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:171
+#: ../lib/plugin/WikiAdminChown.php:173
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr "Ta bort sida nu"
 
-#: ../lib/plugin/WikiAdminChown.php:175
+#: ../lib/plugin/WikiAdminChown.php:177
 #, fuzzy
 msgid "Change owner of selected pages"
 msgstr "Visa källkoden för %s"
 
-#: ../lib/plugin/WikiAdminChown.php:176
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:198
+#: ../lib/plugin/WikiAdminChown.php:200
 #, fuzzy
-msgid "Change owner"
+msgid "Change owner to: "
 msgstr "SenasteÄndringar"
 
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
-msgstr ""
-
 #: ../lib/plugin/WikiAdminMarkup.php:36
 msgid "WikiAdminMarkup"
 msgstr ""
@@ -5225,23 +5301,21 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
+#: ../lib/plugin/WikiAdminMarkup.php:165
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr "Ta bort sida nu"
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
+#: ../lib/plugin/WikiAdminMarkup.php:169
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
-msgid "Change markup"
+#: ../lib/plugin/WikiAdminMarkup.php:192
+msgid "Change markup to: "
 msgstr ""
 
 #: ../lib/plugin/WikiAdminPurge.php:34
@@ -5263,26 +5337,35 @@
 msgid "Didn't purge page '%s'. Access denied."
 msgstr "Tog bort sidan '%s'."
 
+#: ../lib/plugin/WikiAdminPurge.php:77
+msgid "One page has been permanently purged:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminPurge.php:79
 #, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
 msgstr ""
 
+#: ../lib/plugin/WikiAdminPurge.php:85
+#, fuzzy
+msgid "No pages purged."
+msgstr "De %d mest populära sidorna för den här wikin:"
+
 #: ../lib/plugin/WikiAdminPurge.php:92
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:144
+#: ../lib/plugin/WikiAdminPurge.php:146
 #, fuzzy
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr "Ta bort sida nu"
 
-#: ../lib/plugin/WikiAdminPurge.php:147
+#: ../lib/plugin/WikiAdminPurge.php:149
 #, fuzzy
 msgid "Permanently purge selected pages"
 msgstr "Visa källkoden för %s"
 
-#: ../lib/plugin/WikiAdminPurge.php:148
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5304,38 +5387,48 @@
 msgid "Didn't remove page '%s'. Access denied."
 msgstr "Tog bort sidan '%s'."
 
+#: ../lib/plugin/WikiAdminRemove.php:121
+msgid "One page has been removed:"
+msgstr ""
+
 #: ../lib/plugin/WikiAdminRemove.php:123
 #, php-format
-msgid "%s pages have been permanently removed:"
+msgid "%d pages have been removed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+#: ../lib/plugin/WikiAdminRemove.php:129
+#, fuzzy
+msgid "No pages removed."
+msgstr "De %d mest populära sidorna för den här wikin:"
+
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
-msgstr ""
+#: ../lib/plugin/WikiAdminRemove.php:199
+#, fuzzy
+msgid "Are you sure you want to remove the selected files?"
+msgstr "Ta bort sida nu"
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:201
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:211
+#: ../lib/plugin/WikiAdminRemove.php:213
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -5344,85 +5437,93 @@
 msgid "WikiAdminRename"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 msgid "Rename selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:79
+#: ../lib/plugin/WikiAdminRename.php:80
 #, php-format
 msgid "Page '%s' already exists. Ignored."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:82
+#: ../lib/plugin/WikiAdminRename.php:83
 #, php-format
 msgid "Access denied to rename page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:91
+#: ../lib/plugin/WikiAdminRename.php:92
 #, fuzzy, php-format
 msgid "Renamed page from '%s' to '%s'"
 msgstr "Sätter in sidan %s, version %s från %s"
 
-#: ../lib/plugin/WikiAdminRename.php:100
+#: ../lib/plugin/WikiAdminRename.php:101
 #, fuzzy, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr "Sätter in sidan %s, version %s från %s"
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:126
+#: ../lib/plugin/WikiAdminRename.php:124
+msgid "One page has been renamed:"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:127
 #, php-format
-msgid "%s pages have been permanently renamed:"
+msgid "%d pages have been renamed:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:132
+#: ../lib/plugin/WikiAdminRename.php:133
 msgid "No pages renamed."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:209
+#: ../lib/plugin/WikiAdminRename.php:211
 #, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
 msgstr "Ta bort sida nu"
 
-#: ../lib/plugin/WikiAdminRename.php:213
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 #, fuzzy
 msgid "Rename page"
 msgstr "Ta bort sida"
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 msgid "from"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 msgid "Regex?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
 msgstr ""
 
@@ -5448,33 +5549,32 @@
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr "Ta bort sida nu"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 msgid "Select the pages to search and replace"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 msgid "Replace"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr ""
 
@@ -5534,47 +5634,47 @@
 msgid "Invalid ACL"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 msgid "PhpWikiAdministration/SetAcl"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
 msgstr "Ta bort sida nu"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 msgid "Change Access Rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 msgid "Select the pages where to change access rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 msgid "Selected Pages: "
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 msgid "Type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 msgid "(Currently not working)"
 msgstr ""
 
@@ -5596,12 +5696,12 @@
 msgid "PhpWikiAdministration/SetExternal"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 #, fuzzy
 msgid "Set pages to external"
 msgstr "Ta bort sida"
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 msgid "Select the pages to set as external"
 msgstr ""
 
@@ -5613,120 +5713,120 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, php-format
 msgid "Bad action requested: %s"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:100
+#: ../lib/plugin/WikiAdminUtils.php:102
 #, php-format
 msgid "WikiAdminUtils %s returned:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:102
+#: ../lib/plugin/WikiAdminUtils.php:104
 msgid "Back"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 msgid "Purge all Pages With Invalid Names"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 msgid "No pages with bad names had to be deleted."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:147
+#: ../lib/plugin/WikiAdminUtils.php:149
 #, php-format
-msgid "Deleted %s pages with invalid names:"
+msgid "Deleted %d pages with invalid names:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 msgid "No empty, unreferenced pages were found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:180
+#: ../lib/plugin/WikiAdminUtils.php:182
 #, php-format
-msgid "Deleted %s unreferenced pages:"
+msgid "Deleted %d unreferenced pages:"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, php-format
 msgid "Converted successfully %d pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:233
+#: ../lib/plugin/WikiAdminUtils.php:235
 msgid "Username"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr ""
 
@@ -5834,305 +5934,240 @@
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:47
-msgid "AddCommentPlugin"
+msgid "AllPagesCreatedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:48
-msgid "AddingPages"
+msgid "AllPagesLastEditedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:49
-msgid "AllPagesCreatedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:50
-msgid "AllPagesLastEditedByMe"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:51
 msgid "AllPagesOwnedByMe"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:52
-msgid "AuthorHistoryPlugin"
+msgid "CategoryHomePages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:54
-msgid "CalendarListPlugin"
-msgstr ""
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
+#: ../themes/Crao/templates/navbar.tmpl:41
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
+#: ../themes/default/templates/navbar.tmpl:18
+#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/MonoBook/templates/navbar.tmpl:30
+#: ../themes/MonoBook/templates/navbar.tmpl:36
+#: ../themes/Portland/templates/navbar.tmpl:6
+#: ../themes/shamino_com/templates/top.tmpl:21
+#: ../themes/Sidebar/templates/search.tmpl:6
+#: ../themes/smaller/templates/navbar.tmpl:9
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
+#: ../themes/wikilens/templates/navbar.tmpl:19
+msgid "FindPage"
+msgstr "SökEfterSida"
 
-#: ../lib/plugin/_WikiTranslation.php:55
-msgid "CalendarPlugin"
+#: ../lib/plugin/_WikiTranslation.php:56
+msgid "FullRecentChanges"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:57
-msgid "CategoryHomePages"
+msgid "Help/AddingPages"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:58
-msgid "CommentPlugin"
+msgid "Help/AddCommentPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:59
-msgid "CreateTocPlugin"
+msgid "Help/AuthorHistoryPlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:60
+msgid "Help/CalendarListPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:61
+msgid "Help/CalendarPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:62
-msgid "EditMetaDataPlugin"
+msgid "Help/CommentPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
+msgid "Help/CreateTocPlugin"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
-#: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
-#: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
-#: ../themes/MonoBook/templates/navbar.tmpl:30
-#: ../themes/MonoBook/templates/navbar.tmpl:36
-#: ../themes/Portland/templates/navbar.tmpl:6
-#: ../themes/shamino_com/templates/top.tmpl:21
-#: ../themes/Sidebar/templates/search.tmpl:6
-#: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
-#: ../themes/wikilens/templates/navbar.tmpl:19
-msgid "FindPage"
-msgstr "SökEfterSida"
+#: ../lib/plugin/_WikiTranslation.php:64
+msgid "Help/EditMetaDataPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:65
-msgid "FoafViewerPlugin"
+msgid "Help/ExternalSearchPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
+msgid "Help/FoafViewerPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:67
-msgid "FullRecentChanges"
+msgid "Help/FrameIncludePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:68
-msgid "HelloWorldPlugin"
+msgid "Help/HelloWorldPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:69
-msgid "HomePageAlias"
-msgstr ""
+msgid "Help/IncludePagePlugin"
+msgstr "Hjälp/SökEfterSida"
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
+msgid "Help/LinkIcons"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:71
-msgid "InterWiki"
+msgid "Help/MagicPhpWikiURLs"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
-msgstr ""
+msgid "Help/MoreAboutMechanics"
+msgstr "Hjälp/MerOmMekanismerna"
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
+msgid "Help/OldStyleTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
+msgid "Help/PhotoAlbumPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
+msgid "Help/PhpHighlightPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
+msgid "Help/PhpWeatherPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:77
-msgid "OldStyleTablePlugin"
+msgid "Help/PhpWiki"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:78
+msgid "Help/PloticusPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:79
-msgid "PageGroupTest"
+msgid "Help/RawHtmlPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:80
-msgid "PageGroupTest/Four"
+msgid "Help/RedirectToPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:81
-msgid "PageGroupTest/One"
+msgid "Help/RichTablePlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:82
-msgid "PageGroupTest/Three"
+msgid "Help/SystemInfoPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:83
-msgid "PageGroupTest/Two"
+msgid "Help/TranscludePlugin"
 msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:85
-msgid "PhotoAlbumPlugin"
+msgid "Help/UpLoadPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:86
-msgid "PhpHighlightPlugin"
+msgid "Help/WabiSabi"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
+msgid "Help/WikiBlogPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
+msgid "Help/WikiPlugin"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:89
-msgid "PhpWikiAdministration/Chmod"
+msgid "Help/WikiWikiWeb"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:92
-msgid "PhpWikiAdministration/Rename"
+#: ../lib/plugin/_WikiTranslation.php:90
+msgid "HomePageAlias"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:93
-msgid "PhpWikiAdministration/Replace"
+#: ../lib/plugin/_WikiTranslation.php:91
+msgid "InterWiki"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:95
-#: ../themes/MonoBook/templates/navbar.tmpl:21
-msgid "PhpWikiDocumentation"
+#: ../lib/plugin/_WikiTranslation.php:93
+msgid "PhpWikiAdministration/Chmod"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:96
-msgid "PhpWikiPoll"
+msgid "PhpWikiAdministration/Rename"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:97
-msgid "PloticusPlugin"
+msgid "PhpWikiAdministration/Replace"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:99
-msgid "PgsrcTranslation/de"
+#: ../themes/MonoBook/templates/navbar.tmpl:21
+msgid "PhpWikiDocumentation"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:100
-msgid "PgsrcTranslation/fr"
+msgid "PhpWikiPoll"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:101
-msgid "PgsrcTranslation/it"
+msgid "RecentVisitors"
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:102
-msgid "PgsrcTranslation/es"
+msgid "ReleaseNotes"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:103
-msgid "PgsrcTranslation/nl"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:104
-msgid "PgsrcTranslation/sv"
+msgid "SteveWainstead"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:105
-msgid "PgsrcTranslation/ja"
-msgstr ""
-
 #: ../lib/plugin/_WikiTranslation.php:106
-msgid "PgsrcTranslation/zh"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:107
-msgid "RawHtmlPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:108
-msgid "RecentVisitors"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:109
-msgid "RedirectToPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:110
-msgid "ReleaseNotes"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:111
-msgid "RichTablePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:113
-msgid "SteveWainstead"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:114
-msgid "SystemInfoPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "UpLoad"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:119
-msgid "UpLoadPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:121
-msgid "WikiBlogPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:122
-msgid "WikiPlugin"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr ""
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
 "service for %s to language %s"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr ""
@@ -6161,7 +6196,7 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 #, fuzzy
 msgid "Purge Page"
 msgstr "Namn på Sidan"
@@ -6183,7 +6218,7 @@
 "the database."
 msgstr ""
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr "Ta bort sida"
 
@@ -6195,8 +6230,8 @@
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 
@@ -6225,138 +6260,138 @@
 msgid "the file '%s'"
 msgstr ""
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr ""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr ""
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 msgid "Invalid image size"
 msgstr ""
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr ""
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr ""
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr ""
 
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr ""
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr ""
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr ""
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr ""
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr ""
 
-#: ../lib/stdlib.php:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr ""
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr ""
 
-#: ../lib/stdlib.php:1423
+#: ../lib/stdlib.php:1425
 #, php-format
-msgid "%s b"
+msgid "%s B"
 msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr ""
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
+msgid "%s KiB"
 msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
 #, php-format
-msgid "%s Kb (%s bytes)"
+msgid "%s KiB (%s bytes)"
 msgstr ""
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr ""
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr ""
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr ""
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr ""
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, php-format
 msgid "... (first %s words)"
 msgstr ""
@@ -6651,7 +6686,7 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr ""
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr ""
@@ -6744,8 +6779,8 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr ""
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
 msgstr ""
 
@@ -6773,7 +6808,7 @@
 msgid "Top Recommendations"
 msgstr ""
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr ""
 
@@ -6823,69 +6858,64 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr ""
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 msgid "Never edited"
 msgstr ""
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr "%s i %s"
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, php-format
-msgid "Version %s, saved %s"
+msgid "Version %s, saved on %s"
 msgstr "Version %s, sparade %s"
 
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, php-format
 msgid "Last edited %s"
 msgstr "Senast ändrad %s"
 
 #: ../lib/WikiTheme.php:473
 #, php-format
-msgid "Version %s, saved on %s"
-msgstr "Version %s, sparade %s"
-
-#: ../lib/WikiTheme.php:475
-#, php-format
 msgid "Last edited on %s"
 msgstr "Senast ändrad %s"
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr "i dag"
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr "i går"
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, php-format
 msgid "Owner: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -6898,70 +6928,71 @@
 msgid "Sign Out"
 msgstr "Logga ut"
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Anslut"
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 #, fuzzy
 msgid "Rename Page"
 msgstr "Ta bort sida"
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Lås Sida"
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Lås upp Sida"
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr "Skrivare"
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr "Ny|modig"
 
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, fuzzy, php-format
 msgid "Plugin %s: undefined"
 msgstr "%s: fila ingen funna"
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr ""
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7039,57 +7070,57 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 msgid "Invalid password."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 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:1338
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1341
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1781
+#: ../lib/WikiUserNew.php:1783
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7098,14 +7129,14 @@
 "See %s"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1841
+#: ../lib/WikiUserNew.php:1843
 #, php-format
-msgid "E-Mail address '%s' is not properly formatted"
+msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1845
+#: ../lib/WikiUserNew.php:1847
 #, php-format
-msgid "E-Mail address '%s' is properly formatted"
+msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
@@ -7273,10 +7304,10 @@
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7284,7 +7315,7 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
 msgstr "Visa Källkoden"
@@ -7312,9 +7343,8 @@
 #: ../themes/Portland/templates/editpage.tmpl:83
 #: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/Wordpress/templates/editpage.tmpl:96
-#, fuzzy
 msgid "Help/GoodStyle"
-msgstr "BraStil"
+msgstr "Hjälp/BraStil"
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7337,9 +7367,8 @@
 #: ../themes/fusionforge/templates/editpage.tmpl:79
 #: ../themes/Portland/templates/editpage.tmpl:84
 #: ../themes/Wordpress/templates/editpage.tmpl:97
-#, fuzzy
 msgid "Help/TextFormattingRules"
-msgstr "Textformateringsregler"
+msgstr "Hjälp/Textformateringsregler"
 
 #: ../themes/blog/templates/blogform.tmpl:25
 #: ../themes/Crao/templates/editpage.tmpl:94
@@ -7362,12 +7391,11 @@
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7378,12 +7406,11 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
@@ -7392,10 +7419,8 @@
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7406,7 +7431,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7456,6 +7481,8 @@
 
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
 #, fuzzy
@@ -7475,40 +7502,40 @@
 msgid "Comments on %s by %s."
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 #, fuzzy
 msgid "SignOut"
 msgstr "Logga ut"
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 #, fuzzy
 msgid "SignIn"
 msgstr "Anslut"
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 #, fuzzy
 msgid "Lock"
 msgstr "Låst"
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 #, fuzzy
 msgid "Unlock"
 msgstr "Lås upp Sida"
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 msgid "blog"
 msgstr ""
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr "(diff)"
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -7619,21 +7646,28 @@
 #: ../themes/default/templates/editpage.tmpl:118
 #: ../themes/Portland/templates/editpage.tmpl:79
 #: ../themes/Wordpress/templates/editpage.tmpl:92
-#, fuzzy
 msgid "Help/OldTextFormattingRules"
-msgstr "Textformateringsregler"
+msgstr "Hjälp/Textformateringsregler"
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr ""
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr ""
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7683,9 +7717,9 @@
 msgstr ""
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, fuzzy, php-format
 msgid ", Memory: %s"
 msgstr "Redigera: %s"
@@ -7798,11 +7832,23 @@
 msgid "Hits:"
 msgstr "Träffar:"
 
+#: ../themes/default/templates/info.tmpl:133
+msgid "Is External:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:134
 #, fuzzy
 msgid "No"
 msgstr "Ingen"
 
+#: ../themes/default/templates/info.tmpl:138
+msgid "ACL type:"
+msgstr ""
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
@@ -7948,44 +7994,17 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Översikt"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-#, fuzzy
-msgid "Next >>"
-msgstr "Nästa"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ""
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr ""
@@ -8036,34 +8055,34 @@
 
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
 #, php-format
 msgid "User preferences for user %s"
 msgstr ""
@@ -8137,43 +8156,43 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr ""
 
@@ -8183,7 +8202,7 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, php-format
 msgid "Hide %s:"
 msgstr ""
@@ -8195,13 +8214,13 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, php-format
 msgid "Add %s:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
@@ -8220,23 +8239,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr "Höjd"
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr "Bredd"
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8244,46 +8263,46 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr "Timme Zon"
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
 msgstr ""
 
 # fuzzy
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 #, fuzzy
 msgid "Reset Preferences"
 msgstr "Inställningar"
@@ -8302,24 +8321,19 @@
 msgid "Posted: %s"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
-msgid "/Discussion"
-msgstr ""
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
 msgid "Action Page"
 msgstr "SökEfterSida"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
 msgid "Page"
 msgstr "Framsida"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
 #, fuzzy
 msgid "Template/Talk"
@@ -8332,51 +8346,54 @@
 msgid "Create Page"
 msgstr "SökEfterSida"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
 msgid "History"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 #, fuzzy
 msgid "Page Info"
 msgstr "Sidan är Låst"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Back Links"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 #, fuzzy
 msgid "Change Owner"
 msgstr "SenasteÄndringar"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 msgid "Purge"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-#, fuzzy
-msgid "Watch Page"
-msgstr "Bredd"
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr "Textformateringsregler"
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr ""
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+msgid "This revision of the page does not exist."
+msgstr ""
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
 msgstr ""
@@ -8385,60 +8402,109 @@
 msgid "Make the page external?"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/fusionforge/templates/navbar.tmpl:9
+#, fuzzy
+msgid "Home Page"
+msgstr "Framsida"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+#, fuzzy
+msgid "Recent Changes"
+msgstr "SenasteÄndringar"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
 msgid "SpecialPages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+msgid "Special Pages"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+#, fuzzy
+msgid "Random Page"
+msgstr "Ta bort sida"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
 msgid "Like Pages"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
+msgid "Wiki Admin"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+msgid "My User Page"
+msgstr ""
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+#, fuzzy
+msgid "User Preferences"
+msgstr "Inställningar"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "Inställningar"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
 msgid "E-mail Notification"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+msgid "Global user preferences (for all projects)"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-#, fuzzy
-msgid "Random Page"
-msgstr "Ta bort sida"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 msgid "Check menu items to display."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 #, fuzzy
 msgid "Show Page Trail"
 msgstr "Namn på Sidan"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:73
 #, fuzzy
 msgid "This page is external."
 msgstr "Sätter in sidan %s, version %s från %s"
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -8678,6 +8744,13 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Nästa"
+
+#~ msgid "Version %s, saved %s"
+#~ msgstr "Version %s, sparade %s"
+
+#, fuzzy
 #~ msgid "Include of '%s' failed."
 #~ msgstr "Insättning för '%s' misslyckades."
 
@@ -8746,10 +8819,6 @@
 #~ msgid "Last Summary:"
 #~ msgstr "Senaste Kommentar:"
 
-#, fuzzy
-#~ msgid "No dsn specified"
-#~ msgstr "De %d mest populära sidorna för den här wikin:"
-
 #~ msgid "Remove the page now"
 #~ msgstr "Ta bort sida nu"
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/po/zh.po
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/po/zh.po	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/po/zh.po	2011-05-18 19:36:20 UTC (rev 13355)
@@ -4,14 +4,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.9\n"
+"Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 14:05+0200\n"
+"POT-Creation-Date: 2011-05-18 20:17+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <druryl at user.sourceforge.net>\n"
 "Language-Team: DruryL <druryl at users.sourceforge.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../lib/CachedMarkup.php:536
@@ -45,12 +46,12 @@
 msgid "Type word above:"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:21
+#: ../lib/DbaDatabase.php:20
 #, php-format
 msgid "The DBA handler %s is unsupported!"
 msgstr ""
 
-#: ../lib/DbaDatabase.php:22
+#: ../lib/DbaDatabase.php:21
 #, fuzzy, php-format
 msgid "Supported handlers are: %s"
 msgstr "已支援的佈景主題"
@@ -72,8 +73,8 @@
 msgid "version %s"
 msgstr "版本 %s"
 
-#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:534
-#: ../lib/WikiTheme.php:536
+#: ../lib/diff.php:203 ../lib/plugin/Diff.php:69 ../lib/WikiTheme.php:532
+#: ../lib/WikiTheme.php:534
 #, php-format
 msgid "by %s"
 msgstr "被 %s"
@@ -89,7 +90,7 @@
 msgid "I'm sorry, there is no such page as %s."
 msgstr "抱歉,這裡沒有任何被命名為 %s 的頁面."
 
-#: ../lib/diff.php:233 ../lib/diff.php:340
+#: ../lib/diff.php:233 ../lib/diff.php:342
 #, php-format
 msgid "Diff: %s"
 msgstr "差異: %s"
@@ -145,88 +146,68 @@
 msgid "Older page:"
 msgstr "較舊的頁面:"
 
-#: ../lib/diff.php:320 ../lib/plugin/Diff.php:182
-#, fuzzy
-msgid "Content of versions "
-msgstr "版本 %d"
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-msgid " and "
-msgstr ""
-
-#: ../lib/diff.php:321 ../lib/plugin/Diff.php:183
-#, fuzzy
-msgid " is identical."
-msgstr "版本相同"
-
-#: ../lib/diff.php:326 ../lib/plugin/Diff.php:188
-#, fuzzy
-msgid "Version "
-msgstr "版本"
-
-#: ../lib/diff.php:327 ../lib/plugin/Diff.php:189
-msgid " was created because: "
-msgstr ""
-
 # This entry is important for French punctuation rules which stipulate
 # a space before each colon.
 #: ../lib/display.php:55 ../lib/display.php:321
-#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:159
-#: ../lib/plugin/PageGroup.php:170 ../lib/plugin/PageGroup.php:186
-#: ../lib/plugin/PageGroup.php:193 ../lib/plugin/PageHistory.php:236
-#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:47
-#: ../themes/default/templates/head.tmpl:53
+#: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
+#: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
+#: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
+#: ../lib/plugin/UnfoldSubpages.php:154 ../themes/Crao/templates/head.tmpl:40
+#: ../themes/default/templates/head.tmpl:46
 #: ../themes/default/templates/top.tmpl:11
 #: ../themes/MonoBook/templates/logo.tmpl:5
 #: ../themes/Portland/templates/body.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/wikilens/templates/top.tmpl:11
 #: ../themes/Wordpress/templates/body.tmpl:15
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:433
+#: ../lib/display.php:86 ../lib/display.php:187 ../lib/display.php:425
 #: ../lib/plugin/LinkDatabase.php:42
 #, fuzzy
 msgid "LinkDatabase"
 msgstr "資料庫"
 
-#: ../lib/display.php:151 ../lib/display.php:395 ../lib/loadsave.php:1577
+#: ../lib/display.php:151 ../lib/display.php:387 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
 #: ../lib/RSSWriter091.php:112 ../themes/blog/templates/actionbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:56
 #: ../themes/Crao/templates/navbar.tmpl:14
-#: ../themes/default/templates/head.tmpl:69
-#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:62
+#: ../themes/default/templates/head.tmpl:64
 #: ../themes/default/templates/navbar.tmpl:16
-#: ../themes/fusionforge/templates/navbar.tmpl:11
+#: ../themes/fusionforge/templates/navbar.tmpl:10
 #: ../themes/MonoBook/templates/navbar.tmpl:16
 #: ../themes/Portland/templates/navbar.tmpl:26
 #: ../themes/shamino_com/templates/top.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/Sidebar/templates/rc.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:60
+#: ../themes/wikilens/templates/head.tmpl:53
 #: ../themes/wikilens/templates/navbar.tmpl:17
 #: ../themes/Wordpress/templates/actionbar.tmpl:24
 msgid "RecentChanges"
 msgstr "RecentChanges"
 
-#: ../lib/display.php:188 ../lib/display.php:434
+#: ../lib/display.php:188 ../lib/display.php:426
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, fuzzy, php-format
 msgid "Unsupported argument: %s=%s"
 msgstr "已支援的語言"
 
 #: ../lib/display.php:258 ../lib/display.php:265
-#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:53
+#: ../lib/plugin/BackLinks.php:29 ../lib/plugin/_WikiTranslation.php:50
 #: ../themes/blog/templates/navbar.tmpl:11
 #: ../themes/Crao/templates/navbar.tmpl:18
 #: ../themes/default/templates/navbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
+#: ../themes/MonoBook/templates/navbar.tmpl:52
+#: ../themes/Sidebar/templates/navbar.tmpl:48
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/navbar.tmpl:22
 msgid "BackLinks"
@@ -242,12 +223,12 @@
 msgid "(Redirected from %s)"
 msgstr "(已從 %s 重導向)"
 
-#: ../lib/display.php:351 ../themes/Crao/templates/head.tmpl:70
-#: ../themes/Crao/templates/head.tmpl:71
-#: ../themes/default/templates/head.tmpl:78
-#: ../themes/default/templates/head.tmpl:79
-#: ../themes/wikilens/templates/head.tmpl:68
-#: ../themes/wikilens/templates/head.tmpl:69
+#: ../lib/display.php:344 ../themes/Crao/templates/head.tmpl:63
+#: ../themes/Crao/templates/head.tmpl:64
+#: ../themes/default/templates/head.tmpl:71
+#: ../themes/default/templates/head.tmpl:72
+#: ../themes/wikilens/templates/head.tmpl:61
+#: ../themes/wikilens/templates/head.tmpl:62
 msgid "SandBox"
 msgstr "SandBox"
 
@@ -350,7 +331,7 @@
 msgid "Versions are identical"
 msgstr "版本相同"
 
-#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:140
+#: ../lib/editpage.php:557 ../themes/MacOSX/themeinfo.php:138
 msgid "Page Locked"
 msgstr "頁面已被鎖定"
 
@@ -388,19 +369,19 @@
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
 #: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
-#: ../themes/Crao/templates/head.tmpl:86 ../themes/Crao/templates/head.tmpl:87
+#: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
-#: ../themes/default/templates/head.tmpl:94
-#: ../themes/default/templates/head.tmpl:95
+#: ../themes/default/templates/head.tmpl:87
+#: ../themes/default/templates/head.tmpl:88
 #: ../themes/default/templates/homepage.tmpl:11
 #: ../themes/default/templates/navbar.tmpl:27
-#: ../themes/fusionforge/templates/navbar.tmpl:28
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:11
 #: ../themes/shamino_com/templates/top.tmpl:28
 #: ../themes/Sidebar/templates/navbar.tmpl:52
 #: ../themes/smaller/templates/navbar.tmpl:23
-#: ../themes/wikilens/templates/head.tmpl:85
-#: ../themes/wikilens/templates/head.tmpl:86
+#: ../themes/wikilens/templates/head.tmpl:78
+#: ../themes/wikilens/templates/head.tmpl:79
 #: ../themes/wikilens/templates/navbar.tmpl:23
 msgid "UserPreferences"
 msgstr "UserPreferences"
@@ -465,8 +446,8 @@
 msgid "Changes"
 msgstr "RecentChanges"
 
-#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:162
-#: ../lib/plugin/UpLoad.php:167 ../lib/plugin/WikiForm.php:101
+#: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
+#: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
 msgstr "上傳"
 
@@ -515,8 +496,8 @@
 msgid "String \"%s\" not found."
 msgstr "未找到頁面 %s."
 
-#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:257
-#: ../lib/EditToolbar.php:258 ../lib/plugin/WikiAdminSearchReplace.php:192
+#: ../lib/EditToolbar.php:54 ../lib/EditToolbar.php:256
+#: ../lib/EditToolbar.php:257 ../lib/plugin/WikiAdminSearchReplace.php:193
 msgid "Search & Replace"
 msgstr "搜尋與取代"
 
@@ -530,8 +511,8 @@
 msgid "Replace with"
 msgstr "取代:"
 
-#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:297
-#: ../lib/plugin/SyncWiki.php:323 ../lib/plugin/SyncWiki.php:346
+#: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
+#: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
 #: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
 #: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
 #: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
@@ -542,9 +523,9 @@
 msgid "OK"
 msgstr ""
 
-#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:324
-#: ../lib/EditToolbar.php:374 ../lib/EditToolbar.php:404
-#: ../lib/EditToolbar.php:442 ../lib/EditToolbar.php:477
+#: ../lib/EditToolbar.php:58 ../lib/EditToolbar.php:323
+#: ../lib/EditToolbar.php:373 ../lib/EditToolbar.php:403
+#: ../lib/EditToolbar.php:441 ../lib/EditToolbar.php:476
 msgid "Close"
 msgstr ""
 
@@ -637,8 +618,8 @@
 msgid "List"
 msgstr "最後"
 
-#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:452
-#: ../lib/plugin/CreateToc.php:467
+#: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:479
+#: ../lib/plugin/CreateToc.php:494
 #, fuzzy
 msgid "Table of Contents"
 msgstr "目錄"
@@ -648,8 +629,8 @@
 msgid "Page Name"
 msgstr "頁面名稱"
 
-#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:18
-#: ../themes/default/templates/redirect.tmpl:41
+#: ../lib/EditToolbar.php:197 ../themes/default/templates/redirect.tmpl:17
+#: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
 msgstr "重導向"
 
@@ -664,66 +645,66 @@
 msgid "Template"
 msgstr "佈景主題"
 
-#: ../lib/EditToolbar.php:235
+#: ../lib/EditToolbar.php:234
 msgid "Click a button to get an example text"
 msgstr ""
 
-#: ../lib/EditToolbar.php:249 ../lib/EditToolbar.php:250
+#: ../lib/EditToolbar.php:248 ../lib/EditToolbar.php:249
 #, fuzzy
 msgid "Undo Search & Replace"
 msgstr "搜尋與取代"
 
-#: ../lib/EditToolbar.php:318
+#: ../lib/EditToolbar.php:317
 #, fuzzy
 msgid "AddCategory"
 msgstr "CategoryPage"
 
-#: ../lib/EditToolbar.php:321
+#: ../lib/EditToolbar.php:320
 #, fuzzy
 msgid "Insert Categories"
 msgstr "CategoryPage"
 
-#: ../lib/EditToolbar.php:323 ../lib/EditToolbar.php:373
-#: ../lib/EditToolbar.php:403 ../lib/EditToolbar.php:441
-#: ../lib/EditToolbar.php:476
+#: ../lib/EditToolbar.php:322 ../lib/EditToolbar.php:372
+#: ../lib/EditToolbar.php:402 ../lib/EditToolbar.php:440
+#: ../lib/EditToolbar.php:475
 msgid "Insert"
 msgstr ""
 
-#: ../lib/EditToolbar.php:368 ../lib/EditToolbar.php:369
+#: ../lib/EditToolbar.php:367 ../lib/EditToolbar.php:368
 #, fuzzy
 msgid "AddPlugin"
 msgstr "Plugin"
 
-#: ../lib/EditToolbar.php:371
+#: ../lib/EditToolbar.php:370
 #, fuzzy
 msgid "Insert Plugin"
 msgstr "使用此 plugin"
 
-#: ../lib/EditToolbar.php:398 ../lib/EditToolbar.php:399
+#: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398
 #, fuzzy
 msgid "AddPageLink"
 msgstr "AddingPages"
 
-#: ../lib/EditToolbar.php:401
+#: ../lib/EditToolbar.php:400
 #, fuzzy
 msgid "Insert PageLink"
 msgstr "AddingPages"
 
-#: ../lib/EditToolbar.php:436 ../lib/EditToolbar.php:437
+#: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436
 #, fuzzy
 msgid "Add Image or Video"
 msgstr "AddingPages"
 
-#: ../lib/EditToolbar.php:439
+#: ../lib/EditToolbar.php:438
 #, fuzzy
 msgid "Insert Image or Video"
 msgstr "AddingPages"
 
-#: ../lib/EditToolbar.php:471 ../lib/EditToolbar.php:472
+#: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471
 msgid "AddTemplate"
 msgstr ""
 
-#: ../lib/EditToolbar.php:474
+#: ../lib/EditToolbar.php:473
 #, fuzzy
 msgid "Insert Template"
 msgstr "佈景主題"
@@ -733,23 +714,23 @@
 msgid "%s: error while handling error:"
 msgstr "%s: 處理錯誤時發生錯誤"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: 找不到檔案."
 
-#: ../lib/IniConfig.php:990
+#: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr "CategoryGroup"
 
-#: ../lib/IniConfig.php:992
+#: ../lib/IniConfig.php:995
 msgid "An unnamed PhpWiki"
 msgstr "未被命名的 PhpWiki"
 
-#: ../lib/IniConfig.php:994 ../lib/upgrade.php:70
+#: ../lib/IniConfig.php:997 ../lib/upgrade.php:70
 #: ../themes/blog/templates/browse-footer.tmpl:6
 #: ../themes/default/templates/userprefs.tmpl:132
-#: ../themes/fusionforge/templates/navbar.tmpl:10
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #: ../themes/Wordpress/templates/actionbar.tmpl:21
 msgid "HomePage"
 msgstr "首頁"
@@ -758,7 +739,26 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:889
+# This entry is important for French punctuation rules which stipulate
+# a space before each colon.
+#: ../lib/InlineParser.php:344 ../lib/plugin/ModeratedPage.php:256
+#: ../lib/plugin/ModeratedPage.php:259 ../lib/plugin/ModeratedPage.php:351
+#: ../lib/plugin/SemanticSearch.php:157 ../lib/plugin/SemanticSearch.php:240
+#: ../lib/plugin/SpellCheck.php:178 ../lib/plugin/WikiAdminRename.php:268
+#: ../lib/plugin/WikiAdminRename.php:272
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
+#: ../lib/plugin/WikiAdminSetAcl.php:247 ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:250 ../lib/upgrade.php:1104
+#: ../lib/upgrade.php:1112 ../themes/blog/templates/blogform.tmpl:10
+#: ../themes/default/templates/blogform.tmpl:10
+#: ../themes/fusionforge/templates/blogform.tmpl:10
+#: ../themes/fusionforge/themeinfo.php:55
+#, fuzzy
+msgid ": "
+msgstr "%s: %s"
+
+#: ../lib/InlineParser.php:911
 #, php-format
 msgid "unknown color %s ignored"
 msgstr ""
@@ -772,7 +772,7 @@
 msgid "Dump to directory"
 msgstr "目錄 '%s'"
 
-#: ../lib/loadsave.php:75
+#: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
 #, fuzzy
 msgid "Upload File"
 msgstr "載入檔案"
@@ -791,31 +791,31 @@
 msgid "Dump pages as XHTML"
 msgstr "傾印頁面為 XHTML"
 
-#: ../lib/loadsave.php:85 ../lib/loadsave.php:474 ../lib/loadsave.php:1032
-#: ../lib/loadsave.php:1038 ../lib/loadsave.php:1046 ../lib/main.php:1063
+#: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1063
 #: ../lib/main.php:1185 ../lib/main.php:1197 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:141
+#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
-#: ../themes/Crao/templates/head.tmpl:80 ../themes/Crao/templates/head.tmpl:81
+#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
 #: ../themes/Crao/templates/navbar.tmpl:38
-#: ../themes/default/templates/head.tmpl:88
-#: ../themes/default/templates/head.tmpl:89
+#: ../themes/default/templates/head.tmpl:81
+#: ../themes/default/templates/head.tmpl:82
 #: ../themes/default/templates/navbar.tmpl:42
-#: ../themes/fusionforge/templates/navbar.tmpl:22
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Portland/templates/navbar.tmpl:28
 #: ../themes/shamino_com/templates/actionbar.tmpl:20
 #: ../themes/Sidebar/templates/navbar.tmpl:71
 #: ../themes/smaller/templates/navbar.tmpl:20
-#: ../themes/wikilens/templates/head.tmpl:78
-#: ../themes/wikilens/templates/head.tmpl:79
+#: ../themes/wikilens/templates/head.tmpl:71
+#: ../themes/wikilens/templates/head.tmpl:72
 #: ../themes/wikilens/templates/navbar.tmpl:32
 #: ../themes/Wordpress/templates/actionbar.tmpl:28
 msgid "PhpWikiAdministration"
 msgstr "PhpWikiAdministration"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:287 ../lib/MailNotify.php:304
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
 #, php-format
 msgid "Edited by: %s"
 msgstr "由 %s 編輯"
@@ -844,89 +844,89 @@
 msgid "Return to %s"
 msgstr "回到 %s"
 
-#: ../lib/loadsave.php:243
+#: ../lib/loadsave.php:244
 msgid "FullDump"
 msgstr "完整傾印"
 
-#: ../lib/loadsave.php:247
+#: ../lib/loadsave.php:248
 msgid "LatestSnapshot"
 msgstr "最新快照"
 
-#: ../lib/loadsave.php:317 ../lib/loadsave.php:448
+#: ../lib/loadsave.php:318 ../lib/loadsave.php:449
 msgid "You must specify a directory to dump to"
 msgstr "你必須指定目錄以進行傾印"
 
-#: ../lib/loadsave.php:322 ../lib/loadsave.php:453
+#: ../lib/loadsave.php:323 ../lib/loadsave.php:454
 #, php-format
 msgid "Cannot create directory '%s'"
 msgstr "無法建立目錄 '%s'"
 
-#: ../lib/loadsave.php:324 ../lib/loadsave.php:455
+#: ../lib/loadsave.php:325 ../lib/loadsave.php:456
 #, php-format
 msgid "Created directory '%s' for the page dump..."
 msgstr "為頁面傾印建立目錄 '%s'..."
 
-#: ../lib/loadsave.php:327 ../lib/loadsave.php:458
+#: ../lib/loadsave.php:328 ../lib/loadsave.php:459
 #, php-format
 msgid "Using directory '%s'"
 msgstr "使用目錄 '%s'"
 
-#: ../lib/loadsave.php:330 ../lib/loadsave.php:460
+#: ../lib/loadsave.php:331 ../lib/loadsave.php:461
 msgid "Dumping Pages"
 msgstr "傾印頁面中"
 
-#: ../lib/loadsave.php:366 ../lib/loadsave.php:625 ../lib/stdlib.php:1018
+#: ../lib/loadsave.php:367 ../lib/loadsave.php:630 ../lib/stdlib.php:1020
 #, fuzzy
 msgid "Skipped."
 msgstr "跳過"
 
-#: ../lib/loadsave.php:374
+#: ../lib/loadsave.php:375
 #, php-format
 msgid "saved as %s"
 msgstr "存為 %s"
 
-#: ../lib/loadsave.php:384 ../lib/loadsave.php:695
+#: ../lib/loadsave.php:385 ../lib/loadsave.php:700
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
 msgstr "無法寫入到 '%s'."
 
-#: ../lib/loadsave.php:390 ../lib/loadsave.php:705
+#: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
 msgid "%s bytes written"
 msgstr "已寫入 %s bytes"
 
-#: ../lib/loadsave.php:679 ../lib/loadsave.php:756 ../lib/loadsave.php:791
-#: ../lib/loadsave.php:821
+#: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
+#: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr "... 複製到 %s"
 
-#: ../lib/loadsave.php:682 ../lib/loadsave.php:758 ../lib/loadsave.php:793
-#: ../lib/loadsave.php:823
+#: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
+#: ../lib/loadsave.php:828
 #, fuzzy, php-format
 msgid "... not copied to %s"
 msgstr "... 複製到 %s"
 
-#: ../lib/loadsave.php:703
+#: ../lib/loadsave.php:708
 #, fuzzy
 msgid "saved as "
 msgstr "存為 %s"
 
-#: ../lib/loadsave.php:766 ../lib/loadsave.php:801 ../lib/loadsave.php:832
+#: ../lib/loadsave.php:771 ../lib/loadsave.php:806 ../lib/loadsave.php:837
 msgid "... not found"
 msgstr "... 沒找到"
 
-#: ../lib/loadsave.php:892
+#: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr "空白的頁面名稱!"
 
-#: ../lib/loadsave.php:902
+#: ../lib/loadsave.php:907
 #, fuzzy
 msgid "Invalid pagename!"
 msgstr "錯誤的 acl"
 
-#: ../lib/loadsave.php:908 ../lib/loadsave.php:1558 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:160
 #: ../themes/default/templates/info.tmpl:161
@@ -935,74 +935,74 @@
 msgid "InterWikiMap"
 msgstr "InterWikiMap"
 
-#: ../lib/loadsave.php:965
+#: ../lib/loadsave.php:970
 #, php-format
 msgid "from %s"
 msgstr "從 %s"
 
-#: ../lib/loadsave.php:974 ../lib/MailNotify.php:283
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
 #: ../lib/plugin/RecentChanges.php:137
 #, fuzzy
 msgid "New page"
 msgstr "新頁面."
 
-#: ../lib/loadsave.php:982
+#: ../lib/loadsave.php:987
 msgid "has edit conflicts - overwriting anyway"
 msgstr "編輯衝突 - 無論如何都覆寫"
 
-#: ../lib/loadsave.php:991
+#: ../lib/loadsave.php:996
 msgid "keep old"
 msgstr ""
 
-#: ../lib/loadsave.php:993
+#: ../lib/loadsave.php:998
 msgid "has edit conflicts - skipped"
 msgstr "編輯衝突 - 跳過"
 
-#: ../lib/loadsave.php:1002
+#: ../lib/loadsave.php:1007
 #, fuzzy, php-format
 msgid "content is identical to current version %d - no new revision created"
 msgstr "與目前版本 %d 相同 - 跳過"
 
-#: ../lib/loadsave.php:1016
+#: ../lib/loadsave.php:1021
 #, php-format
 msgid "- saved to database as version %d"
 msgstr "- 已經以版本 %d 存入資料庫中"
 
-#: ../lib/loadsave.php:1022 ../lib/loadsave.php:1293
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME 檔案 %s"
 
-#: ../lib/loadsave.php:1023 ../lib/loadsave.php:1304
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialized 到檔案 %s"
 
-#: ../lib/loadsave.php:1024 ../lib/loadsave.php:1326
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
 #, php-format
 msgid "plain file %s"
 msgstr "一般檔案 %s"
 
-#: ../lib/loadsave.php:1031 ../lib/plugin/SyncWiki.php:266
+#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:268
 msgid "Merge Edit"
 msgstr "合併編輯"
 
-#: ../lib/loadsave.php:1037
+#: ../lib/loadsave.php:1042
 msgid "Restore Anyway"
 msgstr "無論如何都回存"
 
-#: ../lib/loadsave.php:1045
+#: ../lib/loadsave.php:1050
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1052
+#: ../lib/loadsave.php:1057
 msgid " Sorry, cannot merge."
 msgstr ""
 
-#: ../lib/loadsave.php:1072 ../lib/loadsave.php:1082 ../lib/loadsave.php:1089
-#: ../lib/loadsave.php:1096 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
-#: ../themes/fusionforge/templates/userprefs.tmpl:255
+#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
+#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:73
 #: ../themes/Sidebar/templates/actionbar.tmpl:47
 #: ../themes/smaller/templates/actionbar.tmpl:31
@@ -1011,112 +1011,112 @@
 msgid "Revert"
 msgstr "重設"
 
-#: ../lib/loadsave.php:1073
+#: ../lib/loadsave.php:1078
 msgid "missing required version argument"
 msgstr ""
 
-#: ../lib/loadsave.php:1081
+#: ../lib/loadsave.php:1086
 #, fuzzy
 msgid "no page content"
 msgstr "下載頁面內容"
 
-#: ../lib/loadsave.php:1088
+#: ../lib/loadsave.php:1093
 #, fuzzy
 msgid "same version page"
 msgstr "使用者頁面"
 
-#: ../lib/loadsave.php:1095
+#: ../lib/loadsave.php:1100
 #, fuzzy
 msgid "Cancelled"
 msgstr "取消"
 
-#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
-#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:140
-#: ../lib/plugin/WikiAdminChown.php:168 ../lib/plugin/WikiAdminMarkup.php:160
-#: ../lib/plugin/WikiAdminPurge.php:142 ../lib/plugin/WikiAdminRemove.php:195
-#: ../lib/plugin/WikiAdminRename.php:206
-#: ../lib/plugin/WikiAdminSearchReplace.php:186
-#: ../lib/plugin/WikiAdminSetAcl.php:194
+#: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
+#: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
+#: ../lib/plugin/WikiAdminPurge.php:144 ../lib/plugin/WikiAdminRemove.php:197
+#: ../lib/plugin/WikiAdminRename.php:208
+#: ../lib/plugin/WikiAdminSearchReplace.php:187
+#: ../lib/plugin/WikiAdminSetAcl.php:197
 #: ../themes/default/templates/info.tmpl:134
 msgid "Yes"
 msgstr "是"
 
-#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
-#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:153
-#: ../lib/plugin/WikiAdminChown.php:181 ../lib/plugin/WikiAdminMarkup.php:173
-#: ../lib/plugin/WikiAdminPurge.php:152 ../lib/plugin/WikiAdminRemove.php:217
-#: ../lib/plugin/WikiAdminRename.php:229
-#: ../lib/plugin/WikiAdminSearchReplace.php:198
-#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:207
-#: ../lib/plugin/WikiAdminSetExternal.php:129
-#: ../lib/plugin/WikiAdminUtils.php:291 ../lib/plugin/WikiFormRich.php:306
+#: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
+#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
+#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminRename.php:231
+#: ../lib/plugin/WikiAdminSearchReplace.php:199
+#: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
+#: ../lib/plugin/WikiAdminSetExternal.php:131
+#: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
 #: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:278
-#: ../themes/fusionforge/templates/userprefs.tmpl:369
+#: ../themes/fusionforge/templates/userprefs.tmpl:367
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/loadsave.php:1123
+#: ../lib/loadsave.php:1128
 #, fuzzy, php-format
 msgid "revert to version %d"
 msgstr "版本 %d"
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1134
 #, fuzzy, php-format
 msgid "Revert: %s"
 msgstr "重設"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1135
 #, fuzzy, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- 已經以版本 %d 存入資料庫中"
 
-#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: 未被定義"
 
-#: ../lib/loadsave.php:1158
+#: ../lib/loadsave.php:1163
 msgid "Default InterWiki map file not loaded."
 msgstr "預設 InterWiki map 檔案未能載入."
 
-#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "從外部檔案 %s 載入 InterWikiMap"
 
-#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
 msgid "Skipping"
 msgstr "跳過"
 
-#: ../lib/loadsave.php:1455
+#: ../lib/loadsave.php:1460
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1462
+#: ../lib/loadsave.php:1467
 #, php-format
 msgid "Bad file type: %s"
 msgstr "錯誤的檔案型態: %s"
 
-#: ../lib/loadsave.php:1479
+#: ../lib/loadsave.php:1484
 #, php-format
 msgid "Loading '%s'"
 msgstr "載入 '%s'"
 
-#: ../lib/loadsave.php:1514
+#: ../lib/loadsave.php:1516
 msgid "Loading up virgin wiki"
 msgstr "載入原始 wiki"
 
-#: ../lib/loadsave.php:1570
+#: ../lib/loadsave.php:1572
 msgid "No uploaded file to upload?"
 msgstr "沒有要上傳的檔案?"
 
-#: ../lib/loadsave.php:1573
+#: ../lib/loadsave.php:1575
 #, php-format
 msgid "Uploading %s"
 msgstr "上傳中 %s"
@@ -1126,42 +1126,42 @@
 msgid "PageChange Notification of %s"
 msgstr "PageChange 通知 %s"
 
-#: ../lib/MailNotify.php:228
+#: ../lib/MailNotify.php:229
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "回到 %s"
 
-#: ../lib/MailNotify.php:234
+#: ../lib/MailNotify.php:235
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "無法為頁面 '%s' 變更權限為 '%s'."
 
-#: ../lib/MailNotify.php:256
+#: ../lib/MailNotify.php:257
 #, fuzzy
 msgid "Page change"
 msgstr "沒有頁面被變更."
 
-#: ../lib/MailNotify.php:288
+#: ../lib/MailNotify.php:289
 #, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "摘要:"
 
-#: ../lib/MailNotify.php:305
+#: ../lib/MailNotify.php:306
 #, fuzzy, php-format
 msgid "Page rename %s to %s"
 msgstr "頁面名稱以 '%s' 開頭的"
 
-#: ../lib/MailNotify.php:342
+#: ../lib/MailNotify.php:343
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "頁面已被鎖定"
 
-#: ../lib/MailNotify.php:378
+#: ../lib/MailNotify.php:379
 #, fuzzy
 msgid "E-Mail address confirmation"
 msgstr "Email 驗證."
 
-#: ../lib/MailNotify.php:381
+#: ../lib/MailNotify.php:382
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1176,7 +1176,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:101 ../lib/WikiDB.php:1010
+#: ../lib/main.php:101 ../lib/WikiDB.php:1006
 #, fuzzy
 msgid "Optimizing database"
 msgstr "最佳化 %s"
@@ -1459,8 +1459,8 @@
 msgstr "SetAcl"
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
-#: ../lib/plugin/WikiAdminRename.php:141 ../lib/plugin/WikiAdminRename.php:266
-#: ../themes/fusionforge/templates/actionbar.tmpl:114
+#: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
+#: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr "更名"
 
@@ -1482,7 +1482,7 @@
 msgstr "FullTextSearch"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1485
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -1524,8 +1524,8 @@
 msgid "Users will not be able to sign in."
 msgstr "使用者將無法簽入."
 
-#: ../lib/main.php:1331
-msgid "Your PHP version is too old. You must have at least PHP 4.3.10"
+#: ../lib/main.php:1332
+msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
 #: ../lib/PageList.php:93
@@ -1551,7 +1551,7 @@
 msgid "Click to de-/select all pages"
 msgstr "點擊以取消選擇或選擇所有頁面"
 
-#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:187
+#: ../lib/PageList.php:350 ../lib/plugin/IncludePage.php:193
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... 頭 %d bytes"
@@ -1566,21 +1566,21 @@
 msgid "%s not found"
 msgstr "%s 找不到."
 
-#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:239
+#: ../lib/PageList.php:530 ../lib/plugin/WikiAdminSetAcl.php:242
 #: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "由 %s 繼承而來的頁面"
 
-#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:241
+#: ../lib/PageList.php:532 ../lib/plugin/WikiAdminSetAcl.php:244
 #: ../themes/default/templates/info.tmpl:75
 #: ../themes/MonoBook/templates/info.tmpl:89
 #, fuzzy
 msgid "individual page permission"
 msgstr "個別頁面權限"
 
-#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:243
+#: ../lib/PageList.php:534 ../lib/plugin/WikiAdminSetAcl.php:246
 #: ../themes/default/templates/info.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:91
 msgid "default page permission"
@@ -1591,17 +1591,17 @@
 msgstr "<沒有相符>"
 
 #: ../lib/PageList.php:1164 ../lib/plugin/FullTextSearch.php:86
-#: ../lib/plugin/WikiAdminSearchReplace.php:177
+#: ../lib/plugin/WikiAdminSearchReplace.php:178
 msgid "Content"
 msgstr "內容"
 
-#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:134
-#: ../lib/plugin/WikiAdminSetAcl.php:188
+#: ../lib/PageList.php:1176 ../lib/plugin/WikiAdminChmod.php:135
+#: ../lib/plugin/WikiAdminSetAcl.php:191
 msgid "Permission"
 msgstr "權限"
 
-#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:190
-#: ../lib/plugin/WikiAdminSetAcl.php:245
+#: ../lib/PageList.php:1178 ../lib/plugin/WikiAdminSetAcl.php:193
+#: ../lib/plugin/WikiAdminSetAcl.php:248
 msgid "ACL"
 msgstr "ACL"
 
@@ -1684,7 +1684,7 @@
 msgstr "標記"
 
 #: ../lib/PageList.php:1384 ../lib/PageList.php:1391 ../lib/PageList.php:1397
-#: ../lib/WikiDB/backend.php:530 ../lib/WikiDB/backend.php:536
+#: ../lib/WikiDB/backend.php:549 ../lib/WikiDB/backend.php:555
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
@@ -1755,7 +1755,7 @@
 msgstr ""
 
 #: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
-#: ../lib/plugin/WikiAdminSetAcl.php:247
+#: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "描述"
 
@@ -1783,12 +1783,14 @@
 msgid "WARNING: InterWikiMap page is unlocked, so not using those links."
 msgstr ""
 
-#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:832
+#: ../lib/PageType.php:259 ../lib/PageType.php:262 ../lib/stdlib.php:834
 #: ../themes/default/templates/navbar.tmpl:8
 #: ../themes/default/templates/navbar.tmpl:10
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:35
-#: ../themes/fusionforge/templates/actionbar.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:33
+#: ../themes/fusionforge/templates/actionbar.tmpl:44
+#: ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 #: ../themes/MonoBook/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
@@ -1828,7 +1830,7 @@
 msgid "Click to display all comments"
 msgstr "點擊以顯示"
 
-#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:465
+#: ../lib/plugin/AddComment.php:106 ../lib/plugin/CreateToc.php:492
 msgid "Click to display"
 msgstr "點擊以顯示"
 
@@ -1889,114 +1891,114 @@
 msgid "Authenticated users on this wiki (%d total):"
 msgstr "在此 wiki 上被確認的使用者 (共 %d):"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:162
-#: ../lib/plugin/AnalyseAccessLogSql.php:197
-msgid "0 - last minute"
-msgstr ""
-
 #: ../lib/plugin/AnalyseAccessLogSql.php:163
 #: ../lib/plugin/AnalyseAccessLogSql.php:198
-msgid "1 - 1 minute to 1 hour"
+msgid "0 - last minute"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:164
 #: ../lib/plugin/AnalyseAccessLogSql.php:199
-msgid "2 - 1 hour to 1 day"
+msgid "1 - 1 minute to 1 hour"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:165
 #: ../lib/plugin/AnalyseAccessLogSql.php:200
-msgid "3 - 1 day to 1 week"
+msgid "2 - 1 hour to 1 day"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:166
 #: ../lib/plugin/AnalyseAccessLogSql.php:201
-msgid "4 - 1 week to 1 month"
+msgid "3 - 1 day to 1 week"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:167
 #: ../lib/plugin/AnalyseAccessLogSql.php:202
-msgid "5 - 1 month to 1 year"
+msgid "4 - 1 week to 1 month"
 msgstr ""
 
 #: ../lib/plugin/AnalyseAccessLogSql.php:168
 #: ../lib/plugin/AnalyseAccessLogSql.php:203
+msgid "5 - 1 month to 1 year"
+msgstr ""
+
+#: ../lib/plugin/AnalyseAccessLogSql.php:169
+#: ../lib/plugin/AnalyseAccessLogSql.php:204
 msgid "6 - more than 1 year"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:222
+#: ../lib/plugin/AnalyseAccessLogSql.php:223
 msgid "referring_urls"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:223
+#: ../lib/plugin/AnalyseAccessLogSql.php:224
 msgid "external_referers"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:224
+#: ../lib/plugin/AnalyseAccessLogSql.php:225
 msgid "referring_domains"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:225
+#: ../lib/plugin/AnalyseAccessLogSql.php:226
 msgid "remote_hosts"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:226
+#: ../lib/plugin/AnalyseAccessLogSql.php:227
 #, fuzzy
 msgid "users"
 msgstr "AllUsers"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:227
+#: ../lib/plugin/AnalyseAccessLogSql.php:228
 msgid "host_users"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:228
+#: ../lib/plugin/AnalyseAccessLogSql.php:229
 msgid "search_bots"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:229
+#: ../lib/plugin/AnalyseAccessLogSql.php:230
 msgid "search_bots_hits"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:231
+#: ../lib/plugin/AnalyseAccessLogSql.php:232
 #, fuzzy
 msgid "minutes"
 msgstr "%d 分鐘"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:232
+#: ../lib/plugin/AnalyseAccessLogSql.php:233
 msgid "hours"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:233 ../lib/plugin/VisualWiki.php:498
+#: ../lib/plugin/AnalyseAccessLogSql.php:234 ../lib/plugin/VisualWiki.php:498
 msgid "days"
 msgstr "天"
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:234
+#: ../lib/plugin/AnalyseAccessLogSql.php:235
 msgid "weeks"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:252
+#: ../lib/plugin/AnalyseAccessLogSql.php:253
 msgid "AnalyseAccessLogSql"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:256
+#: ../lib/plugin/AnalyseAccessLogSql.php:257
 #, fuzzy
 msgid "Show summary information from the access log table."
 msgstr "顯示目前使用者 session 的摘要資訊."
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:264
+#: ../lib/plugin/AnalyseAccessLogSql.php:265
 msgid "The requested information is available only to Administrators."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:267
+#: ../lib/plugin/AnalyseAccessLogSql.php:268
 msgid "The SQL_ACCESS_LOG is not enabled."
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:278
+#: ../lib/plugin/AnalyseAccessLogSql.php:279
 #, php-format
 msgid "Unrecognised parameter 'mode=%s'"
 msgstr ""
 
-#: ../lib/plugin/AnalyseAccessLogSql.php:297
+#: ../lib/plugin/AnalyseAccessLogSql.php:298
 #: ../lib/plugin/_BackendInfo.php:119 ../lib/plugin/SemanticSearch.php:411
 #: ../lib/plugin/WatchPage.php:57
 msgid "<empty>"
@@ -2026,12 +2028,12 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#: ../lib/plugin/AppendText.php:125
+#: ../lib/plugin/AppendText.php:126
 #, fuzzy
 msgid "Page successfully updated."
 msgstr "檔案已經成功地上傳."
 
-#: ../lib/plugin/AppendText.php:142
+#: ../lib/plugin/AppendText.php:143
 #, php-format
 msgid "Go to %s."
 msgstr ""
@@ -2136,7 +2138,7 @@
 msgid "History of all major and minor modifications for any page edited by %s."
 msgstr "被 %s 修改的所有頁面的主要與次要變更歷程."
 
-#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:60
+#: ../lib/plugin/_BackendInfo.php:30 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:31
 #: ../themes/default/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/info.tmpl:193
@@ -2273,14 +2275,14 @@
 msgstr "編輯 %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1540 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
-#: ../themes/Crao/templates/head.tmpl:90
+#: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
-#: ../themes/default/templates/head.tmpl:98
+#: ../themes/default/templates/head.tmpl:91
 #: ../themes/default/templates/homepage.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:32
-#: ../themes/wikilens/templates/head.tmpl:89
+#: ../themes/wikilens/templates/head.tmpl:82
 #: ../themes/wikilens/templates/navbar.tmpl:25
 #: ../themes/Wordpress/templates/actionbar.tmpl:34
 msgid "Calendar"
@@ -2332,9 +2334,8 @@
 msgid "Automatically create a Bibtex file from linked pages"
 msgstr ""
 
-#: ../lib/plugin/CreateBib.php:117 ../lib/plugin/CreateToc.php:375
-#: ../lib/plugin/IncludePage.php:77 ../lib/plugin/RateIt.php:212
-#: ../lib/plugin/Template.php:107
+#: ../lib/plugin/CreateBib.php:111 ../lib/plugin/IncludePage.php:78
+#: ../lib/plugin/RateIt.php:212
 msgid "no page specified"
 msgstr "沒有指定頁面"
 
@@ -2383,25 +2384,49 @@
 msgid "Created by CreatePage"
 msgstr "由 CreatePage 建立"
 
-#: ../lib/plugin/CreateToc.php:48
+#: ../lib/plugin/CreateToc.php:46
 msgid "CreateToc"
 msgstr "CreateToc"
 
-#: ../lib/plugin/CreateToc.php:52
+#: ../lib/plugin/CreateToc.php:50
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Diff.php:86
+#: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
+#, fuzzy
+msgid "No page specified."
+msgstr "沒有指定頁面"
+
+#: ../lib/plugin/CreateToc.php:389
+msgid "Error: firstlevelstyle must be 'number', 'letter' or 'roman'"
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:394 ../lib/plugin/Template.php:129
+#, fuzzy, php-format
+msgid "Page '%s' does not exist."
+msgstr "群組 %s 不存在"
+
+#: ../lib/plugin/CreateToc.php:399 ../lib/plugin/Diff.php:86
 #: ../lib/plugin/PageDump.php:85
 #, php-format
 msgid "Illegal access to page %s: no read access"
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:396
-msgid "CreateToc disabled for old markup"
+#: ../lib/plugin/CreateToc.php:407
+msgid "Error: version must be a positive integer."
 msgstr ""
 
-#: ../lib/plugin/CreateToc.php:458
+#: ../lib/plugin/CreateToc.php:411 ../lib/plugin/IncludePage.php:107
+#: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:145
+#, fuzzy, php-format
+msgid "%s: no such revision %d."
+msgstr "%s(%d): 沒有這個修訂."
+
+#: ../lib/plugin/CreateToc.php:422
+msgid "CreateToc disabled for old markup."
+msgstr ""
+
+#: ../lib/plugin/CreateToc.php:485
 #, fuzzy
 msgid "Click to display to TOC"
 msgstr "點擊以顯示"
@@ -2420,8 +2445,8 @@
 msgid "DeadEndPages"
 msgstr "WantedPages"
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1041
-#: ../themes/blog/themeinfo.php:68
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "差異"
 
@@ -2429,6 +2454,29 @@
 msgid "Display differences between revisions"
 msgstr "顯示修訂間的差異"
 
+#: ../lib/plugin/Diff.php:182
+#, fuzzy
+msgid "Content of versions "
+msgstr "版本 %d"
+
+#: ../lib/plugin/Diff.php:183
+msgid " and "
+msgstr ""
+
+#: ../lib/plugin/Diff.php:183
+#, fuzzy
+msgid " is identical."
+msgstr "版本相同"
+
+#: ../lib/plugin/Diff.php:188
+#, fuzzy
+msgid "Version "
+msgstr "版本"
+
+#: ../lib/plugin/Diff.php:189
+msgid " was created because: "
+msgstr ""
+
 #: ../lib/plugin/DynamicIncludePage.php:35
 #, fuzzy
 msgid "DynamicIncludePage"
@@ -2454,7 +2502,7 @@
 msgid "Click to hide/show"
 msgstr "點擊進行排序"
 
-#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:61
+#: ../lib/plugin/EditMetaData.php:48 ../lib/plugin/_WikiTranslation.php:54
 msgid "EditMetaData"
 msgstr "編輯中繼資料"
 
@@ -2515,7 +2563,7 @@
 
 #: ../lib/plugin/FileInfo.php:61 ../lib/plugin/FileInfo.php:63
 #: ../lib/plugin/PageGroup.php:98 ../lib/plugin/SyncWiki.php:70
-#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:189
+#: ../lib/plugin/WikiFormRich.php:173 ../lib/plugin/WikiFormRich.php:190
 #, php-format
 msgid "A required argument '%s' is missing."
 msgstr "缺少引數 '%s'."
@@ -2581,22 +2629,34 @@
 "Displays a url in a seperate frame inside our body. Only one frame allowed."
 msgstr "在內容的分離框架中顯示 url. 只能放一個框架."
 
-#: ../lib/plugin/FrameInclude.php:88 ../lib/plugin/Template.php:122
-#, php-format
-msgid "recursive inclusion of page %s"
+#: ../lib/plugin/FrameInclude.php:81 ../lib/plugin/RandomPage.php:59
+#: ../lib/plugin/RedirectTo.php:89 ../lib/plugin/SyncWiki.php:73
+#: ../lib/plugin/WikiAdminChown.php:107 ../lib/plugin/WikiAdminMarkup.php:110
+#: ../lib/plugin/WikiAdminPurge.php:93 ../lib/plugin/WikiAdminRemove.php:137
+#: ../lib/plugin/WikiAdminRename.php:143
+#: ../lib/plugin/WikiAdminSearchReplace.php:121
+#: ../lib/plugin/WikiAdminSetAcl.php:141
+#: ../lib/plugin/WikiAdminSetExternal.php:96
+#: ../lib/plugin/WikiAdminUtils.php:64
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
+#: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
 msgstr "遞迴含括頁面 %s"
 
-#: ../lib/plugin/FrameInclude.php:94
+#: ../lib/plugin/FrameInclude.php:95
 #, php-format
 msgid "%s or %s parameter missing"
 msgstr "%s 或 %s 參數遺漏"
 
-#: ../lib/plugin/FrameInclude.php:100 ../lib/plugin/Transclude.php:88
-#, php-format
-msgid "recursive inclusion of url %s"
+#: ../lib/plugin/FrameInclude.php:101 ../lib/plugin/Transclude.php:88
+#, fuzzy, php-format
+msgid "Recursive inclusion of url %s"
 msgstr "遞迴含括 url %s"
 
-#: ../lib/plugin/FrameInclude.php:107 ../lib/plugin/SemanticSearch.php:287
+#: ../lib/plugin/FrameInclude.php:108 ../lib/plugin/SemanticSearch.php:287
 #: ../lib/plugin/TeX2png.php:228 ../lib/plugin/text2png.php:81
 #: ../lib/plugin/text2png.php:167
 #, php-format
@@ -2721,7 +2781,7 @@
 msgid "GraphViz image or imagemap creation of directed graphs"
 msgstr ""
 
-#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:313
+#: ../lib/plugin/GraphViz.php:206 ../lib/plugin/_WikiTranslation.php:296
 #, php-format
 msgid "%s is empty"
 msgstr "%s 是空白"
@@ -2788,36 +2848,39 @@
 msgid "Include text from another wiki page."
 msgstr "從其他 wiki 頁面含括文字."
 
-#: ../lib/plugin/IncludePage.php:84 ../lib/plugin/IncludePage.php:124
-#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:163
+#: ../lib/plugin/IncludePage.php:85 ../lib/plugin/IncludePage.php:128
+#: ../lib/plugin/ListSubpages.php:94 ../lib/plugin/Template.php:167
 #: ../lib/plugin/UnfoldSubpages.php:100 ../lib/plugin/UnfoldSubpages.php:130
-#, php-format
-msgid "recursive inclusion of page %s ignored"
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s ignored"
 msgstr "忽略頁面 %s 的遞迴含括"
 
-#: ../lib/plugin/IncludePage.php:90 ../lib/plugin/Template.php:128
+#: ../lib/plugin/IncludePage.php:91
 #, fuzzy, php-format
 msgid "Page '%s' does not exist"
 msgstr "群組 %s 不存在"
 
-#: ../lib/plugin/IncludePage.php:95 ../lib/plugin/Template.php:133
-#: ../lib/plugin/UnfoldSubpages.php:107 ../lib/plugin/UnfoldSubpages.php:138
+#: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
+#: ../lib/plugin/UnfoldSubpages.php:138
 #, fuzzy, php-format
 msgid "Illegal inclusion of page %s: no read access"
 msgstr "忽略頁面 %s 的遞迴含括"
 
-#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/PageGroup.php:124
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "%s(%d): no such revision"
-msgstr "%s(%d): 沒有這個修訂."
+#: ../lib/plugin/IncludePage.php:103 ../lib/plugin/Template.php:141
+msgid "Error: rev must be a positive integer."
+msgstr ""
 
-#: ../lib/plugin/IncludePage.php:153
+#: ../lib/plugin/IncludePage.php:157
+#, fuzzy, php-format
+msgid "Included from %s (revision %d)"
+msgstr "從 %s 含括進來"
+
+#: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
 msgstr "從 %s 含括進來"
 
-#: ../lib/plugin/IncludePage.php:178
+#: ../lib/plugin/IncludePage.php:184
 #, php-format
 msgid " ... first %d lines"
 msgstr " ... 頭 %d 列"
@@ -2870,6 +2933,7 @@
 #: ../themes/default/templates/search.tmpl:6
 #: ../themes/default/templates/search.tmpl:15
 #: ../themes/default/templates/search.tmpl:27
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:27
 #: ../themes/Sidebar/templates/navbar.tmpl:33
 #: ../themes/Sidebar/templates/search.tmpl:9
@@ -2911,6 +2975,8 @@
 
 #: ../lib/plugin/LikePages.php:30 ../themes/Crao/templates/navbar.tmpl:17
 #: ../themes/default/templates/navbar.tmpl:20
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/MonoBook/templates/navbar.tmpl:19
 #: ../themes/Portland/templates/navbar.tmpl:8
 #: ../themes/smaller/templates/navbar.tmpl:16
 #: ../themes/wikilens/templates/navbar.tmpl:21
@@ -3206,7 +3272,8 @@
 msgstr "未找到頁面 %s."
 
 #: ../lib/plugin/PageDump.php:149
-msgid "Download for CVS"
+#, fuzzy
+msgid "Download for Subversion"
 msgstr "給 CVS 的下載"
 
 #: ../lib/plugin/PageDump.php:154
@@ -3264,9 +3331,10 @@
 msgstr "預覽的自動換行無法處理巢狀標記或縮排列出."
 
 #: ../lib/plugin/PageDump.php:215
+#, fuzzy
 msgid ""
 "PhpWiki developers should manually inspect the downloaded file for nested "
-"markup before rewrapping with emacs and checking into CVS."
+"markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 "在以 emacs 重包裝與簽入之前,PhpWiki 開發者應會因為巢狀標記而手動審閱已下載的"
 "檔案."
@@ -3291,12 +3359,13 @@
 msgid "Contents"
 msgstr "內容"
 
-#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2171
+#: ../lib/plugin/PageGroup.php:87 ../lib/stdlib.php:2175
 #, php-format
 msgid "<%s: no such section>"
 msgstr "<%s: 沒有此部份>"
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
 msgid "Next"
 msgstr "下一個"
 
@@ -3635,16 +3704,15 @@
 msgstr ""
 
 #: ../lib/plugin/PopularTags.php:33
-#, fuzzy
 msgid "PopularTags"
-msgstr "MostPopular"
+msgstr ""
 
 #: ../lib/plugin/PopularTags.php:37
 #, fuzzy
 msgid "List the most popular tags."
 msgstr "列出最受歡迎的頁面."
 
-#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:56
+#: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr "CategoryCategory"
 
@@ -3695,7 +3763,7 @@
 
 #: ../lib/plugin/_PreferencesInfo.php:30
 #: ../themes/default/templates/userprefs.tmpl:13
-#: ../themes/fusionforge/templates/userprefs.tmpl:13
+#: ../themes/fusionforge/templates/userprefs.tmpl:11
 msgid "PreferencesInfo"
 msgstr "PreferencesInfo"
 
@@ -3730,8 +3798,8 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
-#: ../themes/fusionforge/templates/navbar.tmpl:15
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:83
+#: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
 msgstr "RandomPage"
@@ -4115,11 +4183,11 @@
 msgid "Recursive redirect to self: '%s'"
 msgstr "遞迴重導向到自己: '%s'"
 
-#: ../lib/plugin/RedirectTo.php:94
+#: ../lib/plugin/RedirectTo.php:95
 msgid "Double redirect not allowed."
 msgstr "雙重重導向是不允許的."
 
-#: ../lib/plugin/RedirectTo.php:98
+#: ../lib/plugin/RedirectTo.php:99
 msgid "Viewing redirecting page."
 msgstr "查看重導向的頁面."
 
@@ -4406,77 +4474,77 @@
 msgid "Synchronize pages with external PhpWiki"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:108
+#: ../lib/plugin/SyncWiki.php:110
 #, fuzzy
 msgid "Syncing this PhpWiki"
 msgstr "升級 PhpWiki"
 
-#: ../lib/plugin/SyncWiki.php:109
+#: ../lib/plugin/SyncWiki.php:111
 msgid "Download all externally changed sources."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:111
+#: ../lib/plugin/SyncWiki.php:113
 #, php-format
 msgid "Retrieving from external url %s wiki.getRecentChanges(%s)..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:118 ../lib/plugin/WhoIsOnline.php:122
+#: ../lib/plugin/SyncWiki.php:120 ../lib/plugin/WhoIsOnline.php:122
 msgid "<unknown>"
 msgstr "<未知的>"
 
-#: ../lib/plugin/SyncWiki.php:133 ../lib/plugin/SyncWiki.php:186
-#: ../lib/plugin/SyncWiki.php:221
+#: ../lib/plugin/SyncWiki.php:135 ../lib/plugin/SyncWiki.php:188
+#: ../lib/plugin/SyncWiki.php:223
 msgid " skipped"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:155
+#: ../lib/plugin/SyncWiki.php:157
 msgid "same date"
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:178
+#: ../lib/plugin/SyncWiki.php:180
 msgid "Now upload all locally newer pages."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:180
+#: ../lib/plugin/SyncWiki.php:182
 #, php-format
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:207
+#: ../lib/plugin/SyncWiki.php:209
 #, fuzzy
 msgid "Now upload all locally newer uploads."
 msgstr "沒有要上傳的檔案?"
 
-#: ../lib/plugin/SyncWiki.php:209
+#: ../lib/plugin/SyncWiki.php:211
 #, php-format
 msgid "Checking all local uploads newer than %s..."
 msgstr ""
 
-#: ../lib/plugin/SyncWiki.php:272
+#: ../lib/plugin/SyncWiki.php:274
 #, fuzzy, php-format
 msgid "%s force"
 msgstr "共 %s 字"
 
-#: ../lib/plugin/SyncWiki.php:276
+#: ../lib/plugin/SyncWiki.php:278
 #, fuzzy, php-format
 msgid "Postponed %s for %s."
 msgstr "遺失了 %s 的 %s"
 
-#: ../lib/plugin/SyncWiki.php:283 ../lib/plugin/SyncWiki.php:292
-#: ../lib/plugin/SyncWiki.php:307 ../lib/plugin/SyncWiki.php:316
-#: ../lib/plugin/SyncWiki.php:335
+#: ../lib/plugin/SyncWiki.php:285 ../lib/plugin/SyncWiki.php:294
+#: ../lib/plugin/SyncWiki.php:309 ../lib/plugin/SyncWiki.php:318
+#: ../lib/plugin/SyncWiki.php:337
 #, fuzzy
 msgid "skipped"
 msgstr "跳過"
 
-#: ../lib/plugin/SyncWiki.php:292 ../lib/plugin/SyncWiki.php:316
+#: ../lib/plugin/SyncWiki.php:294 ../lib/plugin/SyncWiki.php:318
 #, fuzzy
 msgid "same content"
 msgstr "下載頁面內容"
 
-#: ../lib/plugin/SyncWiki.php:299 ../lib/plugin/SyncWiki.php:325
-#: ../lib/plugin/SyncWiki.php:327 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/SyncWiki.php:350 ../lib/upgrade.php:197
+#: ../lib/plugin/SyncWiki.php:301 ../lib/plugin/SyncWiki.php:327
+#: ../lib/plugin/SyncWiki.php:329 ../lib/plugin/SyncWiki.php:350
+#: ../lib/plugin/SyncWiki.php:352 ../lib/upgrade.php:197
 #: ../lib/upgrade.php:538 ../lib/upgrade.php:576 ../lib/upgrade.php:1110
 msgid "FAILED"
 msgstr ""
@@ -4600,13 +4668,13 @@
 msgstr "%d 個頁面超過 %d 個擊閱數(>%d%%)."
 
 #: ../lib/plugin/SystemInfo.php:400
-#, php-format
-msgid "Application size: %d Kb"
+#, fuzzy, php-format
+msgid "Application size: %d KiB"
 msgstr "應用程式大小: %d Kb"
 
 #: ../lib/plugin/SystemInfo.php:402
-#, php-format
-msgid "Pagedata size: %d Kb"
+#, fuzzy, php-format
+msgid "Pagedata size: %d KiB"
 msgstr "頁面資料大小: %d Kb"
 
 #: ../lib/plugin/SystemInfo.php:420
@@ -4713,6 +4781,11 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#: ../lib/plugin/Template.php:134
+#, fuzzy, php-format
+msgid "Illegal inclusion of page %s: no read access."
+msgstr "忽略頁面 %s 的遞迴含括"
+
 #: ../lib/plugin/TeX2png.php:45
 msgid "TeX2png"
 msgstr ""
@@ -4801,7 +4874,7 @@
 msgid "Transcluded from %s"
 msgstr "Transcluded 從 %s"
 
-#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:116
+#: ../lib/plugin/TranslateText.php:44 ../lib/plugin/_WikiTranslation.php:105
 msgid "TranslateText"
 msgstr "TranslateText"
 
@@ -4888,82 +4961,82 @@
 msgid "Upload files to the local InterWiki Upload:<filename>"
 msgstr "上傳檔案到本地 InterWiki. Upload:<filename>"
 
-#: ../lib/plugin/UpLoad.php:179
+#: ../lib/plugin/UpLoad.php:178
 #, fuzzy
 msgid "You cannot upload files."
 msgstr "錯誤: 無法開啟上傳日誌檔案"
 
-#: ../lib/plugin/UpLoad.php:181
+#: ../lib/plugin/UpLoad.php:180
 msgid "Check you are logged in."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:182
+#: ../lib/plugin/UpLoad.php:181
 msgid "Check you are in the right project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:183
+#: ../lib/plugin/UpLoad.php:182
 msgid "Check you are a member of the current project."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:188
+#: ../lib/plugin/UpLoad.php:187
 msgid "ACCESS DENIED: You must log in to upload files."
 msgstr "拒絕存取: 請先登入才能上傳檔案"
 
-#: ../lib/plugin/UpLoad.php:213
+#: ../lib/plugin/UpLoad.php:212
 #, fuzzy, php-format
 msgid "ERROR uploading '%s'"
 msgstr "載入 '%s'"
 
-#: ../lib/plugin/UpLoad.php:218
+#: ../lib/plugin/UpLoad.php:217
 #, fuzzy, php-format
 msgid "Files with extension %s are not allowed."
 msgstr "副檔名 %s 不被允許"
 
-#: ../lib/plugin/UpLoad.php:226
+#: ../lib/plugin/UpLoad.php:225
 #, fuzzy, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr "副檔名 %s 不被允許"
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:236
+#: ../lib/plugin/UpLoad.php:235
 #, fuzzy, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr "已經有個名為 %s 的檔案存在"
 
-#: ../lib/plugin/UpLoad.php:241
+#: ../lib/plugin/UpLoad.php:240
 #, fuzzy
 msgid "Sorry but this file is too big."
 msgstr "抱歉,因為檔案太大了."
 
-#: ../lib/plugin/UpLoad.php:250
+#: ../lib/plugin/UpLoad.php:249
 msgid "File successfully uploaded."
 msgstr "檔案已經成功地上傳."
 
-#: ../lib/plugin/UpLoad.php:267
+#: ../lib/plugin/UpLoad.php:266
 #, php-format
 msgid "uploaded %s"
 msgstr "已上傳 %s"
 
-#: ../lib/plugin/UpLoad.php:273
+#: ../lib/plugin/UpLoad.php:272
 #, fuzzy
 msgid "Uploading failed."
 msgstr "上傳失敗:"
 
-#: ../lib/plugin/UpLoad.php:277
+#: ../lib/plugin/UpLoad.php:276
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:291
+#: ../lib/plugin/UpLoad.php:290
 #, fuzzy
 msgid "The upload logfile exists but is not writable."
 msgstr "錯誤: 上傳日誌無法寫入"
 
-#: ../lib/plugin/UpLoad.php:294
+#: ../lib/plugin/UpLoad.php:293
 #, fuzzy
 msgid "Can't open the upload logfile."
 msgstr "錯誤: 無法開啟上傳日誌檔案"
@@ -5110,7 +5183,6 @@
 msgstr "列出還未存在的頁面名稱."
 
 #: ../lib/plugin/WantedPagesOld.php:39 ../lib/plugin/WantedPages.php:51
-#: ../lib/plugin/_WikiTranslation.php:84 ../lib/plugin/_WikiTranslation.php:98
 msgid "PgsrcTranslation"
 msgstr "PgsrcTranslation"
 
@@ -5149,6 +5221,9 @@
 msgstr "在此 wiki 所需要的頁面 (共 %d):"
 
 #: ../lib/plugin/WatchPage.php:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#: ../themes/MonoBook/templates/actionbar.tmpl:57
+#: ../themes/Sidebar/templates/actionbar.tmpl:30
 #, fuzzy
 msgid "WatchPage"
 msgstr "寬度"
@@ -5179,11 +5254,11 @@
 msgid "The page %s is already watched!"
 msgstr "此頁面已經存在"
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1040
-#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:67
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
 #: ../themes/Sidebar/templates/actionbar.tmpl:20
@@ -5191,6 +5266,12 @@
 msgid "Edit"
 msgstr "編輯"
 
+#: ../lib/plugin/WatchPage.php:92
+#: ../themes/fusionforge/templates/actionbar.tmpl:132
+#, fuzzy
+msgid "Watch Page"
+msgstr "寬度"
+
 #: ../lib/plugin/WatchPage.php:110
 #, fuzzy
 msgid "You must sign in to watch pages."
@@ -5255,43 +5336,47 @@
 msgstr "錯誤的 chmod 字串"
 
 #: ../lib/plugin/WikiAdminChmod.php:84 ../lib/plugin/WikiAdminSetAcl.php:129
-#, php-format
-msgid "%s pages have been changed."
+#, fuzzy, php-format
+msgid "%d pages have been changed."
 msgstr "%s 頁面已經變更."
 
-#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
+#: ../lib/plugin/WikiAdminMarkup.php:102
+#: ../lib/plugin/WikiAdminSearchReplace.php:113
+#: ../lib/plugin/WikiAdminSetAcl.php:133
+#: ../lib/plugin/WikiAdminSetExternal.php:88
 msgid "No pages changed."
 msgstr "沒有頁面被變更."
 
-#: ../lib/plugin/WikiAdminChmod.php:144
+#: ../lib/plugin/WikiAdminChmod.php:145
 msgid "Are you sure you want to permanently change the selected files?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#: ../lib/plugin/WikiAdminChmod.php:147
+#: ../lib/plugin/WikiAdminChmod.php:148
 msgid "Chmod"
 msgstr "Chmod"
 
-#: ../lib/plugin/WikiAdminChmod.php:149
+#: ../lib/plugin/WikiAdminChmod.php:150
 msgid "Select the pages to change:"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminChmod.php:172
+#: ../lib/plugin/WikiAdminChmod.php:173
 msgid "This plugin is currently under development and does not work!"
 msgstr "此 plugin 正在開發還不能運作!"
 
-#: ../lib/plugin/WikiAdminChmod.php:173
+#: ../lib/plugin/WikiAdminChmod.php:174
 msgid "Chmod to permission:"
 msgstr "改變權限為:"
 
-#: ../lib/plugin/WikiAdminChmod.php:176
+#: ../lib/plugin/WikiAdminChmod.php:177
 msgid "(ugo : rwx)"
 msgstr "(ugo : rwx)"
 
-#: ../lib/plugin/WikiAdminChmod.php:183 ../lib/plugin/WikiAdminSetAcl.php:270
+#: ../lib/plugin/WikiAdminChmod.php:184 ../lib/plugin/WikiAdminSetAcl.php:273
 msgid "Propagate new permissions to all subpages?"
 msgstr "要傳播新的權限到所有子頁面?   "
 
-#: ../lib/plugin/WikiAdminChmod.php:185 ../lib/plugin/WikiAdminSetAcl.php:272
+#: ../lib/plugin/WikiAdminChmod.php:186 ../lib/plugin/WikiAdminSetAcl.php:275
 msgid "(disable individual page permissions, enable inheritance)?"
 msgstr "(禁制個別網頁的權限,使用繼承)?"
 
@@ -5323,44 +5408,45 @@
 msgid "Could not change owner of page '%s' to '%s'."
 msgstr "無法為頁面 '%s' 變更權限為 '%s'."
 
+#: ../lib/plugin/WikiAdminChown.php:91 ../lib/plugin/WikiAdminMarkup.php:94
+#: ../lib/plugin/WikiAdminSearchReplace.php:106
+#: ../lib/plugin/WikiAdminSetExternal.php:80
+#, fuzzy
+msgid "One page has been changed:"
+msgstr "%s pages 已經永久更名了."
+
 #: ../lib/plugin/WikiAdminChown.php:93 ../lib/plugin/WikiAdminMarkup.php:96
 #: ../lib/plugin/WikiAdminSearchReplace.php:108
 #: ../lib/plugin/WikiAdminSetExternal.php:82
 #, fuzzy, php-format
-msgid "%s pages have been permanently changed:"
-msgstr "%s pages 已經永久更名了."
+msgid "%d pages have been changed:"
+msgstr "%s 頁面已經變更."
 
-#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:90
+#: ../lib/plugin/WikiAdminChown.php:106 ../lib/plugin/_WikiTranslation.php:94
 #, fuzzy
 msgid "PhpWikiAdministration/Chown"
 msgstr "PhpWikiAdministration/Chmod"
 
-#: ../lib/plugin/WikiAdminChown.php:171
+#: ../lib/plugin/WikiAdminChown.php:173
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently change the owner of the selected pages?"
+msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#: ../lib/plugin/WikiAdminChown.php:175
+#: ../lib/plugin/WikiAdminChown.php:177
 #, fuzzy
 msgid "Change owner of selected pages"
 msgstr "移除選定頁面"
 
-#: ../lib/plugin/WikiAdminChown.php:176
+#: ../lib/plugin/WikiAdminChown.php:178
 #, fuzzy
 msgid "Select the pages to change the owner"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminChown.php:198
+#: ../lib/plugin/WikiAdminChown.php:200
 #, fuzzy
-msgid "Change owner"
+msgid "Change owner to: "
 msgstr "變更國家"
 
-#: ../lib/plugin/WikiAdminChown.php:199 ../lib/plugin/WikiAdminMarkup.php:191
-#: ../lib/plugin/WikiAdminRename.php:270
-msgid "to"
-msgstr "到"
-
 #: ../lib/plugin/WikiAdminMarkup.php:36
 #, fuzzy
 msgid "WikiAdminMarkup"
@@ -5391,26 +5477,24 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr "PhpWikiAdministration"
 
-#: ../lib/plugin/WikiAdminMarkup.php:163
+#: ../lib/plugin/WikiAdminMarkup.php:165
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently change the markup type of the selected "
-"files?"
+msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#: ../lib/plugin/WikiAdminMarkup.php:167
+#: ../lib/plugin/WikiAdminMarkup.php:169
 #, fuzzy
 msgid "Change markup type"
 msgstr "變更國家"
 
-#: ../lib/plugin/WikiAdminMarkup.php:168
+#: ../lib/plugin/WikiAdminMarkup.php:170
 #, fuzzy
 msgid "Select the pages to change the markup type"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminMarkup.php:190
+#: ../lib/plugin/WikiAdminMarkup.php:192
 #, fuzzy
-msgid "Change markup"
+msgid "Change markup to: "
 msgstr "改變密碼"
 
 #: ../lib/plugin/WikiAdminPurge.php:34
@@ -5433,27 +5517,37 @@
 msgid "Didn't purge page '%s'. Access denied."
 msgstr "成功地移除頁面 '%s'."
 
+#: ../lib/plugin/WikiAdminPurge.php:77
+#, fuzzy
+msgid "One page has been permanently purged:"
+msgstr "%s pages 已經永久更名了."
+
 #: ../lib/plugin/WikiAdminPurge.php:79
 #, fuzzy, php-format
-msgid "%s pages have been permanently purged:"
+msgid "%d pages have been permanently purged:"
 msgstr "%s pages 已經永久更名了."
 
+#: ../lib/plugin/WikiAdminPurge.php:85
+#, fuzzy
+msgid "No pages purged."
+msgstr "沒有頁面被變更."
+
 #: ../lib/plugin/WikiAdminPurge.php:92
 #, fuzzy
 msgid "PhpWikiAdministration/Purge"
 msgstr "PhpWikiAdministration"
 
-#: ../lib/plugin/WikiAdminPurge.php:144
+#: ../lib/plugin/WikiAdminPurge.php:146
 #, fuzzy
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#: ../lib/plugin/WikiAdminPurge.php:147
+#: ../lib/plugin/WikiAdminPurge.php:149
 #, fuzzy
 msgid "Permanently purge selected pages"
 msgstr "永久移除選定的頁面."
 
-#: ../lib/plugin/WikiAdminPurge.php:148
+#: ../lib/plugin/WikiAdminPurge.php:150
 #, fuzzy
 msgid "Select the files to purge"
 msgstr "選擇頁面以進行更名:"
@@ -5476,39 +5570,50 @@
 msgid "Didn't remove page '%s'. Access denied."
 msgstr "成功地移除頁面 '%s'."
 
+#: ../lib/plugin/WikiAdminRemove.php:121
+#, fuzzy
+msgid "One page has been removed:"
+msgstr "%s pages 已經永久更名了."
+
 #: ../lib/plugin/WikiAdminRemove.php:123
 #, fuzzy, php-format
-msgid "%s pages have been permanently removed:"
-msgstr "%s pages 已經永久更名了."
+msgid "%d pages have been removed:"
+msgstr "%s 頁面已經變更."
 
-#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:91
+#: ../lib/plugin/WikiAdminRemove.php:129
+#, fuzzy
+msgid "No pages removed."
+msgstr "沒有頁面被更名"
+
+#: ../lib/plugin/WikiAdminRemove.php:136 ../lib/plugin/_WikiTranslation.php:95
 msgid "PhpWikiAdministration/Remove"
 msgstr "PhpWikiAdministration/Remove"
 
-#: ../lib/plugin/WikiAdminRemove.php:190 ../lib/plugin/WikiAdminRemove.php:235
-#: ../themes/blog/themeinfo.php:73
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "移除"
 
-#: ../lib/plugin/WikiAdminRemove.php:197
-msgid "Are you sure you want to permanently remove the selected files?"
+#: ../lib/plugin/WikiAdminRemove.php:199
+#, fuzzy
+msgid "Are you sure you want to remove the selected files?"
 msgstr "你確定你想要永久移除選定的檔案?"
 
-#: ../lib/plugin/WikiAdminRemove.php:200
+#: ../lib/plugin/WikiAdminRemove.php:202
 msgid "Remove selected pages"
 msgstr "移除選定頁面"
 
-#: ../lib/plugin/WikiAdminRemove.php:201
+#: ../lib/plugin/WikiAdminRemove.php:203
 #, fuzzy
 msgid "Select the files to remove"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminRemove.php:204
+#: ../lib/plugin/WikiAdminRemove.php:206
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr "也列出過去 %s 天被刪除的頁面."
 
-#: ../lib/plugin/WikiAdminRemove.php:211
+#: ../lib/plugin/WikiAdminRemove.php:213
 #, fuzzy, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr "(列出過去 %s 天內已被刪除且檢查過的頁面.)"
@@ -5517,86 +5622,95 @@
 msgid "WikiAdminRename"
 msgstr "WikiAdminRename"
 
-#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:215
+#: ../lib/plugin/WikiAdminRename.php:40 ../lib/plugin/WikiAdminRename.php:217
 msgid "Rename selected pages"
 msgstr "更名已選定的頁面"
 
-#: ../lib/plugin/WikiAdminRename.php:79
+#: ../lib/plugin/WikiAdminRename.php:80
 #, fuzzy, php-format
 msgid "Page '%s' already exists. Ignored."
 msgstr "%s 已經存在"
 
-#: ../lib/plugin/WikiAdminRename.php:82
+#: ../lib/plugin/WikiAdminRename.php:83
 #, fuzzy, php-format
 msgid "Access denied to rename page '%s'."
 msgstr "為 page '%s' 設定 acl."
 
-#: ../lib/plugin/WikiAdminRename.php:91
+#: ../lib/plugin/WikiAdminRename.php:92
 #, fuzzy, php-format
 msgid "Renamed page from '%s' to '%s'"
 msgstr "更名頁面 '%s' 為 '%s'."
 
-#: ../lib/plugin/WikiAdminRename.php:100
+#: ../lib/plugin/WikiAdminRename.php:101
 #, fuzzy, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr "更名頁面 '%s' 為 '%s'."
 
-#: ../lib/plugin/WikiAdminRename.php:106
+#: ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page '%s' to '%s'."
 msgstr "更名頁面 '%s' 為 '%s'."
 
-#: ../lib/plugin/WikiAdminRename.php:110 ../lib/plugin/WikiAdminRename.php:114
+#: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr "無法更名頁面 '%s' 為 '%s'."
 
-#: ../lib/plugin/WikiAdminRename.php:126
-#, fuzzy, php-format
-msgid "%s pages have been permanently renamed:"
+#: ../lib/plugin/WikiAdminRename.php:124
+#, fuzzy
+msgid "One page has been renamed:"
 msgstr "%s pages 已經永久更名了."
 
-#: ../lib/plugin/WikiAdminRename.php:132
+#: ../lib/plugin/WikiAdminRename.php:127
+#, fuzzy, php-format
+msgid "%d pages have been renamed:"
+msgstr "%s 頁面已經變更."
+
+#: ../lib/plugin/WikiAdminRename.php:133
 #, fuzzy
 msgid "No pages renamed."
 msgstr "沒有頁面被更名"
 
-#: ../lib/plugin/WikiAdminRename.php:200
+#: ../lib/plugin/WikiAdminRename.php:202
 msgid "Rename to"
 msgstr "更名為"
 
-#: ../lib/plugin/WikiAdminRename.php:209
+#: ../lib/plugin/WikiAdminRename.php:211
 #, fuzzy
-msgid "Are you sure you want to permanently rename the selected pages?"
+msgid "Are you sure you want to rename the selected pages?"
 msgstr "你確定你想要永久更名選定的檔案?"
 
-#: ../lib/plugin/WikiAdminRename.php:213
+#: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
 #, fuzzy
 msgid "Rename page"
 msgstr "移除頁面"
 
-#: ../lib/plugin/WikiAdminRename.php:223
+#: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminRename.php:266
+#: ../lib/plugin/WikiAdminRename.php:268
 msgid "from"
 msgstr "從"
 
-#: ../lib/plugin/WikiAdminRename.php:276
-#: ../lib/plugin/WikiAdminSearchReplace.php:239
+#: ../lib/plugin/WikiAdminRename.php:272
+msgid "to"
+msgstr "到"
+
+#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminSearchReplace.php:240
 msgid "Regex?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:278
+#: ../lib/plugin/WikiAdminRename.php:280
 msgid "Case insensitive?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:283
+#: ../lib/plugin/WikiAdminRename.php:285
 msgid "Change pagename in all linked pages also?"
 msgstr "也在所有連結到的頁面裡變更頁面名稱?"
 
-#: ../lib/plugin/WikiAdminRename.php:286
+#: ../lib/plugin/WikiAdminRename.php:288
 msgid "Create redirect from old to new name?"
 msgstr ""
 
@@ -5622,35 +5736,34 @@
 msgid "Replaced '%s' with '%s' in page '%s'."
 msgstr "取代 '%s' 以 '%s' 在頁面 '%s'."
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:184
+#: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Warning: The search string cannot be empty!"
 msgstr "警告: 搜尋字串不能是空白!"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:189
+#: ../lib/plugin/WikiAdminSearchReplace.php:190
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently replace text in the selected files?"
+msgid "Are you sure you want to replace text in the selected files?"
 msgstr "你確定你想要永久新增並取代選定檔案中的文字?"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:194
+#: ../lib/plugin/WikiAdminSearchReplace.php:195
 #, fuzzy
 msgid "Select the pages to search and replace"
 msgstr "選擇頁面以進行搜尋:"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:227
+#: ../lib/plugin/WikiAdminSearchReplace.php:228
 msgid "Replace all occurences of the given string in the content of all pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:230
+#: ../lib/plugin/WikiAdminSearchReplace.php:231
 #, fuzzy
 msgid "Replace"
 msgstr "取代:"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:234
+#: ../lib/plugin/WikiAdminSearchReplace.php:235
 msgid "by"
 msgstr "被"
 
-#: ../lib/plugin/WikiAdminSearchReplace.php:238
+#: ../lib/plugin/WikiAdminSearchReplace.php:239
 msgid "Case exact?"
 msgstr ""
 
@@ -5711,51 +5824,51 @@
 msgid "Invalid ACL"
 msgstr "錯誤的 acl"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:94
+#: ../lib/plugin/WikiAdminSetAcl.php:140 ../lib/plugin/_WikiTranslation.php:98
 #, fuzzy
 msgid "PhpWikiAdministration/SetAcl"
 msgstr "PhpWikiAdministration"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:198
+#: ../lib/plugin/WikiAdminSetAcl.php:201
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently change access rights to the selected "
 "files?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:201
+#: ../lib/plugin/WikiAdminSetAcl.php:204
 msgid "Change Access Rights"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:203
+#: ../lib/plugin/WikiAdminSetAcl.php:206
 #, fuzzy
 msgid "Select the pages where to change access rights"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:233
+#: ../lib/plugin/WikiAdminSetAcl.php:236
 #, fuzzy
 msgid "Selected Pages: "
 msgstr "選擇頁面"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:244
+#: ../lib/plugin/WikiAdminSetAcl.php:247
 #, fuzzy
 msgid "Type"
 msgstr "型態:"
 
-#: ../lib/plugin/WikiAdminSetAcl.php:248
+#: ../lib/plugin/WikiAdminSetAcl.php:251
 msgid ""
 "Selected Grant checkboxes allow access, unselected checkboxes deny access."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../lib/plugin/WikiAdminSetAcl.php:252
 msgid "To ignore delete the line."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:250
+#: ../lib/plugin/WikiAdminSetAcl.php:253
 msgid "To add check 'Add' near the dropdown list."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminSetAcl.php:273
+#: ../lib/plugin/WikiAdminSetAcl.php:276
 #, fuzzy
 msgid "(Currently not working)"
 msgstr "現在不建議使用!"
@@ -5780,12 +5893,12 @@
 msgid "PhpWikiAdministration/SetExternal"
 msgstr "PhpWikiAdministration"
 
-#: ../lib/plugin/WikiAdminSetExternal.php:125
+#: ../lib/plugin/WikiAdminSetExternal.php:127
 #, fuzzy
 msgid "Set pages to external"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminSetExternal.php:126
+#: ../lib/plugin/WikiAdminSetExternal.php:128
 #, fuzzy
 msgid "Select the pages to set as external"
 msgstr "選擇頁面以進行搜尋:"
@@ -5799,125 +5912,125 @@
 msgid "Miscellaneous utility functions for the Administrator."
 msgstr "給管理者使用的各種公用函數"
 
-#: ../lib/plugin/WikiAdminUtils.php:60
+#: ../lib/plugin/WikiAdminUtils.php:61
 #, php-format
 msgid "Bad action requested: %s"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:71
+#: ../lib/plugin/WikiAdminUtils.php:73
 msgid "You must be an administrator to use this plugin."
 msgstr "你必須是管理者才能使用此 plugin."
 
-#: ../lib/plugin/WikiAdminUtils.php:100
+#: ../lib/plugin/WikiAdminUtils.php:102
 #, fuzzy, php-format
 msgid "WikiAdminUtils %s returned:"
 msgstr "WikiAdminUtils 說:"
 
-#: ../lib/plugin/WikiAdminUtils.php:102
+#: ../lib/plugin/WikiAdminUtils.php:104
 #, fuzzy
 msgid "Back"
 msgstr "BackLinks"
 
-#: ../lib/plugin/WikiAdminUtils.php:107
+#: ../lib/plugin/WikiAdminUtils.php:109
 msgid "Purge Markup Cache"
 msgstr "清除標記快取"
 
-#: ../lib/plugin/WikiAdminUtils.php:108
+#: ../lib/plugin/WikiAdminUtils.php:110
 #, fuzzy
 msgid "Purge all Pages With Invalid Names"
 msgstr "用錯誤的名稱刪除頁面"
 
-#: ../lib/plugin/WikiAdminUtils.php:109
+#: ../lib/plugin/WikiAdminUtils.php:111
 msgid "Purge all empty, unreferenced Pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:110
+#: ../lib/plugin/WikiAdminUtils.php:112
 msgid "Access Restrictions"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:111 ../lib/WikiUserNew.php:1780
+#: ../lib/plugin/WikiAdminUtils.php:113 ../lib/WikiUserNew.php:1782
 msgid "Email Verification"
 msgstr "Email 驗證."
 
-#: ../lib/plugin/WikiAdminUtils.php:112
+#: ../lib/plugin/WikiAdminUtils.php:114
 msgid "Convert cached_html"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/plugin/WikiAdminUtils.php:115
 msgid "DB Check"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:114
+#: ../lib/plugin/WikiAdminUtils.php:116
 msgid "Db Rebuild"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:125
+#: ../lib/plugin/WikiAdminUtils.php:127
 msgid "Markup cache purged!"
 msgstr "標記快取已經清除!"
 
-#: ../lib/plugin/WikiAdminUtils.php:145
+#: ../lib/plugin/WikiAdminUtils.php:147
 #, fuzzy
 msgid "No pages with bad names had to be deleted."
 msgstr "找不到錯誤名稱的頁面."
 
-#: ../lib/plugin/WikiAdminUtils.php:147
-#, php-format
-msgid "Deleted %s pages with invalid names:"
+#: ../lib/plugin/WikiAdminUtils.php:149
+#, fuzzy, php-format
+msgid "Deleted %d pages with invalid names:"
 msgstr "刪除 %s 個錯誤名稱的頁面:"
 
-#: ../lib/plugin/WikiAdminUtils.php:168
+#: ../lib/plugin/WikiAdminUtils.php:170
 msgid "[purged]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:170
+#: ../lib/plugin/WikiAdminUtils.php:172
 msgid "[not purgable]"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:178
+#: ../lib/plugin/WikiAdminUtils.php:180
 #, fuzzy
 msgid "No empty, unreferenced pages were found."
 msgstr "找不到錯誤名稱的頁面."
 
-#: ../lib/plugin/WikiAdminUtils.php:180
-#, php-format
-msgid "Deleted %s unreferenced pages:"
-msgstr ""
+#: ../lib/plugin/WikiAdminUtils.php:182
+#, fuzzy, php-format
+msgid "Deleted %d unreferenced pages:"
+msgstr "找不到錯誤名稱的頁面."
 
-#: ../lib/plugin/WikiAdminUtils.php:183
+#: ../lib/plugin/WikiAdminUtils.php:185
 #, php-format
 msgid ""
 "The %d not-purgable pages/links are links in some page(s). You might want to "
 "edit them."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:198
+#: ../lib/plugin/WikiAdminUtils.php:200
 msgid "No old _cached_html pagedata found."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminUtils.php:200
+#: ../lib/plugin/WikiAdminUtils.php:202
 #, fuzzy, php-format
 msgid "Converted successfully %d pages"
 msgstr "檔案已經成功地上傳."
 
-#: ../lib/plugin/WikiAdminUtils.php:222
+#: ../lib/plugin/WikiAdminUtils.php:224
 msgid "Sorry. Access Restrictions not yet implemented"
 msgstr "抱歉. 存取限制尚未被實作."
 
-#: ../lib/plugin/WikiAdminUtils.php:230
+#: ../lib/plugin/WikiAdminUtils.php:232
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: ../lib/plugin/WikiAdminUtils.php:232
+#: ../lib/plugin/WikiAdminUtils.php:234
 msgid "Verification Status"
 msgstr "確認狀態"
 
-#: ../lib/plugin/WikiAdminUtils.php:233
+#: ../lib/plugin/WikiAdminUtils.php:235
 #, fuzzy
 msgid "Username"
 msgstr "更名"
 
-#: ../lib/plugin/WikiAdminUtils.php:288
+#: ../lib/plugin/WikiAdminUtils.php:290
 msgid "Change Verification Status"
 msgstr "改變確認狀態"
 
@@ -6028,321 +6141,241 @@
 msgstr "謝謝你的參與."
 
 #: ../lib/plugin/_WikiTranslation.php:47
-msgid "AddCommentPlugin"
-msgstr "AddCommentPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:48
-msgid "AddingPages"
-msgstr "AddingPages"
-
-#: ../lib/plugin/_WikiTranslation.php:49
 msgid "AllPagesCreatedByMe"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:50
+#: ../lib/plugin/_WikiTranslation.php:48
 msgid "AllPagesLastEditedByMe"
 msgstr ""
 
-#: ../lib/plugin/_WikiTranslation.php:51
+#: ../lib/plugin/_WikiTranslation.php:49
 #, fuzzy
 msgid "AllPagesOwnedByMe"
 msgstr "AllPages"
 
 #: ../lib/plugin/_WikiTranslation.php:52
-msgid "AuthorHistoryPlugin"
-msgstr "AuthorHistoryPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:54
-msgid "CalendarListPlugin"
-msgstr "CalendarListPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:55
-msgid "CalendarPlugin"
-msgstr "CalendarPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:57
 msgid "CategoryHomePages"
 msgstr "CategoryHomePages"
 
-#: ../lib/plugin/_WikiTranslation.php:58
-msgid "CommentPlugin"
-msgstr "CommentPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:59
-msgid "CreateTocPlugin"
-msgstr "CreateTocPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:62
-msgid "EditMetaDataPlugin"
-msgstr "EditMetaDataPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:63
-msgid "ExternalSearchPlugin"
-msgstr "ExternalSearchPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:64 ../themes/Crao/templates/head.tmpl:36
-#: ../themes/Crao/templates/head.tmpl:37
+#: ../lib/plugin/_WikiTranslation.php:55 ../themes/Crao/templates/head.tmpl:29
+#: ../themes/Crao/templates/head.tmpl:30
 #: ../themes/Crao/templates/navbar.tmpl:41
-#: ../themes/default/templates/head.tmpl:42
-#: ../themes/default/templates/head.tmpl:43
+#: ../themes/default/templates/head.tmpl:35
+#: ../themes/default/templates/head.tmpl:36
 #: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/navbar.tmpl:13
+#: ../themes/fusionforge/templates/navbar.tmpl:12
 #: ../themes/MonoBook/templates/navbar.tmpl:30
 #: ../themes/MonoBook/templates/navbar.tmpl:36
 #: ../themes/Portland/templates/navbar.tmpl:6
 #: ../themes/shamino_com/templates/top.tmpl:21
 #: ../themes/Sidebar/templates/search.tmpl:6
 #: ../themes/smaller/templates/navbar.tmpl:9
-#: ../themes/wikilens/templates/head.tmpl:34
-#: ../themes/wikilens/templates/head.tmpl:35
+#: ../themes/wikilens/templates/head.tmpl:27
+#: ../themes/wikilens/templates/head.tmpl:28
 #: ../themes/wikilens/templates/navbar.tmpl:19
 msgid "FindPage"
 msgstr "FindPage"
 
+#: ../lib/plugin/_WikiTranslation.php:56
+msgid "FullRecentChanges"
+msgstr "FullRecentChanges"
+
+#: ../lib/plugin/_WikiTranslation.php:57
+msgid "Help/AddingPages"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:58
+msgid "Help/AddCommentPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:59
+msgid "Help/AuthorHistoryPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:60
+msgid "Help/CalendarListPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:61
+msgid "Help/CalendarPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:62
+msgid "Help/CommentPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:63
+msgid "Help/CreateTocPlugin"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:64
+msgid "Help/EditMetaDataPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:65
-#, fuzzy
-msgid "FoafViewerPlugin"
-msgstr "CalendarPlugin"
+msgid "Help/ExternalSearchPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:66
-msgid "FrameIncludePlugin"
-msgstr "FrameIncludePlugin"
+msgid "Help/FoafViewerPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:67
-msgid "FullRecentChanges"
-msgstr "FullRecentChanges"
+msgid "Help/FrameIncludePlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:68
-msgid "HelloWorldPlugin"
-msgstr "HelloWorldPlugin"
+msgid "Help/HelloWorldPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:69
-msgid "HomePageAlias"
-msgstr "HomePageAlias"
+msgid "Help/IncludePagePlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:70
-msgid "IncludePagePlugin"
-msgstr "IncludePagePlugin"
+msgid "Help/LinkIcons"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:71
-msgid "InterWiki"
-msgstr "InterWiki"
+msgid "Help/MagicPhpWikiURLs"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:72
-msgid "LinkIcons"
-msgstr "LinkIcons"
+msgid "Help/MoreAboutMechanics"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:73
-msgid "MagicPhpWikiURLs"
-msgstr "MagicPhpWikiURLs"
+msgid "Help/OldStyleTablePlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:74
-msgid "MoreAboutMechanics"
-msgstr "MoreAboutMechanics"
+msgid "Help/PhotoAlbumPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:75
-msgid "NewMarkupTestPage"
-msgstr "NewMarkupTestPage"
+msgid "Help/PhpHighlightPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:76
-msgid "OldMarkupTestPage"
-msgstr "OldMarkupTestPage"
+msgid "Help/PhpWeatherPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:77
-msgid "OldStyleTablePlugin"
-msgstr "OldStyleTablePlugin"
+msgid "Help/PhpWiki"
+msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:78
+msgid "Help/PloticusPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:79
-msgid "PageGroupTest"
-msgstr "PageGroupTest"
+msgid "Help/RawHtmlPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:80
-#, fuzzy
-msgid "PageGroupTest/Four"
-msgstr "PageGroupTestFour"
+msgid "Help/RedirectToPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:81
-#, fuzzy
-msgid "PageGroupTest/One"
-msgstr "PageGroupTestOne"
+msgid "Help/RichTablePlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:82
-#, fuzzy
-msgid "PageGroupTest/Three"
-msgstr "PageGroupTestThree"
+msgid "Help/SystemInfoPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:83
-#, fuzzy
-msgid "PageGroupTest/Two"
-msgstr "PageGroupTestTwo"
+msgid "Help/TranscludePlugin"
+msgstr ""
 
+#: ../lib/plugin/_WikiTranslation.php:84
+msgid "Help/UnfoldSubpagesPlugin"
+msgstr ""
+
 #: ../lib/plugin/_WikiTranslation.php:85
-msgid "PhotoAlbumPlugin"
-msgstr "PhotoAlbumPlugin"
+msgid "Help/UpLoadPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:86
-msgid "PhpHighlightPlugin"
-msgstr "PhpHighlightPlugin"
+msgid "Help/WabiSabi"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:87
-msgid "PhpWeatherPlugin"
-msgstr "PhpWeatherPlugin"
+msgid "Help/WikiBlogPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:88
-msgid "PhpWiki"
-msgstr "PhpWiki"
+msgid "Help/WikiPlugin"
+msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:89
+msgid "Help/WikiWikiWeb"
+msgstr ""
+
+#: ../lib/plugin/_WikiTranslation.php:90
+msgid "HomePageAlias"
+msgstr "HomePageAlias"
+
+#: ../lib/plugin/_WikiTranslation.php:91
+msgid "InterWiki"
+msgstr "InterWiki"
+
+#: ../lib/plugin/_WikiTranslation.php:93
 msgid "PhpWikiAdministration/Chmod"
 msgstr "PhpWikiAdministration/Chmod"
 
-#: ../lib/plugin/_WikiTranslation.php:92
+#: ../lib/plugin/_WikiTranslation.php:96
 msgid "PhpWikiAdministration/Rename"
 msgstr "PhpWikiAdministration/Rename"
 
-#: ../lib/plugin/_WikiTranslation.php:93
+#: ../lib/plugin/_WikiTranslation.php:97
 msgid "PhpWikiAdministration/Replace"
 msgstr "PhpWikiAdministration/Replace"
 
-#: ../lib/plugin/_WikiTranslation.php:95
+#: ../lib/plugin/_WikiTranslation.php:99
 #: ../themes/MonoBook/templates/navbar.tmpl:21
 msgid "PhpWikiDocumentation"
 msgstr "PhpWikiDocumentation"
 
-#: ../lib/plugin/_WikiTranslation.php:96
+#: ../lib/plugin/_WikiTranslation.php:100
 msgid "PhpWikiPoll"
 msgstr "PhpWikiPoll"
 
-#: ../lib/plugin/_WikiTranslation.php:97
-#, fuzzy
-msgid "PloticusPlugin"
-msgstr "PhotoAlbumPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:99
-#, fuzzy
-msgid "PgsrcTranslation/de"
-msgstr "PgsrcTranslation"
-
-#: ../lib/plugin/_WikiTranslation.php:100
-#, fuzzy
-msgid "PgsrcTranslation/fr"
-msgstr "PgsrcTranslation"
-
 #: ../lib/plugin/_WikiTranslation.php:101
-#, fuzzy
-msgid "PgsrcTranslation/it"
-msgstr "PgsrcTranslation"
-
-#: ../lib/plugin/_WikiTranslation.php:102
-#, fuzzy
-msgid "PgsrcTranslation/es"
-msgstr "PgsrcTranslation"
-
-#: ../lib/plugin/_WikiTranslation.php:103
-#, fuzzy
-msgid "PgsrcTranslation/nl"
-msgstr "PgsrcTranslation"
-
-#: ../lib/plugin/_WikiTranslation.php:104
-#, fuzzy
-msgid "PgsrcTranslation/sv"
-msgstr "PgsrcTranslation"
-
-#: ../lib/plugin/_WikiTranslation.php:105
-#, fuzzy
-msgid "PgsrcTranslation/ja"
-msgstr "PgsrcTranslation"
-
-#: ../lib/plugin/_WikiTranslation.php:106
-#, fuzzy
-msgid "PgsrcTranslation/zh"
-msgstr "PgsrcTranslation"
-
-#: ../lib/plugin/_WikiTranslation.php:107
-msgid "RawHtmlPlugin"
-msgstr "RawHtmlPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:108
 msgid "RecentVisitors"
 msgstr "RecentVisitors"
 
-#: ../lib/plugin/_WikiTranslation.php:109
-msgid "RedirectToPlugin"
-msgstr "RedirectToPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:110
+#: ../lib/plugin/_WikiTranslation.php:102
 msgid "ReleaseNotes"
 msgstr "ReleaseNotes"
 
-#: ../lib/plugin/_WikiTranslation.php:111
-msgid "RichTablePlugin"
-msgstr "RichTablePlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:113
+#: ../lib/plugin/_WikiTranslation.php:104
 msgid "SteveWainstead"
 msgstr "SteveWainstead"
 
-#: ../lib/plugin/_WikiTranslation.php:114
-msgid "SystemInfoPlugin"
-msgstr "SystemInfoPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:115
-msgid "TranscludePlugin"
-msgstr "TranscludePlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:117
-msgid "UnfoldSubpagesPlugin"
-msgstr "UnfoldSubpagesPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:118
-#: ../themes/fusionforge/templates/navbar.tmpl:20
+#: ../lib/plugin/_WikiTranslation.php:106
+#: ../themes/fusionforge/templates/navbar.tmpl:19
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "UpLoad"
 msgstr "UpLoad"
 
-#: ../lib/plugin/_WikiTranslation.php:119
-#, fuzzy
-msgid "UpLoadPlugin"
-msgstr "UpLoad"
-
-#: ../lib/plugin/_WikiTranslation.php:120
-msgid "WabiSabi"
-msgstr "WabiSabi"
-
-#: ../lib/plugin/_WikiTranslation.php:121
-msgid "WikiBlogPlugin"
-msgstr "WikiBlogPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:122
-msgid "WikiPlugin"
-msgstr "WikiPlugin"
-
-#: ../lib/plugin/_WikiTranslation.php:123
-#: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
-#: ../themes/default/templates/head.tmpl:81
-#: ../themes/default/templates/head.tmpl:82
-#: ../themes/wikilens/templates/head.tmpl:71
-#: ../themes/wikilens/templates/head.tmpl:72
-msgid "WikiWikiWeb"
-msgstr "WikiWikiWeb"
-
-#: ../lib/plugin/_WikiTranslation.php:132
+#: ../lib/plugin/_WikiTranslation.php:115
 msgid "_WikiTranslation"
 msgstr "_WikiTranslation"
 
-#: ../lib/plugin/_WikiTranslation.php:136
+#: ../lib/plugin/_WikiTranslation.php:119
 msgid "Show translations of various words or pages"
 msgstr "顯示多個字或頁面的轉換"
 
-#: ../lib/plugin/_WikiTranslation.php:309
+#: ../lib/plugin/_WikiTranslation.php:292
 #, php-format
 msgid ""
 "TODO: Google can only translate from english and french. Find a translation "
 "service for %s to language %s"
 msgstr "TODO: Google 只能從英文與法文轉換. 為 %s 尋找轉換到語言 %s 的服務."
 
-#: ../lib/plugin/_WikiTranslation.php:432
+#: ../lib/plugin/_WikiTranslation.php:415
 #, php-format
 msgid "Define the translation for %s in %s"
 msgstr "為 %s 定義轉換,在 %s"
@@ -6372,7 +6405,7 @@
 msgid "Sorry, this page does not exist."
 msgstr "抱歉, 版本是 %d 的 %s 不在資料庫中."
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048
+#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 #, fuzzy
 msgid "Purge Page"
 msgstr "沒有頁面被變更."
@@ -6396,7 +6429,7 @@
 "從你開始刪除到現在,有人已經儲存了一份 %s 的較新版本. 請檢查以確定你仍想要從資"
 "料庫中永久刪除此頁面."
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1047
+#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
 msgid "Remove Page"
 msgstr "移除頁面"
 
@@ -6408,8 +6441,8 @@
 #: ../lib/removepage.php:45
 #, php-format
 msgid ""
-"Since you started the deletion process, someone has saved a new version of %"
-"s.  Please check to make sure you still want to permanently remove the page "
+"Since you started the deletion process, someone has saved a new version of "
+"%s.  Please check to make sure you still want to permanently remove the page "
 "from the database."
 msgstr ""
 "從你開始刪除到現在,有人已經儲存了一份 %s 的較新版本. 請檢查以確定你仍想要從資"
@@ -6440,139 +6473,139 @@
 msgid "the file '%s'"
 msgstr "檔案 '%s'"
 
-#: ../lib/stdlib.php:389 ../lib/stdlib.php:426
+#: ../lib/stdlib.php:389 ../lib/stdlib.php:423
 msgid "BAD URL -- remove all of <, >, \""
 msgstr "錯誤 URL -- 移除所有的 <, >, \""
 
-#: ../lib/stdlib.php:474
+#: ../lib/stdlib.php:475
 #, fuzzy, php-format
 msgid "Invalid image attribute \"%s\" %s=%s"
 msgstr "錯誤的顏色值: %s"
 
-#: ../lib/stdlib.php:486
+#: ../lib/stdlib.php:487
 #, php-format
 msgid "Invalid image link fixed %s => %s. Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:492
+#: ../lib/stdlib.php:493
 #, php-format
 msgid ""
 "Invalid image link fixed \"%s\" => \"%s\".\n"
 " Spaces must be quoted with %%20."
 msgstr ""
 
-#: ../lib/stdlib.php:511 ../lib/stdlib.php:548
+#: ../lib/stdlib.php:512 ../lib/stdlib.php:549
 #, fuzzy
 msgid "Invalid image size"
 msgstr "Inline 圖片"
 
-#: ../lib/stdlib.php:721
+#: ../lib/stdlib.php:723
 msgid "BAD phpwiki: URL"
 msgstr "錯誤 phpwiki: URL"
 
-#: ../lib/stdlib.php:759
+#: ../lib/stdlib.php:761
 msgid "Lock page to enable link"
 msgstr "鎖定頁面以打開此連結"
 
-#: ../lib/stdlib.php:889
+#: ../lib/stdlib.php:891
 #, php-format
 msgid "'%s': Bad page name: %s"
 msgstr "'%s': 錯誤頁面名稱: %s"
 
-#: ../lib/stdlib.php:919 ../lib/stdlib.php:950
+#: ../lib/stdlib.php:921 ../lib/stdlib.php:952
 #, php-format
 msgid "Leading %s not allowed"
 msgstr "前面的 %s 是不被允許的"
 
-#: ../lib/stdlib.php:934
+#: ../lib/stdlib.php:936
 msgid "White space converted to single space"
 msgstr "空白空格轉換為單一空格"
 
-#: ../lib/stdlib.php:940
+#: ../lib/stdlib.php:942
 msgid "Control characters not allowed"
 msgstr "控制字元是不被允許的"
 
-#: ../lib/stdlib.php:961
+#: ../lib/stdlib.php:963
 msgid "too long"
 msgstr "太長"
 
-#: ../lib/stdlib.php:970
+#: ../lib/stdlib.php:972
 #, php-format
 msgid "Illegal chars %s removed"
 msgstr ""
 
-#: ../lib/stdlib.php:1016
+#: ../lib/stdlib.php:1018
 msgid "The CreateTocPlugin is not yet old markup compatible! "
 msgstr ""
 
-#: ../lib/stdlib.php:1017
+#: ../lib/stdlib.php:1019
 msgid ""
 "Please remove the CreateToc line to be able to reformat this page to old "
 "markup. "
 msgstr ""
 
-#: ../lib/stdlib.php:1280
+#: ../lib/stdlib.php:1282
 msgid "Revision Not Found"
 msgstr "修訂未找到"
 
-#: ../lib/stdlib.php:1281
+#: ../lib/stdlib.php:1283
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
 msgstr "抱歉, 版本是 %d 的 %s 不在資料庫中."
 
-#: ../lib/stdlib.php:1284
+#: ../lib/stdlib.php:1286
 msgid "Bad Version"
 msgstr "錯誤的版本"
 
-#: ../lib/stdlib.php:1420
+#: ../lib/stdlib.php:1422
 msgid "-???"
 msgstr "-???"
 
-#: ../lib/stdlib.php:1423
+#: ../lib/stdlib.php:1425
 #, php-format
-msgid "%s b"
-msgstr "%s b"
+msgid "%s B"
+msgstr ""
 
-#: ../lib/stdlib.php:1425 ../themes/MonoBook/templates/info.tmpl:30
+#: ../lib/stdlib.php:1427 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../lib/stdlib.php:1430
+#: ../lib/stdlib.php:1432
 #, php-format
-msgid "%s k"
-msgstr "%s k"
+msgid "%s KiB"
+msgstr ""
 
-#: ../lib/stdlib.php:1432 ../themes/MonoBook/templates/info.tmpl:33
-#, php-format
-msgid "%s Kb (%s bytes)"
+#: ../lib/stdlib.php:1434 ../themes/MonoBook/templates/info.tmpl:33
+#, fuzzy, php-format
+msgid "%s KiB (%s bytes)"
 msgstr "%s Kb (%s bytes)"
 
-#: ../lib/stdlib.php:1519 ../lib/XmlElement.php:487
+#: ../lib/stdlib.php:1521 ../lib/XmlElement.php:487
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "無法混合 '%s' 和 '%s' 型態的格式字串."
 
-#: ../lib/stdlib.php:1528
+#: ../lib/stdlib.php:1530
 #, php-format
 msgid "%s: argument index out of range"
 msgstr "%s: 引數索引超出範圍"
 
-#: ../lib/stdlib.php:1607 ../themes/Hawaiian/lib/random.php:20
+#: ../lib/stdlib.php:1609 ../themes/Hawaiian/lib/random.php:20
 #, php-format
 msgid "%s is empty."
 msgstr "%s 是空白的."
 
-#: ../lib/stdlib.php:1614
+#: ../lib/stdlib.php:1616
 #, php-format
 msgid "Unable to open directory '%s' for reading"
 msgstr "無法開啟目錄 '%s' 進行讀取"
 
-#: ../lib/stdlib.php:1943
+#: ../lib/stdlib.php:1947
 msgid "Okay"
 msgstr "Okay"
 
-#: ../lib/stdlib.php:2128 ../lib/stdlib.php:2141
+#: ../lib/stdlib.php:2132 ../lib/stdlib.php:2145
 #, fuzzy, php-format
 msgid "... (first %s words)"
 msgstr "... 頭 %d 個字"
@@ -6627,24 +6660,20 @@
 msgstr "動作頁面"
 
 #: ../lib/upgrade.php:121
-#, fuzzy
 msgid "_AuthInfo"
-msgstr "_AuthInfo"
+msgstr ""
 
 #: ../lib/upgrade.php:121
-#, fuzzy
 msgid "DebugAuthInfo"
-msgstr "DebugInfo"
+msgstr ""
 
 #: ../lib/upgrade.php:124
-#, fuzzy
 msgid "_GroupInfo"
-msgstr "DebugInfo"
+msgstr ""
 
 #: ../lib/upgrade.php:124
-#, fuzzy
 msgid "GroupAuthInfo"
-msgstr "_AuthInfo"
+msgstr ""
 
 #: ../lib/upgrade.php:158
 #, fuzzy, php-format
@@ -6676,9 +6705,8 @@
 msgstr "資料庫"
 
 #: ../lib/upgrade.php:391
-#, fuzzy
 msgid "CANCEL"
-msgstr "ACL"
+msgstr ""
 
 #: ../lib/upgrade.php:404
 #, fuzzy
@@ -6883,7 +6911,7 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "後台的 WikiDB::renamePage() 還沒實作出來."
 
-#: ../lib/WikiDB.php:937
+#: ../lib/WikiDB.php:933
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: 新版本的日期是 %s"
@@ -6976,8 +7004,8 @@
 msgid "Unable to connect to LDAP server %s"
 msgstr "無法連結到 LDAP 伺服器 %s"
 
-#: ../lib/wikilens/Buddy.php:30 ../lib/wikilens/Buddy.php:39
-#: ../lib/wikilens/Buddy.php:43
+#: ../lib/wikilens/Buddy.php:22 ../lib/wikilens/Buddy.php:31
+#: ../lib/wikilens/Buddy.php:35
 msgid "Buddies:"
 msgstr ""
 
@@ -7008,7 +7036,7 @@
 msgid "Top Recommendations"
 msgstr ""
 
-#: ../lib/wikilens/Utils.php:59
+#: ../lib/wikilens/Utils.php:56
 msgid "Members:"
 msgstr ""
 
@@ -7058,70 +7086,65 @@
 msgid "%s: not a subclass of WikiPlugin."
 msgstr "%s: 不是 WikiPlugin 的子類別"
 
-#: ../lib/WikiTheme.php:451
+#: ../lib/WikiTheme.php:449
 #, fuzzy
 msgid "Never edited"
 msgstr "未曾編輯過"
 
-#: ../lib/WikiTheme.php:458
+#: ../lib/WikiTheme.php:456
 #, php-format
 msgid "%s at %s"
 msgstr "%s 在 %s"
 
-#: ../lib/WikiTheme.php:462
+#: ../lib/WikiTheme.php:460 ../lib/WikiTheme.php:471
 #, fuzzy, php-format
-msgid "Version %s, saved %s"
+msgid "Version %s, saved on %s"
 msgstr "版本 %s, 存於 %s."
 
-#: ../lib/WikiTheme.php:464
+#: ../lib/WikiTheme.php:462
 #, fuzzy, php-format
 msgid "Last edited %s"
 msgstr "最後編輯 %s."
 
 #: ../lib/WikiTheme.php:473
 #, fuzzy, php-format
-msgid "Version %s, saved on %s"
-msgstr "版本 %s, 存於 %s."
-
-#: ../lib/WikiTheme.php:475
-#, fuzzy, php-format
 msgid "Last edited on %s"
 msgstr "最後編輯的時間在 %s."
 
-#: ../lib/WikiTheme.php:491
+#: ../lib/WikiTheme.php:489
 msgid "today"
 msgstr "今天"
 
-#: ../lib/WikiTheme.php:498
+#: ../lib/WikiTheme.php:496
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../lib/WikiTheme.php:519 ../lib/WikiTheme.php:521
+#: ../lib/WikiTheme.php:517 ../lib/WikiTheme.php:519
 #, fuzzy, php-format
 msgid "Owner: %s"
 msgstr "擁有者"
 
-#: ../lib/WikiTheme.php:629
+#: ../lib/WikiTheme.php:627
 #, php-format
 msgid "Empty link to: %s"
 msgstr "沒有連結到: %s"
 
-#: ../lib/WikiTheme.php:644 ../themes/MacOSX/themeinfo.php:78
+#: ../lib/WikiTheme.php:642 ../themes/MacOSX/themeinfo.php:78
 #, php-format
 msgid "Create: %s"
 msgstr "建立: %s"
 
-#: ../lib/WikiTheme.php:665
+#: ../lib/WikiTheme.php:663
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:690
+#: ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
 msgstr "'%s': 錯誤的頁面名稱"
 
-#: ../lib/WikiTheme.php:1042 ../themes/Crao/templates/signin.tmpl:14
+#: ../lib/WikiTheme.php:1032 ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
 #: ../themes/default/templates/signin.tmpl:27
@@ -7134,70 +7157,71 @@
 msgid "Sign Out"
 msgstr "簽出"
 
-#: ../lib/WikiTheme.php:1043 ../lib/WikiUserNew.php:508
+#: ../lib/WikiTheme.php:1033 ../lib/WikiUserNew.php:510
 #: ../lib/WikiUser.php:228 ../themes/Crao/templates/signin.tmpl:53
+#: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "簽入"
 
-#: ../lib/WikiTheme.php:1044
+#: ../lib/WikiTheme.php:1034
 #, fuzzy
 msgid "Rename Page"
 msgstr "移除頁面"
 
-#: ../lib/WikiTheme.php:1045 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "鎖定頁面"
 
-#: ../lib/WikiTheme.php:1046 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "解除鎖定頁面"
 
-#: ../lib/WikiTheme.php:1218
+#: ../lib/WikiTheme.php:1208
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1315 ../themes/Hawaiian/themeinfo.php:34
-#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:122
-#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:61
-#: ../themes/Sidebar/themeinfo.php:121 ../themes/SpaceWiki/themeinfo.php:48
-#: ../themes/wikilens/themeinfo.php:33 ../themes/Wordpress/themeinfo.php:65
+#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
+#: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
+#: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
+#: ../themes/wikilens/themeinfo.php:31 ../themes/Wordpress/themeinfo.php:65
 msgid "Printer"
 msgstr "印表機"
 
-#: ../lib/WikiTheme.php:1316 ../themes/MacOSX/themeinfo.php:108
-#: ../themes/MonoBook/themeinfo.php:123 ../themes/shamino_com/themeinfo.php:62
-#: ../themes/wikilens/themeinfo.php:34
+#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
+#: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr "Top & bottom 工具列"
 
-#: ../lib/WikiTheme.php:1317 ../themes/Hawaiian/themeinfo.php:35
-#: ../themes/MonoBook/themeinfo.php:124 ../themes/Portland/themeinfo.php:64
-#: ../themes/shamino_com/themeinfo.php:63 ../themes/Sidebar/themeinfo.php:122
-#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:35
+#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
+#: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
+#: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
 #: ../themes/Wordpress/themeinfo.php:66
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1818
+#: ../lib/WikiTheme.php:1808
 #, fuzzy, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s 失敗."
 
-#: ../lib/WikiTheme.php:1841
+#: ../lib/WikiTheme.php:1831
 msgid "Related Links"
 msgstr "相關連結"
 
-#: ../lib/WikiTheme.php:1862
+#: ../lib/WikiTheme.php:1852
 msgid "External Links"
 msgstr "外部連結"
 
 #: ../lib/WikiUser/AdoDb.php:47 ../lib/WikiUser/AdoDb.php:204
 #: ../lib/WikiUser/Db.php:59 ../lib/WikiUser/File.php:74
 #: ../lib/WikiUser/IMAP.php:34 ../lib/WikiUser/LDAP.php:141
-#: ../lib/WikiUserNew.php:618 ../lib/WikiUser/PdoDb.php:46
+#: ../lib/WikiUserNew.php:620 ../lib/WikiUser/PdoDb.php:46
 #: ../lib/WikiUser/PdoDb.php:121 ../lib/WikiUser/PearDb.php:43
 #: ../lib/WikiUser/PearDb.php:133 ../lib/WikiUser.php:195
 #: ../lib/WikiUser.php:275 ../lib/WikiUser/POP3.php:33
@@ -7277,37 +7301,37 @@
 msgid "Invalid username '%s' for LDAP Auth"
 msgstr "錯誤的 acl"
 
-#: ../lib/WikiUserNew.php:435
+#: ../lib/WikiUserNew.php:437
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:658
+#: ../lib/WikiUserNew.php:660
 #, fuzzy
 msgid "Invalid password."
 msgstr "錯誤的密碼或使用者帳號."
 
-#: ../lib/WikiUserNew.php:660 ../lib/WikiUser.php:199
+#: ../lib/WikiUserNew.php:662 ../lib/WikiUser.php:199
 msgid "Invalid password or userid."
 msgstr "錯誤的密碼或使用者帳號."
 
-#: ../lib/WikiUserNew.php:676 ../lib/WikiUser.php:201
+#: ../lib/WikiUserNew.php:678 ../lib/WikiUser.php:201
 msgid "Insufficient permissions."
 msgstr "權限不足."
 
-#: ../lib/WikiUserNew.php:722
+#: ../lib/WikiUserNew.php:724
 msgid "Empty Preferences or format of UserPreferences cookie not recognised."
 msgstr "空的偏好設定或 UserPreferences cookie 格式無法辨認."
 
-#: ../lib/WikiUserNew.php:726
+#: ../lib/WikiUserNew.php:728
 msgid "Default preferences will be used."
 msgstr "預設偏好設定將被使用."
 
-#: ../lib/WikiUserNew.php:1297
+#: ../lib/WikiUserNew.php:1299
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1323
+#: ../lib/WikiUserNew.php:1325
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7316,11 +7340,11 @@
 "密碼長度小於系統原則所允許的長度. 抱歉,你無法登入. \n"
 " 你必須詢問系統管理者以重設密碼."
 
-#: ../lib/WikiUserNew.php:1338
+#: ../lib/WikiUserNew.php:1340
 msgid "The crypt function is not available in this version of PHP."
 msgstr "此版本的 PHP 沒有 crypt 函數."
 
-#: ../lib/WikiUserNew.php:1339
+#: ../lib/WikiUserNew.php:1341
 #, fuzzy
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
@@ -7328,12 +7352,12 @@
 msgstr ""
 "請在 index.php 中設定 ENCRYPTED_PASSWD 為 false 或許也要變更 ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1352
+#: ../lib/WikiUserNew.php:1354
 #, fuzzy
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "請在 index.php 中設定 ENCRYPTED_PASSWD 為 true."
 
-#: ../lib/WikiUserNew.php:1781
+#: ../lib/WikiUserNew.php:1783
 #, fuzzy, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7345,14 +7369,14 @@
 " 你的 email 帳號已經確認並且將會被用來寄送頁面變更通知. \n"
 " 參閱 %s"
 
-#: ../lib/WikiUserNew.php:1841
+#: ../lib/WikiUserNew.php:1843
 #, php-format
-msgid "E-Mail address '%s' is not properly formatted"
+msgid "E-mail address '%s' is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1845
+#: ../lib/WikiUserNew.php:1847
 #, php-format
-msgid "E-Mail address '%s' is properly formatted"
+msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
@@ -7520,9 +7544,8 @@
 msgstr "計數"
 
 #: ../themes/blog/templates/actionbar.tmpl:13
-#, fuzzy
 msgid "HowTo"
-msgstr "GoTo"
+msgstr ""
 
 #: ../themes/blog/templates/actionbar.tmpl:15
 #: ../themes/smaller/templates/actionbar.tmpl:36
@@ -7531,10 +7554,10 @@
 
 #: ../themes/blog/templates/actionbar.tmpl:21
 #: ../themes/Crao/templates/actionbar.tmpl:7
-#: ../themes/Crao/templates/head.tmpl:47
+#: ../themes/Crao/templates/head.tmpl:40
 #: ../themes/default/templates/actionbar.tmpl:21
-#: ../themes/default/templates/head.tmpl:53
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/head.tmpl:46
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/MonoBook/templates/actionbar.tmpl:38
 #: ../themes/MonoBook/templates/info.tmpl:185
 #: ../themes/Portland/templates/actionbar.tmpl:9
@@ -7542,7 +7565,7 @@
 #: ../themes/Sidebar/templates/actionbar.tmpl:55
 #: ../themes/smaller/templates/actionbar.tmpl:20
 #: ../themes/smaller/templates/info.tmpl:8
-#: ../themes/wikilens/templates/head.tmpl:45
+#: ../themes/wikilens/templates/head.tmpl:38
 #: ../themes/Wordpress/templates/actionbar.tmpl:12
 msgid "View Source"
 msgstr "查看源碼"
@@ -7556,9 +7579,8 @@
 #: ../themes/blog/templates/blogform.tmpl:18
 #: ../themes/default/templates/blogform.tmpl:18
 #: ../themes/fusionforge/templates/blogform.tmpl:18
-#, fuzzy
 msgid "Add Entry"
-msgstr "CategoryPage"
+msgstr ""
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7570,9 +7592,8 @@
 #: ../themes/Portland/templates/editpage.tmpl:83
 #: ../themes/Wordpress/templates/editpage.tmpl:91
 #: ../themes/Wordpress/templates/editpage.tmpl:96
-#, fuzzy
 msgid "Help/GoodStyle"
-msgstr "GoodStyle"
+msgstr ""
 
 #: ../themes/blog/templates/blogform.tmpl:24
 #: ../themes/Crao/templates/editpage.tmpl:93
@@ -7595,9 +7616,8 @@
 #: ../themes/fusionforge/templates/editpage.tmpl:79
 #: ../themes/Portland/templates/editpage.tmpl:84
 #: ../themes/Wordpress/templates/editpage.tmpl:97
-#, fuzzy
 msgid "Help/TextFormattingRules"
-msgstr "TextFormattingRules"
+msgstr ""
 
 #: ../themes/blog/templates/blogform.tmpl:25
 #: ../themes/Crao/templates/editpage.tmpl:94
@@ -7620,12 +7640,11 @@
 #: ../themes/Crao/templates/browse.tmpl:6
 #: ../themes/default/templates/browse.tmpl:6
 #: ../themes/default/templates/viewsource.tmpl:6
-#: ../themes/fusionforge/templates/browse.tmpl:9
+#: ../themes/fusionforge/templates/browse.tmpl:14
 #: ../themes/MonoBook/templates/browse.tmpl:6
 #: ../themes/MonoBook/templates/viewsource.tmpl:5
 #: ../themes/Portland/templates/browse.tmpl:8
 #: ../themes/Portland/templates/viewsource.tmpl:5
-#: ../themes/Sidebar/templates/browse.tmpl:6
 #: ../themes/Wordpress/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/viewsource.tmpl:10
 msgid "Note:"
@@ -7636,12 +7655,11 @@
 #: ../themes/Crao/templates/browse.tmpl:7
 #: ../themes/default/templates/browse.tmpl:7
 #: ../themes/default/templates/viewsource.tmpl:11
-#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:15
 #: ../themes/MonoBook/templates/browse.tmpl:7
 #: ../themes/MonoBook/templates/viewsource.tmpl:10
 #: ../themes/Portland/templates/browse.tmpl:9
 #: ../themes/Portland/templates/viewsource.tmpl:9
-#: ../themes/Sidebar/templates/browse.tmpl:7
 #: ../themes/Wordpress/templates/browse.tmpl:9
 #: ../themes/Wordpress/templates/viewsource.tmpl:14
 msgid "You are viewing an old revision of this page."
@@ -7650,10 +7668,8 @@
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/Crao/templates/browse.tmpl:8
 #: ../themes/default/templates/browse.tmpl:8
-#: ../themes/fusionforge/templates/browse.tmpl:11
 #: ../themes/MonoBook/templates/browse.tmpl:8
 #: ../themes/Portland/templates/browse.tmpl:10
-#: ../themes/Sidebar/templates/browse.tmpl:8
 #: ../themes/Wordpress/templates/browse.tmpl:10
 #: ../themes/Wordpress/templates/viewsource.tmpl:15
 msgid "View the current version"
@@ -7664,7 +7680,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr "執行此頁面花了 %s 秒"
@@ -7715,6 +7731,8 @@
 
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/default/templates/viewsource.tmpl:12
+#: ../themes/fusionforge/templates/browse.tmpl:10
+#: ../themes/fusionforge/templates/browse.tmpl:16
 #: ../themes/MonoBook/templates/viewsource.tmpl:11
 #: ../themes/Portland/templates/viewsource.tmpl:10
 #, fuzzy
@@ -7734,41 +7752,41 @@
 msgid "Comments on %s by %s."
 msgstr "%s 的意見:"
 
-#: ../themes/blog/themeinfo.php:69
+#: ../themes/blog/themeinfo.php:68
 #, fuzzy
 msgid "SignOut"
 msgstr "簽出"
 
-#: ../themes/blog/themeinfo.php:70
+#: ../themes/blog/themeinfo.php:69
 #, fuzzy
 msgid "SignIn"
 msgstr "簽入"
 
-#: ../themes/blog/themeinfo.php:71
-#: ../themes/fusionforge/templates/actionbar.tmpl:95
-#: ../themes/fusionforge/templates/userprefs.tmpl:267
+#: ../themes/blog/themeinfo.php:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:101
+#: ../themes/fusionforge/templates/userprefs.tmpl:265
 #, fuzzy
 msgid "Lock"
 msgstr "已鎖定"
 
-#: ../themes/blog/themeinfo.php:72
-#: ../themes/fusionforge/templates/actionbar.tmpl:93
+#: ../themes/blog/themeinfo.php:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:99
 #, fuzzy
 msgid "Unlock"
 msgstr "解除鎖定頁面"
 
-#: ../themes/blog/themeinfo.php:126
+#: ../themes/blog/themeinfo.php:125
 #, fuzzy
 msgid "blog"
 msgstr "對話盒"
 
-#: ../themes/blog/themeinfo.php:130
+#: ../themes/blog/themeinfo.php:129
 msgid "(diff)"
 msgstr "(差異)"
 
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/fusionforge/templates/actionbar.tmpl:58
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/Portland/templates/actionbar.tmpl:7
 #: ../themes/shamino_com/templates/actionbar.tmpl:8
@@ -7880,21 +7898,28 @@
 #: ../themes/default/templates/editpage.tmpl:118
 #: ../themes/Portland/templates/editpage.tmpl:79
 #: ../themes/Wordpress/templates/editpage.tmpl:92
-#, fuzzy
 msgid "Help/OldTextFormattingRules"
-msgstr "OldTextFormattingRules"
+msgstr ""
 
-#: ../themes/Crao/templates/head.tmpl:31 ../themes/Crao/templates/head.tmpl:32
-#: ../themes/Crao/templates/htmldump.tmpl:22
-#: ../themes/default/templates/head.tmpl:37
-#: ../themes/default/templates/head.tmpl:38
-#: ../themes/default/templates/htmldump.tmpl:21
-#: ../themes/Sidebar/templates/htmldump.tmpl:22
-#: ../themes/wikilens/templates/head.tmpl:30
-#: ../themes/wikilens/templates/head.tmpl:31
+#: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25
+#: ../themes/Crao/templates/htmldump.tmpl:15
+#: ../themes/default/templates/head.tmpl:30
+#: ../themes/default/templates/head.tmpl:31
+#: ../themes/default/templates/htmldump.tmpl:14
+#: ../themes/Sidebar/templates/htmldump.tmpl:15
+#: ../themes/wikilens/templates/head.tmpl:23
+#: ../themes/wikilens/templates/head.tmpl:24
 msgid "HowToUseWiki"
 msgstr "HowToUseWiki"
 
+#: ../themes/Crao/templates/head.tmpl:66 ../themes/Crao/templates/head.tmpl:67
+#: ../themes/default/templates/head.tmpl:74
+#: ../themes/default/templates/head.tmpl:75
+#: ../themes/wikilens/templates/head.tmpl:64
+#: ../themes/wikilens/templates/head.tmpl:65
+msgid "WikiWikiWeb"
+msgstr "WikiWikiWeb"
+
 #: ../themes/Crao/templates/navbar.tmpl:35
 #: ../themes/default/templates/navbar.tmpl:38
 #: ../themes/wikilens/templates/navbar.tmpl:30
@@ -7924,9 +7949,8 @@
 msgstr "輸入你的帳號進行簽入"
 
 #: ../themes/default/templates/addcomment.tmpl:15
-#, fuzzy
 msgid "Add Comment"
-msgstr "AddComment"
+msgstr ""
 
 #: ../themes/default/templates/comment.tmpl:10
 #, fuzzy
@@ -7947,9 +7971,9 @@
 # This entry is important for French punctuation rules which stipulate
 # a space before each colon.
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, fuzzy, php-format
 msgid ", Memory: %s"
 msgstr "User: %s"
@@ -8062,11 +8086,25 @@
 msgid "Hits:"
 msgstr "點擊數:"
 
+#: ../themes/default/templates/info.tmpl:133
+#, fuzzy
+msgid "Is External:"
+msgstr "外部連結"
+
 #: ../themes/default/templates/info.tmpl:134
 #, fuzzy
 msgid "No"
 msgstr "無"
 
+#: ../themes/default/templates/info.tmpl:138
+#, fuzzy
+msgid "ACL type:"
+msgstr "db 型態:"
+
+#: ../themes/default/templates/info.tmpl:142
+msgid "ACL:"
+msgstr ""
+
 #: ../themes/default/templates/info.tmpl:149
 #: ../themes/MonoBook/templates/info.tmpl:157
 msgid "home page"
@@ -8216,44 +8254,17 @@
 msgid "Guests"
 msgstr "訪客"
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:20
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "預覽"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:22
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:25
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-#, fuzzy
-msgid "Next >>"
-msgstr "下一個"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:28
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:30
-msgid ">>|"
-msgstr ""
-
-#: ../themes/default/templates/redirect.tmpl:43
+#: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
 msgstr "你的瀏覽器應該會重導向到 %s."
@@ -8305,34 +8316,34 @@
 
 #: ../themes/default/templates/userprefs.tmpl:72
 #: ../themes/default/templates/userprefs.tmpl:74
+#: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
-#: ../themes/fusionforge/templates/userprefs.tmpl:138
 msgid "<system theme>"
 msgstr "<系統佈景主題>"
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
-#: ../themes/fusionforge/templates/userprefs.tmpl:147
-#: ../themes/fusionforge/templates/userprefs.tmpl:173
+#: ../themes/fusionforge/templates/userprefs.tmpl:145
+#: ../themes/fusionforge/templates/userprefs.tmpl:171
 msgid "Personal theme:"
 msgstr "個人佈景主題:"
 
 #: ../themes/default/templates/userprefs.tmpl:89
 #: ../themes/default/templates/userprefs.tmpl:91
+#: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
-#: ../themes/fusionforge/templates/userprefs.tmpl:155
 msgid "<system language>"
 msgstr "<系統語言>"
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110
-#: ../themes/fusionforge/templates/userprefs.tmpl:164
-#: ../themes/fusionforge/templates/userprefs.tmpl:174
+#: ../themes/fusionforge/templates/userprefs.tmpl:162
+#: ../themes/fusionforge/templates/userprefs.tmpl:172
 msgid "Personal language:"
 msgstr "個人語言:"
 
 #: ../themes/default/templates/userprefs.tmpl:118
-#: ../themes/fusionforge/templates/userprefs.tmpl:183
+#: ../themes/fusionforge/templates/userprefs.tmpl:181
 #, fuzzy, php-format
 msgid "User preferences for user %s"
 msgstr "使用者 '%s' 的偏好設定:"
@@ -8407,43 +8418,43 @@
 msgstr "注意, 使用者帳號的回信(bouncing emails)將被關閉."
 
 #: ../themes/default/templates/userprefs.tmpl:172
-#: ../themes/fusionforge/templates/userprefs.tmpl:197
+#: ../themes/fusionforge/templates/userprefs.tmpl:195
 msgid "Get an email notification at changes of the following pages:"
 msgstr "在變更下列頁面時取得 email 通知:"
 
 #: ../themes/default/templates/userprefs.tmpl:177
-#: ../themes/fusionforge/templates/userprefs.tmpl:202
+#: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
 "Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing)."
 
 #: ../themes/default/templates/userprefs.tmpl:185
-#: ../themes/fusionforge/templates/userprefs.tmpl:220
+#: ../themes/fusionforge/templates/userprefs.tmpl:218
 msgid "Do not send my own modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:191
-#: ../themes/fusionforge/templates/userprefs.tmpl:226
+#: ../themes/fusionforge/templates/userprefs.tmpl:224
 msgid "Check if you do not want to be notified of your own modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:197
-#: ../themes/fusionforge/templates/userprefs.tmpl:232
+#: ../themes/fusionforge/templates/userprefs.tmpl:230
 msgid "Do not send minor modifications:"
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:203
-#: ../themes/fusionforge/templates/userprefs.tmpl:238
+#: ../themes/fusionforge/templates/userprefs.tmpl:236
 msgid "Check if you do not want to be notified of minor modifications."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:209
-#: ../themes/fusionforge/templates/userprefs.tmpl:307
+#: ../themes/fusionforge/templates/userprefs.tmpl:305
 msgid "Appearance"
 msgstr "Appearance"
 
 #: ../themes/default/templates/userprefs.tmpl:211
-#: ../themes/fusionforge/templates/userprefs.tmpl:309
+#: ../themes/fusionforge/templates/userprefs.tmpl:307
 msgid "Here you can override site-specific default values."
 msgstr "你可以在這裡覆寫掉站台預設的值."
 
@@ -8453,7 +8464,7 @@
 msgstr "系統預設:"
 
 #: ../themes/default/templates/userprefs.tmpl:219
-#: ../themes/fusionforge/templates/userprefs.tmpl:313
+#: ../themes/fusionforge/templates/userprefs.tmpl:311
 #, php-format
 msgid "Hide %s:"
 msgstr "隱藏 %s:"
@@ -8467,13 +8478,13 @@
 "被使用."
 
 #: ../themes/default/templates/userprefs.tmpl:222
-#: ../themes/fusionforge/templates/userprefs.tmpl:316
+#: ../themes/fusionforge/templates/userprefs.tmpl:314
 #, fuzzy, php-format
 msgid "Add %s:"
 msgstr "隱藏 %s:"
 
 #: ../themes/default/templates/userprefs.tmpl:224
-#: ../themes/fusionforge/templates/userprefs.tmpl:318
+#: ../themes/fusionforge/templates/userprefs.tmpl:316
 #, php-format
 msgid ""
 "Add Google links to unknown pages behind the '?', and the create action "
@@ -8492,23 +8503,23 @@
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:230
-#: ../themes/fusionforge/templates/userprefs.tmpl:320
+#: ../themes/fusionforge/templates/userprefs.tmpl:318
 #: ../themes/Portland/templates/editpage.tmpl:46
 msgid "Edit Area Size"
 msgstr "編輯區域大小"
 
 #: ../themes/default/templates/userprefs.tmpl:233
-#: ../themes/fusionforge/templates/userprefs.tmpl:323
+#: ../themes/fusionforge/templates/userprefs.tmpl:321
 msgid "Height"
 msgstr "高度"
 
 #: ../themes/default/templates/userprefs.tmpl:240
-#: ../themes/fusionforge/templates/userprefs.tmpl:330
+#: ../themes/fusionforge/templates/userprefs.tmpl:328
 msgid "Width"
 msgstr "寬度"
 
 #: ../themes/default/templates/userprefs.tmpl:249
-#: ../themes/fusionforge/templates/userprefs.tmpl:339
+#: ../themes/fusionforge/templates/userprefs.tmpl:337
 msgid ""
 "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 "
@@ -8518,45 +8529,45 @@
 "將會被忽略."
 
 #: ../themes/default/templates/userprefs.tmpl:252
-#: ../themes/fusionforge/templates/userprefs.tmpl:342
+#: ../themes/fusionforge/templates/userprefs.tmpl:340
 msgid "Time Zone"
 msgstr "時區"
 
 #: ../themes/default/templates/userprefs.tmpl:255
-#: ../themes/fusionforge/templates/userprefs.tmpl:345
+#: ../themes/fusionforge/templates/userprefs.tmpl:343
 #, php-format
 msgid "Add %s hours to the server's local time when reporting times."
 msgstr "當回報時間時,在伺服器的本地時間加上 %s 個小時."
 
 #: ../themes/default/templates/userprefs.tmpl:259
-#: ../themes/fusionforge/templates/userprefs.tmpl:349
+#: ../themes/fusionforge/templates/userprefs.tmpl:347
 #, php-format
 msgid "The current time at the server is %s."
 msgstr "目前在伺服器上的時間是 %s."
 
 #: ../themes/default/templates/userprefs.tmpl:261
-#: ../themes/fusionforge/templates/userprefs.tmpl:351
+#: ../themes/fusionforge/templates/userprefs.tmpl:349
 #, php-format
 msgid "With the current offset, this would be reported as %s."
 msgstr "以目前時差,這將被顯示為 %s."
 
 #: ../themes/default/templates/userprefs.tmpl:266
-#: ../themes/fusionforge/templates/userprefs.tmpl:356
+#: ../themes/fusionforge/templates/userprefs.tmpl:354
 msgid "Date Format"
 msgstr "日期格式"
 
 #: ../themes/default/templates/userprefs.tmpl:269
-#: ../themes/fusionforge/templates/userprefs.tmpl:359
+#: ../themes/fusionforge/templates/userprefs.tmpl:357
 msgid "Show relative dates using 'Today' and 'Yesterday'"
 msgstr "使用'今天'和'昨天'來顯示相對日期."
 
 #: ../themes/default/templates/userprefs.tmpl:276
-#: ../themes/fusionforge/templates/userprefs.tmpl:367
+#: ../themes/fusionforge/templates/userprefs.tmpl:365
 msgid "Update Preferences"
 msgstr "更新偏好設定"
 
 #: ../themes/default/templates/userprefs.tmpl:277
-#: ../themes/fusionforge/templates/userprefs.tmpl:368
+#: ../themes/fusionforge/templates/userprefs.tmpl:366
 #, fuzzy
 msgid "Reset Preferences"
 msgstr "UserPreferences"
@@ -8577,25 +8588,19 @@
 msgid "Posted: %s"
 msgstr "User: %s"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/MonoBook/templates/actionbar.tmpl:15
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
-msgid "/Discussion"
-msgstr "權限"
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
-#, fuzzy
 msgid "Action Page"
 msgstr "動作頁面"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:22
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #, fuzzy
 msgid "Page"
 msgstr "首頁"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:34
+#: ../themes/fusionforge/templates/actionbar.tmpl:32
 #: ../themes/MonoBook/templates/actionbar.tmpl:25
 #, fuzzy
 msgid "Template/Talk"
@@ -8608,55 +8613,59 @@
 msgid "Create Page"
 msgstr "CreatePage"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:62
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/MonoBook/templates/actionbar.tmpl:43
 #: ../themes/Sidebar/templates/actionbar.tmpl:27
 #, fuzzy
 msgid "History"
 msgstr "PageHistory"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
-#: ../themes/fusionforge/templates/userprefs.tmpl:250
+#: ../themes/fusionforge/templates/actionbar.tmpl:72
+#: ../themes/fusionforge/templates/userprefs.tmpl:248
 #, fuzzy
 msgid "Last Difference"
 msgstr "更新偏好設定"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/fusionforge/templates/actionbar.tmpl:81
 #, fuzzy
 msgid "Page Info"
 msgstr "PageInfo"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:78
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 #, fuzzy
 msgid "Back Links"
 msgstr "BackLinks"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:102
-#: ../themes/fusionforge/templates/userprefs.tmpl:272
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/userprefs.tmpl:270
 #, fuzzy
 msgid "Change Owner"
 msgstr "變更國家"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:107
-#: ../themes/fusionforge/templates/userprefs.tmpl:277
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
+#: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:119
+#: ../themes/fusionforge/templates/actionbar.tmpl:125
 #, fuzzy
 msgid "Purge"
 msgstr "PrevNext"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:126
-#, fuzzy
-msgid "Watch Page"
-msgstr "寬度"
-
 #: ../themes/fusionforge/templates/blogform.tmpl:24
 #: ../themes/fusionforge/templates/editpage.tmpl:81
 msgid "TextFormattingRules"
 msgstr "TextFormattingRules"
 
+#: ../themes/fusionforge/templates/browse.tmpl:8
+msgid "Error:"
+msgstr ""
+
+#: ../themes/fusionforge/templates/browse.tmpl:9
+#, fuzzy
+msgid "This revision of the page does not exist."
+msgstr "抱歉, 版本是 %d 的 %s 不在資料庫中."
+
 #: ../themes/fusionforge/templates/editpage.tmpl:64
 msgid "Make the page public?"
 msgstr ""
@@ -8666,64 +8675,117 @@
 msgid "Make the page external?"
 msgstr "選擇頁面以進行更名:"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:12
+#: ../themes/fusionforge/templates/navbar.tmpl:9
 #, fuzzy
+msgid "Home Page"
+msgstr "首頁"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:10
+#, fuzzy
+msgid "Recent Changes"
+msgstr "RecentChanges"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:11
+#, fuzzy
 msgid "SpecialPages"
 msgstr "傾印連續頁面"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/userprefs.tmpl:295
+#: ../themes/fusionforge/templates/navbar.tmpl:11
 #, fuzzy
+msgid "Special Pages"
+msgstr "傾印連續頁面"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:14
+#: ../themes/fusionforge/templates/userprefs.tmpl:288
+#, fuzzy
+msgid "Random Page"
+msgstr "RandomPage"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/userprefs.tmpl:293
+#, fuzzy
 msgid "Like Pages"
 msgstr "LikePages"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:194
-#: ../themes/fusionforge/templates/userprefs.tmpl:216
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #, fuzzy
+msgid "Wiki Admin"
+msgstr "WikiAdminChmod"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:25
+#, fuzzy
+msgid "My User Page"
+msgstr "使用者頁面"
+
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+#, fuzzy
+msgid "User Preferences"
+msgstr "UserPreferences"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:189
+#, fuzzy
+msgid "User preferences for this project"
+msgstr "使用者 '%s' 的偏好設定:"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:192
+#: ../themes/fusionforge/templates/userprefs.tmpl:214
+#, fuzzy
 msgid "E-mail Notification"
 msgstr "Email 驗證."
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:242
+#: ../themes/fusionforge/templates/userprefs.tmpl:210
+#, fuzzy
+msgid "Global user preferences (for all projects)"
+msgstr "使用者 '%s' 的偏好設定:"
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:240
 msgid "Menus"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:261
+#: ../themes/fusionforge/templates/userprefs.tmpl:244
+msgid "Top Menu"
+msgstr ""
+
+#: ../themes/fusionforge/templates/userprefs.tmpl:259
 msgid "PDF"
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:290
-#, fuzzy
-msgid "Random Page"
-msgstr "RandomPage"
+#: ../themes/fusionforge/templates/userprefs.tmpl:284
+msgid "Left Menu"
+msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:303
+#: ../themes/fusionforge/templates/userprefs.tmpl:301
 #, fuzzy
 msgid "Check menu items to display."
 msgstr "點擊以顯示"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:310
+#: ../themes/fusionforge/templates/userprefs.tmpl:308
 #, fuzzy
 msgid "Show Page Trail"
 msgstr "PageTrail"
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:312
+#: ../themes/fusionforge/templates/userprefs.tmpl:310
 msgid "Show Page Trail at top of page."
 msgstr ""
 
-#: ../themes/fusionforge/templates/userprefs.tmpl:315
+#: ../themes/fusionforge/templates/userprefs.tmpl:313
 msgid "Hide or show LinkIcons."
 msgstr ""
 
-#: ../themes/fusionforge/themeinfo.php:53
+#: ../themes/fusionforge/themeinfo.php:73
 #, fuzzy
 msgid "This page is external."
 msgstr "改變頁面 '%s' 權限為 '%s'."
 
-#: ../themes/fusionforge/themeinfo.php:55
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#: ../themes/fusionforge/themeinfo.php:75
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:76
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 msgid "Views"
@@ -8966,6 +9028,97 @@
 msgid "Edit old revision"
 msgstr "編輯舊修訂"
 
+#, fuzzy
+#~ msgid "Server rejected address: "
+#~ msgstr "移除選定頁面"
+
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "下一個"
+
+#, fuzzy
+#~ msgid "%s pages have been permanently changed:"
+#~ msgstr "%s pages 已經永久更名了."
+
+#, fuzzy
+#~ msgid "%s pages have been permanently removed:"
+#~ msgstr "%s pages 已經永久更名了."
+
+#, fuzzy
+#~ msgid "%s pages have been permanently renamed:"
+#~ msgstr "%s pages 已經永久更名了."
+
+#, fuzzy
+#~ msgid "Version %s, saved %s"
+#~ msgstr "版本 %s, 存於 %s."
+
+#~ msgid "NewMarkupTestPage"
+#~ msgstr "NewMarkupTestPage"
+
+#~ msgid "OldMarkupTestPage"
+#~ msgstr "OldMarkupTestPage"
+
+#~ msgid "PageGroupTest"
+#~ msgstr "PageGroupTest"
+
+#, fuzzy
+#~ msgid "PageGroupTest/Four"
+#~ msgstr "PageGroupTestFour"
+
+#, fuzzy
+#~ msgid "PageGroupTest/One"
+#~ msgstr "PageGroupTestOne"
+
+#, fuzzy
+#~ msgid "PageGroupTest/Three"
+#~ msgstr "PageGroupTestThree"
+
+#, fuzzy
+#~ msgid "PageGroupTest/Two"
+#~ msgstr "PageGroupTestTwo"
+
+#, fuzzy
+#~ msgid "PgsrcTranslation/de"
+#~ msgstr "PgsrcTranslation"
+
+#, fuzzy
+#~ msgid "PgsrcTranslation/fr"
+#~ msgstr "PgsrcTranslation"
+
+#, fuzzy
+#~ msgid "PgsrcTranslation/it"
+#~ msgstr "PgsrcTranslation"
+
+#, fuzzy
+#~ msgid "PgsrcTranslation/es"
+#~ msgstr "PgsrcTranslation"
+
+#, fuzzy
+#~ msgid "PgsrcTranslation/nl"
+#~ msgstr "PgsrcTranslation"
+
+#, fuzzy
+#~ msgid "PgsrcTranslation/sv"
+#~ msgstr "PgsrcTranslation"
+
+#, fuzzy
+#~ msgid "PgsrcTranslation/ja"
+#~ msgstr "PgsrcTranslation"
+
+#, fuzzy
+#~ msgid "PgsrcTranslation/zh"
+#~ msgstr "PgsrcTranslation"
+
+#~ msgid "%s b"
+#~ msgstr "%s b"
+
+#~ msgid "%s k"
+#~ msgstr "%s k"
+
+#, fuzzy
+#~ msgid "/Discussion"
+#~ msgstr "權限"
+
 #~ msgid "HasHomePage"
 #~ msgstr "HasHomePage"
 
@@ -9027,13 +9180,7 @@
 #~ msgid "The PhpWiki programming team"
 #~ msgstr "PhpWiki 開發團隊"
 
-# This entry is important for French punctuation rules which stipulate
-# a space before each colon.
 #, fuzzy
-#~ msgid "%s: "
-#~ msgstr "%s: %s"
-
-#, fuzzy
 #~ msgid "Page history"
 #~ msgstr "PageHistory"
 
@@ -9167,10 +9314,6 @@
 #~ msgstr "更名頁面 '%s' 為 '%s'."
 
 #, fuzzy
-#~ msgid "%d pages have been reverted."
-#~ msgstr "%s 頁面已經變更."
-
-#, fuzzy
 #~ msgid "PhpWikiAdministration/MassRevert"
 #~ msgstr "PhpWikiAdministration/Remove"
 
@@ -9180,10 +9323,6 @@
 #~ "version?"
 #~ msgstr "你確定你想要永久更名選定的檔案?"
 
-#, fuzzy
-#~ msgid "Revert selected pages"
-#~ msgstr "移除選定頁面"
-
 #~ msgid "Ok"
 #~ msgstr "確定"
 
@@ -9211,9 +9350,6 @@
 #~ msgid "LDAP_AUTH_HOST not defined"
 #~ msgstr "LDAP_AUTH_HOST 未定義"
 
-#~ msgid "db type:"
-#~ msgstr "db 型態:"
-
 #~ msgid "db backend:"
 #~ msgstr "db 後台:"
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/sv/LC_MESSAGES/phpwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,201 +1,110 @@
 <?php
 
-$locale["%4d  %s\n"] =
-   "%4d  %s\n";
-$locale["%d best incoming links: "] =
-   "De %d mest använda ingående länkarna: ";
-$locale["%d best outgoing links: "] =
-   "De %d mest använda utgående länkarna: ";
-$locale["%d most popular nearby: "] =
-   "De %d mest populära grannarna: ";
-$locale["%s at %s"] =
-   "%s i %s";
-$locale["%s days"] =
-   "%s dar";
-$locale["%s of this page"] =
-   "%s för den här sidan";
-$locale["%s: %s"] =
-   "%s: %s";
-$locale["%s: file not found"] =
-   "%s: fila ingen funna";
-$locale["(diff)"] =
-   "(diff)";
-$locale["1 day"] =
-   "1 dag";
-$locale["<no matches>"] =
-   "<ingen matchar>";
-$locale["Adjust"] =
-   "Justera";
-$locale["Calendar"] =
-   "Kalender";
-$locale["Cancel"] =
-   "Avbyrt";
-$locale["Complete."] =
-   "Komplett.";
-$locale["Contents"] =
-   "Innehåll";
-$locale["Describe %s here."] =
-   "Beskriv %s här.";
-$locale["Diff"] =
-   "Diff";
-$locale["Diff: %s"] =
-   "Diff av: %s";
-$locale["Edit"] =
-   "Redigera";
-$locale["Edit %s"] =
-   "Redigera %s";
-$locale["Edit: %s"] =
-   "Redigera: %s";
-$locale["EditText"] =
-   "RedigeraText";
-$locale["Empty pagename!"] =
-   "Ange ett sidnamn!";
-$locale["Fatal PhpWiki Error"] =
-   "PhpWiki Fatal Error";
-$locale["FindPage"] =
-   "SökEfterSida";
-$locale["Full text search results for '%s'"] =
-   "Sökresultat för fulltextsökning för '%s'";
-$locale["FullTextSearch"] =
-   "Fulltextsökning";
-$locale["Go"] =
-   "\"Gå till sidan\"";
-$locale["H"] =
-   "H";
-$locale["Height"] =
-   "Höjd";
-$locale["Hits"] =
-   "Träffar";
-$locale["Hits:"] =
-   "Träffar:";
-$locale["HomePage"] =
-   "Framsida";
-$locale["Included from %s"] =
-   "Insättning från %s";
-$locale["Last"] =
-   "Senaste";
-$locale["Last Author"] =
-   "Göregående Författare";
-$locale["Last Modified"] =
-   "Ändringsdatum";
-$locale["Last Summary"] =
-   "Senaste Kommentar";
-$locale["Last edited %s"] =
-   "Senast ändrad %s";
-$locale["Last edited on %s"] =
-   "Senast ändrad %s";
-$locale["Lock Page"] =
-   "Lås Sida";
-$locale["Locked"] =
-   "Låst";
-$locale["Modern"] =
-   "Ny|modig";
-$locale["MostPopular"] =
-   "MestPopulär";
-$locale["Next"] =
-   "Nästa";
-$locale["Next Month"] =
-   "Följande Månad";
-$locale["None"] =
-   "Ingen";
-$locale["Page Locked"] =
-   "Sidan är Låst";
-$locale["Page Name"] =
-   "Namn på Sidan";
-$locale["Preview"] =
-   "Översikt";
-$locale["Previous"] =
-   "Föregående";
-$locale["Previous Author"] =
-   "Göregående Författare";
-$locale["Previous Month"] =
-   "Föregående Månad";
-$locale["Printer"] =
-   "Skrivare";
-$locale["RecentChanges"] =
-   "SenasteÄndringar";
-$locale["Remove Page"] =
-   "Ta bort sida";
-$locale["Removed page '%s' successfully."] =
-   "Tog bort sidan '%s'.";
-$locale["Return to %s"] =
-   "Tillbaka till %s";
-$locale["Save"] =
-   "Spara";
-$locale["Saved: %s"] =
-   "Sparade: %s";
-$locale["Search"] =
-   "Sök";
-$locale["See %s tips for editing."] =
-   "%s: Redigeringstips.";
-$locale["Sign In"] =
-   "Anslut";
-$locale["Sign Out"] =
-   "Logga ut";
-$locale["Sorry for the inconvenience."] =
-   "Ledsen för allt besvär.";
-$locale["String \"%s\" not found."] =
-   "\"%s\" ingen funna.";
-$locale["Synopsis"] =
-   "Översikt";
-$locale["TextFormattingRules"] =
-   "Textformateringsregler";
-$locale["Thank you for editing %s."] =
-   "Tack för att du redigerade %s.";
-$locale["The %d most popular pages of this wiki:"] =
-   "De %d mest populära sidorna för den här wikin:";
-$locale["The %d most recent %s are listed below."] =
-   "De %d senaste %s sidorna listas nedan.";
-$locale["Time Zone"] =
-   "Timme Zon";
-$locale["Title Search"] =
-   "Titelsökningen";
-$locale["Title search results for '%s'"] =
-   "Sökresultat för titelsökningen för '%s'";
-$locale["TitleSearch"] =
-   "Titelsökningen";
-$locale["Unlock Page"] =
-   "Lås upp Sida";
-$locale["UserId"] =
-   "Namn";
-$locale["Version"] =
-   "Version";
-$locale["Version %d"] =
-   "Version %d";
-$locale["Version %s, saved %s"] =
-   "Version %s, sparade %s";
-$locale["Version %s, saved on %s"] =
-   "Version %s, sparade %s";
-$locale["Versions are identical"] =
-   "Versionerna är identiska";
-$locale["View Source"] =
-   "Visa Källkoden";
-$locale["View Source: %s"] =
-   "Visa Källkoden: %s";
-$locale["W"] =
-   "B";
-$locale["Width"] =
-   "Bredd";
-$locale["Your careful attention to detail is much appreciated."] =
-   "Din omstänksamhet för detaljer är mycket uppskattad.";
-$locale["by %s"] =
-   "av %s";
-$locale["current version"] =
-   "nuvarande version";
-$locale["diff"] =
-   "diff";
-$locale["from %s"] =
-   "från %s";
-$locale["locked"] =
-   "låst";
-$locale["revision by previous author"] =
-   "version från föregående författare";
-$locale["today"] =
-   "i dag";
-$locale["version %d"] =
-   "version %d";
-$locale["version %s"] =
-   "version %s";
+$locale["%4d  %s\n"] = "%4d  %s\n";
+$locale["%d best incoming links: "] = "De %d mest använda ingående länkarna: ";
+$locale["%d best outgoing links: "] = "De %d mest använda utgående länkarna: ";
+$locale["%d most popular nearby: "] = "De %d mest populära grannarna: ";
+$locale["%s at %s"] = "%s i %s";
+$locale["%s days"] = "%s dar";
+$locale["%s of this page"] = "%s för den här sidan";
+$locale["%s: %s"] = "%s: %s";
+$locale["%s: file not found"] = "%s: fila ingen funna";
+$locale["(diff)"] = "(diff)";
+$locale["1 day"] = "1 dag";
+$locale["<no matches>"] = "<ingen matchar>";
+$locale["Adjust"] = "Justera";
+$locale["Calendar"] = "Kalender";
+$locale["Cancel"] = "Avbyrt";
+$locale["Changes"] = "Ändringar";
+$locale["Complete."] = "Komplett.";
+$locale["Contents"] = "Innehåll";
+$locale["Describe %s here."] = "Beskriv %s här.";
+$locale["Diff"] = "Diff";
+$locale["Diff: %s"] = "Diff av: %s";
+$locale["Edit"] = "Redigera";
+$locale["Edit %s"] = "Redigera %s";
+$locale["Edit: %s"] = "Redigera: %s";
+$locale["EditText"] = "RedigeraText";
+$locale["Empty pagename!"] = "Ange ett sidnamn!";
+$locale["Fatal PhpWiki Error"] = "PhpWiki Fatal Error";
+$locale["FindPage"] = "SökEfterSida";
+$locale["Full text search results for '%s'"] = "Sökresultat för fulltextsökning för '%s'";
+$locale["FullTextSearch"] = "Fulltextsökning";
+$locale["Go"] = "\"Gå till sidan\"";
+$locale["H"] = "H";
+$locale["Height"] = "Höjd";
+$locale["Help"] = "Hjälp";
+$locale["Help/GoodStyle"] = "Hjälp/BraStil";
+$locale["Help/IncludePagePlugin"] = "Hjälp/SökEfterSida";
+$locale["Help/MoreAboutMechanics"] = "Hjälp/MerOmMekanismerna";
+$locale["Help/OldTextFormattingRules"] = "Hjälp/Textformateringsregler";
+$locale["Help/TextFormattingRules"] = "Hjälp/Textformateringsregler";
+$locale["Hits"] = "Träffar";
+$locale["Hits:"] = "Träffar:";
+$locale["HomePage"] = "Framsida";
+$locale["Included from %s"] = "Insättning från %s";
+$locale["Last"] = "Senaste";
+$locale["Last Author"] = "Göregående Författare";
+$locale["Last Modified"] = "Ändringsdatum";
+$locale["Last Summary"] = "Senaste Kommentar";
+$locale["Last edited %s"] = "Senast ändrad %s";
+$locale["Last edited on %s"] = "Senast ändrad %s";
+$locale["Lock Page"] = "Lås Sida";
+$locale["Locked"] = "Låst";
+$locale["Modern"] = "Ny|modig";
+$locale["MostPopular"] = "MestPopulär";
+$locale["Next"] = "Nästa";
+$locale["Next Month"] = "Följande Månad";
+$locale["None"] = "Ingen";
+$locale["Page Locked"] = "Sidan är Låst";
+$locale["Page Name"] = "Namn på Sidan";
+$locale["Preview"] = "Översikt";
+$locale["Previous"] = "Föregående";
+$locale["Previous Author"] = "Göregående Författare";
+$locale["Previous Month"] = "Föregående Månad";
+$locale["Printer"] = "Skrivare";
+$locale["RecentChanges"] = "SenasteÄndringar";
+$locale["Remove Page"] = "Ta bort sida";
+$locale["Removed page '%s' successfully."] = "Tog bort sidan '%s'.";
+$locale["Return to %s"] = "Tillbaka till %s";
+$locale["Save"] = "Spara";
+$locale["Saved: %s"] = "Sparade: %s";
+$locale["Search"] = "Sök";
+$locale["See %s tips for editing."] = "%s: Redigeringstips.";
+$locale["Sign In"] = "Anslut";
+$locale["Sign Out"] = "Logga ut";
+$locale["Sorry for the inconvenience."] = "Ledsen för allt besvär.";
+$locale["String \"%s\" not found."] = "\"%s\" ingen funna.";
+$locale["Synopsis"] = "Översikt";
+$locale["Table of Contents"] = "Innehåll";
+$locale["TextFormattingRules"] = "Textformateringsregler";
+$locale["Thank you for editing %s."] = "Tack för att du redigerade %s.";
+$locale["The %d most popular pages of this wiki:"] = "De %d mest populära sidorna för den här wikin:";
+$locale["The %d most recent %s are listed below."] = "De %d senaste %s sidorna listas nedan.";
+$locale["Time Zone"] = "Timme Zon";
+$locale["Title Search"] = "Titelsökningen";
+$locale["Title search results for '%s'"] = "Sökresultat för titelsökningen för '%s'";
+$locale["TitleSearch"] = "Titelsökningen";
+$locale["Unlock Page"] = "Lås upp Sida";
+$locale["UserId"] = "Namn";
+$locale["Version"] = "Version";
+$locale["Version %d"] = "Version %d";
+$locale["Version %s, saved on %s"] = "Version %s, sparade %s";
+$locale["Versions are identical"] = "Versionerna är identiska";
+$locale["View Source"] = "Visa Källkoden";
+$locale["View Source: %s"] = "Visa Källkoden: %s";
+$locale["W"] = "B";
+$locale["Width"] = "Bredd";
+$locale["Your careful attention to detail is much appreciated."] = "Din omstänksamhet för detaljer är mycket uppskattad.";
+$locale["by %s"] = "av %s";
+$locale["current version"] = "nuvarande version";
+$locale["diff"] = "diff";
+$locale["from %s"] = "från %s";
+$locale["locked"] = "låst";
+$locale["revision by previous author"] = "version från föregående författare";
+$locale["today"] = "i dag";
+$locale["version %d"] = "version %d";
+$locale["version %s"] = "version %s";
 $locale["yesterday"] =
    "i går";
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/Framsida
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/Framsida	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/Framsida	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,16 +1,16 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
+Date: Wed,  9 Mar 2011 18:04:46 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Framsida 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Framsida 7997 2011-03-15 17:26:17Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Framsida;
   flags="";
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-* Vad är WikiWikiWeb? En beskrivning av dess användning.
-* Lär dig [HurManAnvänderWiki] och lär dig att [LäggaTillSidor].
-* Använd [Sandlådan] för att experimentera med Wiki-sidor.
-* Signera gärna ditt namn i [Gästboken].
-* Se [SenasteÄndringar] för nya sidor och de senaste ändringarna.
-* Kolla vilken sida som är [MestPopulär].
-* Läs ReleaseNotes (på engelska).
+* Vad är [[Hjälp:WikiWikiWeb|WikiWikiWeb]]? En beskrivning av dess användning.
+* Lär dig [[Hjälp:HurManAnvänderWiki|HurManAnvänderWiki]] och lär dig att [[Hjälp:LäggaTillSidorLäggaTillSidor]].
+* Använd [[Sandlådan]] för att experimentera med Wiki-sidor.
+* Signera gärna ditt namn i [[Gästboken]].
+* Se [[SenasteÄndringar]] för nya sidor och de senaste ändringarna.
+* Kolla vilken sida som är [[MestPopulär]].
+* Läs [[ReleaseNotes]] (på engelska).

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/PhpWikiAdministration
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/PhpWikiAdministration	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/PhpWikiAdministration	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,127 +1,25 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
+Date: Tue, 15 Mar 2011 18:42:26 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PhpWikiAdministration 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PhpWikiAdministration 7998 2011-03-15 17:43:49Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
   flags=PAGE_LOCKED;
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-__Note__: Most of the actions on this page require administrative privileges.
-They won't work unless you have set an admin username and password in the PhpWiki config file.
-
------------
-==== Log In
-
-__[Log In | phpwiki:?action=login]__
-
-This allows you to login.
-While you are logged in you will be able to ''lock'', ''unlock'' and ''delete'' pages.
-You will also be able to edit ''locked'' pages.
-
-----------
-=== 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.
-
-[ Dump Pages | phpwiki:?action=dumpserial&directory=(/tmp/wikidump) ]
-
-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.
-
-[ Upload | phpwiki:?action=upload&file=50()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.
-
-[ Load | phpwiki:?action=loadfile&source=50(/tmp/wikidump) ]
-
------------
-=== Format of the files
-
-Currently the pages are stored, one per
-file, as MIME ([ RFC2045 | http://www.faqs.org/rfcs/rfc2045.html ]) e-mail
-([ RFC822 | http://www.faqs.org/rfcs/rfc822.html ]) 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.
-----
-PhpWikiDocumentation
-
-OLD TEXT
 == Detta fungerar bara om du är inloggad som ADMIN
 
 -----------
 
 ==== ZIP-filer av databasen
 
- __[ZIP Snapshot | phpwiki:zip=snapshot]__ : innehåller endast den senaste versionen
+ **[ZIP Snapshot | phpwiki:zip=snapshot]** : innehåller endast den senaste versionen
 
- __[ZIP Dump | phpwiki:?zip=all]__ : innehåller alla arkiverade versioner
+ **[ZIP Dump | phpwiki:?zip=all]** : innehåller alla arkiverade versioner
 
 De här länkarna leder till zipfilerna, som genereras direkt, och
 innehåller den senaste versionen av alla sidor på denna
-PhpWiki. Sidorna lagras, en per fil, som MIME (RFC2045)
+~PhpWiki. Sidorna lagras, en per fil, som MIME (RFC2045)
 e-postmeddelanden (RFC822), med "content type" application/x-phpwiki
 för den senaste versionen och multipart/mixed för den arkiverade
 versionen. I det senare fallet finns det en underdel (med "content
@@ -129,28 +27,24 @@
 ordning). Brevkroppen innehåller texten till sidan medan sidans
 metadata finns som parametrar till Content-Type i brevhuvudet.
 
------------
-
 ==== Ladda / Dumpa serialiserade sidor
 
 Här kan du ladda eller dumpa sidor av din Wiki i valfri katalog.
 
-__Dump__
+**Dump**
 
 %%ADMIN-INPUT-dumpserial-Dumpa_serialiserade_sidor%%
 
 Sidor kommer att skrivas som serialiserade strängar av PHP-associativa
 vektorer, vilket betyder att de inte är läsbara. Om katalogen inte
-existerar kommer PhpWiki att försöka skapa en åt dig. Se till att din
+existerar kommer ~PhpWiki att försöka skapa en åt dig. Se till att din
 webbserver har skrivrättigheter i katalogen!
 
-__Ladda__
+**Ladda**
 
 %%ADMIN-INPUT-loadserial-Ladda_serialiserade_sidor%%
 
-Om du har dumpat en mängd med sidor från PhpWiki kan du ladda dem här.
+Om du har dumpat en mängd med sidor från ~PhpWiki kan du ladda dem här.
 Observera att sidorna i din databas kommer att skrivas över. Om du
 vill kan du bara ta bort de sidor från katalogen som du inte vill
 ladda.
-
------------

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/S%C3%B6kEfterSida
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/S%C3%B6kEfterSida	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/S%C3%B6kEfterSida	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
+Date: Tue, 15 Mar 2011 16:40:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: S%C3%B6kEfterSida 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: S%C3%B6kEfterSida 7993 2011-03-15 15:41:55Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=S%C3%B6kEfterSida;
   flags=PAGE_LOCKED;
@@ -9,11 +9,11 @@
 
 Här är några bra startpunkter för att leta.
 
-* [HurManAnvänderWiki] är en snabb introduktion till hur man skriver i Wiki.
-* [SenasteÄndringar] ändras automatiskt.
-* MerOmMekanismerna om hur man söker och ändrar på den här servern.
+* [[HurManAnvänderWiki]] är en snabb introduktion till hur man skriver i Wiki.
+* [[SenasteÄndringar]] ändras automatiskt.
+* [[MerOmMekanismerna]] om hur man söker och ändrar på den här servern.
 
-Här är titelsökningen. Försök med ord wom ''wiki'' eller ''smörgås''.
+Här är titelsökningen. Försök med ord wom //wiki// eller //smörgås//.
 
 <?plugin-form TitleSearch?>
 
@@ -27,4 +27,4 @@
 Separera ord med mellanslag. Alla ord måste matcha.
 %%%För att exkludera ord sätt ett "-" framför.
 %%%Exempel: "wiki text -php" söker på alla sidor som innehåller orden "wiki"
-__och__ "text", men __inte__ innehåller ordet "php".
+**och** "text", men **inte** innehåller ordet "php".

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/Senaste%C3%84ndringar
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/Senaste%C3%84ndringar	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/sv/pgsrc/Senaste%C3%84ndringar	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,13 +1,13 @@
-Date: Fri, 10 Sep 2010 13:48:48 +0000
+Date: Tue, 15 Mar 2011 16:40:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Senaste%C3%84ndringar 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Senaste%C3%84ndringar 7993 2011-03-15 15:41:55Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Senaste%C3%84ndringar;
   flags=PAGE_LOCKED;
   markup=2;
 Content-Transfer-Encoding: binary
 
-Here's a list of recently changed pages on this wiki. (See RecentEdits for all recent minor edits and changes).
+Here's a list of recently changed pages on this wiki. (See [[RecentEdits]] for all recent minor edits and changes).
 
 --------
 <<RecentChanges days||=7 daylist=1,3,7,30,90,0 >>

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/zh/LC_MESSAGES/phpwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,1657 +1,785 @@
 <?php
 
-$locale["  %d%% (%d/%d)"] =
-   "  %d%% (%d/%d)";
-$locale[" ... around %s"] =
-   "... 包圍 %s";
-$locale[" ... first %d bytes"] =
-   " ... 頭 %d bytes";
-$locale[" ... first %d lines"] =
-   " ... 頭 %d 列";
-$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] =
-   " 除此之外, 試著保存最近 %d 天之內所有作者的最新貢獻 (即使超過他們的 %d ,) 但是沒保存超過 %d 份單一作者修訂.";
-$locale[" Keep the latest contributions of the last %d authors up to %d days."] =
-   "保存最後 %d 位作者的最新貢獻直到 %d 天.";
-$locale[" Keep up to %d minor edits, but keep them no longer than %d days."] =
-   "保持 %d 份次要編輯,但不超過 %d 天.";
-$locale["%4d  %s\n"] =
-   "%4d  %s\n";
-$locale["%d UserPreferences fields successfully updated."] =
-   "%d UserPreference 欄位已成功地更新.";
-$locale["%d homepages"] =
-   "%d 個主頁";
-$locale["%d minutes"] =
-   "%d 分鐘";
-$locale["%d not-empty pages"] =
-   "%d 個非空白頁面";
-$locale["%d online users"] =
-   "%d 位使用者正在線上";
-$locale["%d page(s) with more than %d hits (>%d%%)."] =
-   "%d 個頁面超過 %d 個擊閱數(>%d%%).";
-$locale["%d pages"] =
-   "%d 個頁面";
-$locale["%d pages with less than %d hits (<%d%%)."] =
-   "%d 個頁面少於 %d 個擊閱數(<%d%%).";
-$locale["%s Kb (%s bytes)"] =
-   "%s Kb (%s bytes)";
-$locale["%s already exists"] =
-   "%s 已經存在";
-$locale["%s at %s"] =
-   "%s 在 %s";
-$locale["%s b"] =
-   "%s b";
-$locale["%s by %s"] =
-   "%s 被 %s";
-$locale["%s bytes"] =
-   "%s bytes";
-$locale["%s bytes written"] =
-   "已寫入 %s bytes";
-$locale["%s days"] =
-   "%s 天";
-$locale["%s does not appear to be a WikiPlugin."] =
-   "%s 看起來不是 WikiPlugin.";
-$locale["%s does not know about the language '%s', using 'en' instead."] =
-   "%s 不認識此語言 '%s', 使用 'en' 代替.";
-$locale["%s is disallowed on this wiki."] =
-   "在此 wiki 上, %s 是被禁止的.";
-$locale["%s is empty"] =
-   "%s 是空白";
-$locale["%s is empty."] =
-   "%s 是空白的.";
-$locale["%s is not writable."] =
-   "%s 無法寫入.";
-$locale["%s is only allowed in locked pages."] =
-   "%s 只允許在鎖定的頁面中.";
-$locale["%s k"] =
-   "%s k";
-$locale["%s not found"] =
-   "%s 找不到.";
-$locale["%s of this page"] =
-   "此頁面的 %s";
-$locale["%s or %s parameter missing"] =
-   "%s 或 %s 參數遺漏";
-$locale["%s pages have been changed."] =
-   "%s 頁面已經變更.";
-$locale["%s pages link to %s:"] =
-   "%s 個頁面連結到 %s:";
-$locale["%s pages would link to %s:"] =
-   "%s 個頁面可能連結到 %s:";
-$locale["%s parameter missing"] =
-   "%s 參數遺漏";
-$locale["%s words"] =
-   "共 %s 字";
-$locale["%s(%d): no such revision"] =
-   "%s(%d): 沒有這個修訂.";
-$locale["%s: %s"] =
-   "%s: %s";
-$locale["%s: Bad action"] =
-   "%s: 錯誤的動作";
-$locale["%s: Can't open dba database"] =
-   "%s: 無法開啟 dba 資料庫";
-$locale["%s: Date of new revision is %s"] =
-   "%s: 新版本的日期是 %s";
-$locale["%s: argument index out of range"] =
-   "%s: 引數索引超出範圍";
-$locale["%s: error while handling error:"] =
-   "%s: 處理錯誤時發生錯誤";
-$locale["%s: file not found"] =
-   "%s: 找不到檔案.";
-$locale["%s: no such class"] =
-   "%s: 無此類別";
-$locale["%s: not defined"] =
-   "%s: 未被定義";
-$locale["'%s': Bad page name"] =
-   "'%s': 錯誤的頁面名稱";
-$locale["'%s': Bad page name: %s"] =
-   "'%s': 錯誤頁面名稱: %s";
-$locale["'%s': corrupt file"] =
-   "'%s': 壞檔";
-$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] =
-   "(複製你的更動到剪貼簿中. 你可以試著編輯另一個不同的頁面或存到文字編輯器中.)";
-$locale["(Redirected from %s)"] =
-   "(已從 %s 重導向)";
-$locale["(Your preferences are stored as hidden data within this page)."] =
-   "(你的偏好設定已經存放並隱藏在此頁面中).";
-$locale["(diff)"] =
-   "(差異)";
-$locale["(disable individual page permissions, enable inheritance)?"] =
-   "(禁制個別網頁的權限,使用繼承)?";
-$locale["(max. recursion level: %d)"] =
-   "(最大遞迴層級: %d)";
-$locale["(ugo : rwx)"] =
-   "(ugo : rwx)";
-$locale["- saved to database as version %d"] =
-   "- 已經以版本 %d 存入資料庫中";
-$locale["-???"] =
-   "-???";
-$locale["... copied to %s"] =
-   "... 複製到 %s";
-$locale["... not found"] =
-   "... 沒找到";
-$locale["1 day"] =
-   "1 天";
-$locale["1 word"] =
-   "1 個單字";
-$locale["<%s: no such section>"] =
-   "<%s: 沒有此部份>";
-$locale["<empty>"] =
-   "<空白>";
-$locale["<no matches>"] =
-   "<沒有相符>";
-$locale["<none>"] =
-   "<無>";
-$locale["<not displayed>"] =
-   "<未能顯示>";
-$locale["<system language>"] =
-   "<系統語言>";
-$locale["<system theme>"] =
-   "<系統佈景主題>";
-$locale["<unknown>"] =
-   "<未知的>";
-$locale["A plugin to provide for raw HTML within wiki pages."] =
-   "用來在 wiki 頁面提供 raw HTML的 plugin.";
-$locale["A required argument '%s' is missing."] =
-   "缺少引數 '%s'.";
-$locale["ACCESS DENIED: You must log in to upload files."] =
-   "拒絕存取: 請先登入才能上傳檔案";
-$locale["ACL"] =
-   "ACL";
-$locale["Action page"] =
-   "動作頁面";
-$locale["Add %s hours to the server's local time when reporting times."] =
-   "當回報時間時,在伺服器的本地時間加上 %s 個小時.";
-$locale["AddComment"] =
-   "AddComment";
-$locale["AddCommentPlugin"] =
-   "AddCommentPlugin";
-$locale["AddingPages"] =
-   "AddingPages";
-$locale["Adjust"] =
-   "調整";
-$locale["Admin"] =
-   "管理者";
-$locale["Admin is also online."] =
-   "Admin 也在線上.";
-$locale["Administrators"] =
-   "管理者";
-$locale["All %s are listed below."] =
-   "所有 %s 已被列在下面.";
-$locale["AllPages"] =
-   "AllPages";
-$locale["AllUsers"] =
-   "AllUsers";
-$locale["Allowed protocols"] =
-   "允許的協定";
-$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] =
-   "允許選擇多個已傳遞的頁面到其他 WikiAdmin plugin.";
-$locale["Also pages which have been deleted at least %s days."] =
-   "也列出過去 %s 天被刪除的頁面.";
-$locale["An unnamed PhpWiki"] =
-   "未被命名的 PhpWiki";
-$locale["Anonymous Users"] =
-   "Anonymous 使用者";
-$locale["Appearance"] =
-   "Appearance";
-$locale["Application name"] =
-   "應用程式名稱";
-$locale["Application size: %d Kb"] =
-   "應用程式大小: %d Kb";
-$locale["Are you sure you want to permanently change the selected files?"] =
-   "你確定你想要永久變更選定的檔案?";
-$locale["Are you sure you want to permanently remove the selected files?"] =
-   "你確定你想要永久移除選定的檔案?";
-$locale["Arguments"] =
-   "引數";
-$locale["Attempting to use the directory '%s' instead."] =
-   "試圖改用目錄 '%s'.";
-$locale["Auth Level"] =
-   "認證層級";
-$locale["Auth Method"] =
-   "認證方式";
-$locale["Authenticated Users"] =
-   "已認證的使用者";
-$locale["Authenticated as %s"] =
-   "認證為 %s";
-$locale["Authenticated users on this wiki (%d total):"] =
-   "在此 wiki 上被確認的使用者 (共 %d):";
-$locale["Author"] =
-   "作者";
-$locale["Author will be logged as %s."] =
-   "作者將登入為 %s.";
-$locale["AuthorHistory"] =
-   "作者歷程";
-$locale["AuthorHistoryPlugin"] =
-   "AuthorHistoryPlugin";
-$locale["Available plugins"] =
-   "可用的 plugin";
-$locale["BAD URL -- remove all of <, >, \""] =
-   "錯誤 URL -- 移除所有的 <, >, \"";
-$locale["BAD phpwiki: URL"] =
-   "錯誤 phpwiki: URL";
-$locale["BackLinks"] =
-   "BackLinks";
-$locale["BackLinks for %s"] =
-   "向後連結: %s";
-$locale["Bad Version"] =
-   "錯誤的版本";
-$locale["Bad file type: %s"] =
-   "錯誤的檔案型態: %s";
-$locale["Bad url in src: remove all of <, >, \""] =
-   "在 src 中錯誤的 url: 移除所有的 <, .>, \"";
-$locale["Blog page"] =
-   "Blog 頁面";
-$locale["Bogo Users"] =
-   "Bogo 使用者";
-$locale["Browsing pages"] =
-   "瀏覽頁面";
-$locale["Cache statistics"] =
-   "快取統計";
-$locale["Calendar"] =
-   "月曆";
-$locale["CalendarList"] =
-   "月曆列表";
-$locale["CalendarListPlugin"] =
-   "CalendarListPlugin";
-$locale["CalendarPlugin"] =
-   "CalendarPlugin";
-$locale["Can't inflate data: zlib support not enabled in this PHP"] =
-   "無法壓縮資料: 此 PHP 的 zlib 支援未被啟動";
-$locale["Can't mix '%s' with '%s' type format strings"] =
-   "無法混合 '%s' 和 '%s' 型態的格式字串.";
-$locale["Can't open zip file '%s' for reading"] =
-   "無法開啟 zip 檔案 '%s' 進行讀取";
-$locale["Cancel"] =
-   "取消";
-$locale["Cannot create directory '%s'"] =
-   "無法建立目錄 '%s'";
-$locale["Cannot open AUTH_GROUP_FILE %s"] =
-   "無法開啟 AUTH_GROUP_FILE %s";
-$locale["CategoryCategory"] =
-   "CategoryCategory";
-$locale["CategoryGroup"] =
-   "CategoryGroup";
-$locale["CategoryHomePages"] =
-   "CategoryHomePages";
-$locale["CategoryHomepage"] =
-   "分類首頁";
-$locale["CategoryPage"] =
-   "CategoryPage";
-$locale["Change Password"] =
-   "改變密碼";
-$locale["Change Verification Status"] =
-   "改變確認狀態";
-$locale["Change country"] =
-   "變更國家";
-$locale["Change page attributes"] =
-   "變更頁面屬性";
-$locale["Change pagename in all linked pages also?"] =
-   "也在所有連結到的頁面裡變更頁面名稱?";
-$locale["Check any two boxes then %s."] =
-   "任找兩個空格打勾然後 %s.";
-$locale["Check any two boxes to compare revisions."] =
-   "任找兩個空格打勾以進行比較修訂.";
-$locale["Chmod"] =
-   "Chmod";
-$locale["Chmod to permission:"] =
-   "改變權限為:";
-$locale["Click to authenticate as %s"] =
-   "點擊以 %s 進行驗證.";
-$locale["Click to de-/select all pages"] =
-   "點擊以取消選擇或選擇所有頁面";
-$locale["Click to display"] =
-   "點擊以顯示";
-$locale["Click to reverse sort order"] =
-   "點擊以反轉排列順序";
-$locale["Click to sort by %s"] =
-   "點擊以 %s 排序";
-$locale["Columns: %s."] =
-   "行: %s.";
-$locale["Comment"] =
-   "意見";
-$locale["Comment modified on %s by %s"] =
-   "意見在 %s 被 %s 變更";
-$locale["CommentPlugin"] =
-   "CommentPlugin";
-$locale["Comments"] =
-   "意見";
-$locale["Complete."] =
-   "完成";
-$locale["Conflicting Edits!"] =
-   "發生衝突!";
-$locale["Content"] =
-   "內容";
-$locale["Contents"] =
-   "內容";
-$locale["ContributedTranslations"] =
-   "ContributedTranslations";
-$locale["Control characters not allowed"] =
-   "控制字元是不被允許的";
-$locale["Convert text into a png image using GD."] =
-   "使用 GD 轉換文字為 png 圖片";
-$locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] =
-   "轉換 TeX 為圖片. 可以用來在 PhpWiki 嵌入方程式.";
-$locale["Couldn't chmod page '%s' to '%s'."] =
-   "無法為頁面 '%s' 變更權限為 '%s'.";
-$locale["Couldn't rename page '%s' to '%s'."] =
-   "無法更名頁面 '%s' 為 '%s'.";
-$locale["Count"] =
-   "計數";
-$locale["Create a Wiki page by the provided name."] =
-   "以提供的名稱建立 Wiki 頁面.";
-$locale["Create a Wiki page."] =
-   "建立 Wiki 頁面";
-$locale["Create a new (sub)page"] =
-   "建立新(子)頁面";
-$locale["Create: %s"] =
-   "建立: %s";
-$locale["CreatePage"] =
-   "CreatePage";
-$locale["CreateToc"] =
-   "CreateToc";
-$locale["CreateTocPlugin"] =
-   "CreateTocPlugin";
-$locale["Created by CreatePage"] =
-   "由 CreatePage 建立";
-$locale["Created directory '%s' for the page dump..."] =
-   "為頁面傾印建立目錄 '%s'...";
-$locale["Creating pages"] =
-   "建立頁面";
-$locale["Creator"] =
-   "建立者";
-$locale["Current Language"] =
-   "目前語言";
-$locale["Current Theme"] =
-   "目前佈景主題";
-$locale["Current language: '%s'"] =
-   "目前語言: '%s'";
-$locale["Current theme: '%s'"] =
-   "目前佈景主題: '%s'";
-$locale["Database"] =
-   "資料庫";
-$locale["Date Format"] =
-   "日期格式";
-$locale["DebugInfo"] =
-   "DebugInfo";
-$locale["Default InterWiki map file not loaded."] =
-   "預設 InterWiki map 檔案未能載入.";
-$locale["Default language: '%s'"] =
-   "預設語言: '%s'";
-$locale["Default preferences will be used."] =
-   "預設偏好設定將被使用.";
-$locale["Default theme: '%s'"] =
-   "預設佈景主題: '%s'";
-$locale["Define a translation for a specified text"] =
-   "為特定文字定義轉換.";
-$locale["Define the translation for %s in %s"] =
-   "為 %s 定義轉換,在 %s";
-$locale["Deleted %s pages with invalid names:"] =
-   "刪除 %s 個錯誤名稱的頁面:";
-$locale["Describe %s here."] =
-   "在這兒描述 %s.";
-$locale["Description"] =
-   "描述";
-$locale["Dialog"] =
-   "對話盒";
-$locale["Diff"] =
-   "差異";
-$locale["Diff previous Author"] =
-   "與上個作者做比對";
-$locale["Diff previous Revision"] =
-   "與上個修訂做比對";
-$locale["Diff: %s"] =
-   "差異: %s";
-$locale["Differences between %s and %s of %s."] =
-   "在 %s 與 %s 間的差異 - %s.";
-$locale["Diffing pages"] =
-   "比對頁面差異";
-$locale["Display arbitrary SQL result tables"] =
-   "顯示不受限制的 SQL 結果表格";
-$locale["Display differences between revisions"] =
-   "顯示修訂間的差異";
-$locale["Display general and user specific auth information."] =
-   "顯示一般與使用者特定認證資訊.";
-$locale["Displays a list of randomly chosen pages or redirects to a random page."] =
-   "顯示隨機選出的頁面列表或重導向到隨機選取的頁面.";
-$locale["Displays a set of photos listed in a text file with optional descriptions"] =
-   "顯示帶有簡單描述的文字檔內的相片集合";
-$locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] =
-   "在內容的分離框架中顯示 url. 只能放一個框架.";
-$locale["Don't cache this page."] =
-   "不要快取此頁面.";
-$locale["Double redirect not allowed."] =
-   "雙重重導向是不允許的.";
-$locale["Download for CVS"] =
-   "給 CVS 的下載";
-$locale["Download for backup"] =
-   "給備份用的下載";
-$locale["Downloading html zip dumps"] =
-   "下載 html zip dumps";
-$locale["Downloading zip dumps"] =
-   "下載 zip dumps";
-$locale["Dump Pages"] =
-   "傾印頁面";
-$locale["Dump Pages as XHTML"] =
-   "傾印頁面為 XHTML";
-$locale["Dumping Pages"] =
-   "傾印頁面中";
-$locale["Dumping html pages"] =
-   "傾印 html 頁面";
-$locale["Dumping serial pages"] =
-   "傾印連續頁面";
-$locale["E-Mail"] =
-   "E-Mail";
-$locale["E-mail"] =
-   "E-mail";
-$locale["Easy navigation buttons for %s"] =
-   "簡單的巡覽按鈕 - %s";
-$locale["Edit"] =
-   "編輯";
-$locale["Edit %s"] =
-   "編輯 %s";
-$locale["Edit Area Size"] =
-   "編輯區域大小";
-$locale["Edit Old Revision"] =
-   "編輯舊的修訂";
-$locale["Edit aborted."] =
-   "編輯中止.";
-$locale["Edit metadata for %s"] =
-   "為 %s 編輯中繼資料";
-$locale["Edit old revision"] =
-   "編輯舊修訂";
-$locale["Edit this page"] =
-   "編輯此頁面";
-$locale["Edit this page and all subpages"] =
-   "編輯此頁面以及所有子頁面";
-$locale["Edit: %s"] =
-   "編輯: %s";
-$locale["EditMetaData"] =
-   "編輯中繼資料";
-$locale["EditMetaDataPlugin"] =
-   "EditMetaDataPlugin";
-$locale["EditText"] =
-   "EditText";
-$locale["Edited by: %s"] =
-   "由 %s 編輯";
-$locale["Editing pages"] =
-   "編輯頁面";
-$locale["Elapsed time: %s s"] =
-   "經過時間: %s s";
-$locale["Email Verification"] =
-   "Email 驗證.";
-$locale["Email not yet verified."] =
-   "Email 尚未被驗證.";
-$locale["Email verified."] =
-   "Email 已被驗證.";
-$locale["Embed hidden comments in WikiPages."] =
-   "在 Wiki頁面嵌入隱藏意見.";
-$locale["Empty Preferences or format of UserPreferences cookie not recognised."] =
-   "空的偏好設定或 UserPreferences cookie 格式無法辨認.";
-$locale["Empty link to: %s"] =
-   "沒有連結到: %s";
-$locale["Empty pagename!"] =
-   "空白的頁面名稱!";
-$locale["Enable configurable polls"] =
-   "啟動設定好的投票";
-$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] =
-   "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing).";
-$locale["Enter your UserId to sign in"] =
-   "輸入你的帳號進行簽入";
-$locale["Error: Empty search string."] =
-   "錯誤: 空白的搜尋字串.";
-$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] =
-   "錯誤: 使用者的首頁必須是一個合法的 WikiWord. 抱歉, UserPreferences 無法儲存.";
-$locale["Every"] =
-   "每";
-$locale["Expiry parameters"] =
-   "過期參數";
-$locale["External Links"] =
-   "外部連結";
-$locale["ExternalSearch"] =
-   "外部搜尋";
-$locale["ExternalSearchPlugin"] =
-   "ExternalSearchPlugin";
-$locale["Fatal PhpWiki Error"] =
-   "致命的 PhpWiki 錯誤";
-$locale["File successfully uploaded."] =
-   "檔案已經成功地上傳.";
-$locale["FindPage"] =
-   "FindPage";
-$locale["First"] =
-   "開頭";
-$locale["FrameInclude"] =
-   "FrameInclude";
-$locale["FrameIncludePlugin"] =
-   "FrameIncludePlugin";
-$locale["From english to %s: "] =
-   "從英文到 %s:";
-$locale["Full text search results for '%s'"] =
-   "以 '%s' 全文搜尋的結果";
-$locale["FullDump"] =
-   "完整傾印";
-$locale["FullRecentChanges"] =
-   "FullRecentChanges";
-$locale["FullTextSearch"] =
-   "FullTextSearch";
-$locale["FuzzyPages"] =
-   "FuzzyPages";
-$locale["General Auth Settings"] =
-   "一般認證設定";
-$locale["Get an email notification at changes of the following pages:"] =
-   "在變更下列頁面時取得 email 通知:";
-$locale["Get debugging information for %s."] =
-   "為 %s 取得除錯資訊.";
-$locale["Get preferences information for current user %s."] =
-   "為目前使用者 %s 取得偏好設定資訊.";
-$locale["Go"] =
-   "Go";
-$locale["Go to or create page."] =
-   "前往或建立頁面.";
-$locale["GoTo"] =
-   "GoTo";
-$locale["GooglePlugin"] =
-   "GooglePlugin";
-$locale["Group %s does not exist"] =
-   "群組 %s 不存在";
-$locale["Guest"] =
-   "訪客";
-$locale["Guests"] =
-   "訪客";
-$locale["H"] =
-   "高";
-$locale["Height"] =
-   "高度";
-$locale["HelloWorld"] =
-   "HelloWorld";
-$locale["HelloWorldPlugin"] =
-   "HelloWorldPlugin";
-$locale["Here you can override site-specific default values."] =
-   "你可以在這裡覆寫掉站台預設的值.";
-$locale["Hide %s:"] =
-   "隱藏 %s:";
-$locale["Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections."] =
-   "隱藏或顯示連結圖示 (如果目前佈景主題有支援). 只有在瀏覽器認為頻寬過慢的情況下被使用.";
-$locale["History of all major and minor edits by %s to page %s."] =
-   "所有被 %s 修改的主要和次要修訂歷程 - 頁面 %s.";
-$locale["History of all major and minor modifications for any page edited by %s."] =
-   "被 %s 修改的所有頁面的主要與次要變更歷程.";
-$locale["History of changes."] =
-   "變更的歷程.";
-$locale["Hit statistics"] =
-   "擊閱數統計";
-$locale["Hits"] =
-   "點擊";
-$locale["Hits:"] =
-   "點擊數:";
-$locale["HomePage"] =
-   "首頁";
-$locale["HomePageAlias"] =
-   "HomePageAlias";
-$locale["HowToUseWiki"] =
-   "HowToUseWiki";
-$locale["I'm just doing minor edits. Please divert the usual logging to %s instead."] =
-   "我正在做次要編輯. 請轉移常用日誌到替代的 %s.";
-$locale["I'm sorry, there is no such page as %s."] =
-   "抱歉,這裡沒有任何被命名為 %s 的頁面.";
-$locale["I'm sorry.  Version %d of %s is not in the database."] =
-   "抱歉, 版本是 %d 的 %s 不在資料庫中.";
-$locale["Image loaded from cache file: %s"] =
-   "影像已從快取檔案: %s 載入";
-$locale["Image saved to cache file: %s"] =
-   "影像存於快取檔案: %s";
-$locale["In the time since you started editing this page, another user has saved a new version of it."] =
-   "從你上次修改這個頁面到現在的這段時間,已經有使用者儲存了較新的版本.";
-$locale["Include an external web page within the body of a wiki page."] =
-   "含括外部網頁到 wiki 頁面的內容中.";
-$locale["Include recursively all linked pages starting at %s"] =
-   "遞迴地含括所有從 %s 開始有連結到的網頁.";
-$locale["Include text from another wiki page."] =
-   "從其他 wiki 頁面含括文字.";
-$locale["IncludePage"] =
-   "含括頁面";
-$locale["IncludePagePlugin"] =
-   "IncludePagePlugin";
-$locale["IncludeSiteMap"] =
-   "IncludeSiteMap";
-$locale["Included from %s"] =
-   "從 %s 含括進來";
-$locale["Included from %s:"] =
-   "已從 %s 含括:";
-$locale["Includes the content of all SubPages of the current page."] =
-   "含括目前頁面所有子頁面的內容.";
-$locale["Index"] =
-   "索引";
-$locale["Info"] =
-   "Info";
-$locale["Inline images"] =
-   "Inline 圖片";
-$locale["Insufficient permissions."] =
-   "權限不足.";
-$locale["InterWiki"] =
-   "InterWiki";
-$locale["InterWiki Address"] =
-   "InterWiki 位址";
-$locale["InterWikiMap"] =
-   "InterWikiMap";
-$locale["InterWikiSearch"] =
-   "InterWikiSearch";
-$locale["Invalid chmod string"] =
-   "錯誤的 chmod 字串";
-$locale["Invalid color: %s"] =
-   "錯誤的顏色值: %s";
-$locale["Invalid password or userid."] =
-   "錯誤的密碼或使用者帳號.";
-$locale["JabberPresence"] =
-   "JabberPresence";
-$locale["Keep up to %d major edits, but keep them no longer than %d days."] =
-   "保持 %d 份主要編輯,但不超過 %d 天.";
-$locale["Language"] =
-   "語言";
-$locale["Last"] =
-   "最後";
-$locale["Last Author"] =
-   "最後一位修改的作者";
-$locale["Last Modified"] =
-   "最後修改";
-$locale["Last Summary"] =
-   "最後摘要";
-$locale["LatestSnapshot"] =
-   "最新快照";
-$locale["Layout tables using a very rich markup style."] =
-   "使用豐富標記風格進行佈局的表格.";
-$locale["Layout tables using the old markup style."] =
-   "使用舊標記風格佈局的表格.";
-$locale["Leading %s not allowed"] =
-   "前面的 %s 是不被允許的";
-$locale["Legend"] =
-   "圖例";
-$locale["LikePages"] =
-   "LikePages";
-$locale["LinkIcons"] =
-   "LinkIcons";
-$locale["List PageHistory for %s"] =
-   "列出 PageHistory (頁面歷程) - %s";
-$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."] =
-   "列出所有被使用者編輯的頁面修訂,並帶有差異連結,或顯示像是頁面歷程的單一頁面列表.";
-$locale["List all pages in this wiki."] =
-   "在此 wiki 列出所有頁面.";
-$locale["List all pages which link to %s."] =
-   "列出所有連結到 %s 的頁面.";
-$locale["List page names which share an initial or final title word with '%s'."] =
-   "列出分享為 '%s' 開頭或結尾的標題字的頁面名稱";
-$locale["List pages which are not linked to by any other page."] =
-   "列出未被其他頁面連結到的頁面.";
-$locale["List the most popular pages."] =
-   "列出最受歡迎的頁面.";
-$locale["List this page and all subpages"] =
-   "列出所有頁面以及子頁面";
-$locale["ListSubpages"] =
-   "ListSubpages";
-$locale["Lists referenced page names which do not exist yet."] =
-   "列出還未存在的頁面名稱.";
-$locale["Lists the names of all SubPages of the current page."] =
-   "列出目前頁面的所有子頁面名稱.";
-$locale["Load File"] =
-   "載入檔案";
-$locale["Loading '%s'"] =
-   "載入 '%s'";
-$locale["Loading InterWikiMap from external file %s."] =
-   "從外部檔案 %s 載入 InterWikiMap";
-$locale["Loading files"] =
-   "載入檔案";
-$locale["Loading up virgin wiki"] =
-   "載入原始 wiki";
-$locale["Lock Page"] =
-   "鎖定頁面";
-$locale["Lock page to enable link"] =
-   "鎖定頁面以打開此連結";
-$locale["Locked"] =
-   "已鎖定";
-$locale["Locking pages"] =
-   "鎖定頁面";
-$locale["Login"] =
-   "登入";
-$locale["MIME file %s"] =
-   "MIME 檔案 %s";
-$locale["MagicPhpWikiURLs"] =
-   "MagicPhpWikiURLs";
-$locale["Make use of the Google API"] =
-   "Make use of the Google API";
-$locale["Markup"] =
-   "標記";
-$locale["Markup cache purged!"] =
-   "標記快取已經清除!";
-$locale["Markup:"] =
-   "標記";
-$locale["Merge Edit"] =
-   "合併編輯";
-$locale["Merge and Edit: %s"] =
-   "合併並離開: %s";
-$locale["Method '%s' not implemented in this GROUP_METHOD %s"] =
-   "方法 '%s' 未實作在 GROUP_METHOD %s";
-$locale["Minor"] =
-   "次要";
-$locale["Minor Edit"] =
-   "次要編輯";
-$locale["Missing %s for %s"] =
-   "遺失了 %s 的 %s";
-$locale["Modern"] =
-   "Modern";
-$locale["Modified"] =
-   "已變更";
-$locale["Moniker"] =
-   "名字";
-$locale["MoreAboutMechanics"] =
-   "MoreAboutMechanics";
-$locale["MostPopular"] =
-   "MostPopular";
-$locale["Name"] =
-   "名稱";
-$locale["New comment."] =
-   "新意見.";
-$locale["New password"] =
-   "新密碼";
-$locale["New users may use an empty password."] =
-   "新使用者可以使用空白密碼.";
-$locale["NewMarkupTestPage"] =
-   "NewMarkupTestPage";
-$locale["Newer page:"] =
-   "較新的頁面:";
-$locale["Next"] =
-   "下一個";
-$locale["Next Month"] =
-   "下個月";
-$locale["No LDAP in this PHP version"] =
-   "此版本的 PHP 無 LDAP";
-$locale["No changes found"] =
-   "沒發現任何變更";
-$locale["No changes."] =
-   "沒有變更.";
-$locale["No or not enough GROUP_DB SQL statements defined"] =
-   "沒有或缺少足夠的 GROUP_DB SQL 敘述定義";
-$locale["No or unsupported GROUP_METHOD defined"] =
-   "沒有或不支援的 GROUP_METHOD 定義.";
-$locale["No other page links to %s yet."] =
-   "沒有頁面連結到 %s.";
-$locale["No page links to %s."] =
-   "沒有頁面連結到 %s.";
-$locale["No pagedata for %s"] =
-   "無頁面資料 %s";
-$locale["No pagename specified"] =
-   "沒有指定頁面名稱";
-$locale["No pages changed."] =
-   "沒有頁面被變更.";
-$locale["No revisions found"] =
-   "沒找到修訂";
-$locale["No uploaded file to upload?"] =
-   "沒有要上傳的檔案?";
-$locale["No userid"] =
-   "沒有此使用者帳號";
-$locale["NoCache"] =
-   "NoCache";
-$locale["None"] =
-   "無";
-$locale["Not enough questions answered!"] =
-   "沒有足夠的已回答問題!";
-$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."] =
-   "注意:許多瀏覽器會自動調整編輯區域的寬度以填滿瀏覽視窗. 在這種情況下,寬度設定將會被忽略.";
-$locale["Note, that user accounts with bouncing emails will be disabled."] =
-   "注意, 使用者帳號的回信(bouncing emails)將被關閉.";
-$locale["Note:"] =
-   "注意:";
-$locale["Okay"] =
-   "Okay";
-$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] =
-   "Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences.";
-$locale["OldMarkupTestPage"] =
-   "OldMarkupTestPage";
-$locale["OldStyleTable"] =
-   "OldStyleTable";
-$locale["OldStyleTablePlugin"] =
-   "OldStyleTablePlugin";
-$locale["Older page:"] =
-   "較舊的頁面:";
-$locale["One page links to %s:"] =
-   "一個頁面連結到 %s:";
-$locale["One page would link to %s:"] =
-   "有個頁面可能連結到 %s:";
-$locale["Oops! Revision %s of %s seems to have been deleted!"] =
-   "Acck! 修訂 %s - %s 看來已經被刪除了!";
-$locale["Original (1.2 or 1.0)"] =
-   "原始 (1.2 或 1.0)";
-$locale["Orphaned Pages in this wiki (%d total):"] =
-   "在此 wiki 中所有遺漏的頁面 (共 %d):";
-$locale["OrphanedPages"] =
-   "OrphanedPages";
-$locale["Other diffs:"] =
-   "其他差異:";
-$locale["Other version"] =
-   "其他版本";
-$locale["Our users created a total of %d pages."] =
-   "這兒的使用者共建立了 %d 個頁面.";
-$locale["Owner"] =
-   "擁有者";
-$locale["PHP syntax highlighting"] =
-   "PHP 語法效果";
-$locale["PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."] =
-   "PHP 無法建立新的 GD 影像流. 閱讀 lib/plugin/text2png.php 以取得更多資訊.";
-$locale["Page %s not found."] =
-   "未找到頁面 %s.";
-$locale["Page Execution took %s seconds"] =
-   "執行此頁面花了 %s 秒";
-$locale["Page Locked"] =
-   "頁面已被鎖定";
-$locale["Page Name"] =
-   "頁面名稱";
-$locale["Page Type:"] =
-   "頁面型態:";
-$locale["Page Version:"] =
-   "頁面版本";
-$locale["Page names with prefix '%s'"] =
-   "頁面名稱以 '%s' 開頭的";
-$locale["Page names with suffix '%s'"] =
-   "頁面名稱以 '%s' 結尾的";
-$locale["Page now locked."] =
-   "頁面已被鎖定.";
-$locale["Page now unlocked."] =
-   "頁面已被解鎖定.";
-$locale["Page statistics"] =
-   "頁面統計";
-$locale["PageChange Notification Error: Couldn't send %s to %s"] =
-   "PageChange 通知錯誤: 無法送 %s 給 %s";
-$locale["PageChange Notification of %s sent to %s"] =
-   "%s 的 PageChange 通知已送給 %s";
-$locale["PageDump"] =
-   "PageDump";
-$locale["PageGroup"] =
-   "PageGroup";
-$locale["PageGroup for %s"] =
-   "頁面群組 - %s";
-$locale["PageGroupTest"] =
-   "PageGroupTest";
-$locale["PageHistory"] =
-   "PageHistory";
-$locale["PageHistory for %s"] =
-   "頁面歷程 - %s";
-$locale["PageInfo"] =
-   "PageInfo";
-$locale["PageTrail"] =
-   "PageTrail";
-$locale["PageTrail Plugin"] =
-   "PageTrail Plugin";
-$locale["Pagedata size: %d Kb"] =
-   "頁面資料大小: %d Kb";
-$locale["Password cannot be changed."] =
-   "無法變更密碼.";
-$locale["Password updated."] =
-   "密碼已經更新.";
-$locale["Password:"] =
-   "密碼:";
-$locale["Perform searches on InterWiki sites listed in InterWikiMap."] =
-   "在列在 InterWikiMap 清單中的 InterWiki 站台進行搜尋.";
-$locale["Permanently remove all selected pages."] =
-   "永久移除選定的頁面.";
-$locale["Permission"] =
-   "權限";
-$locale["Personal Auth Settings for '%s'"] =
-   "'%s' 的個人認證設定.";
-$locale["Personal language:"] =
-   "個人語言:";
-$locale["Personal theme:"] =
-   "個人佈景主題:";
-$locale["PgsrcTranslation"] =
-   "PgsrcTranslation";
-$locale["PhotoAlbum"] =
-   "PhotoAlbum";
-$locale["PhotoAlbumPlugin"] =
-   "PhotoAlbumPlugin";
-$locale["PhpHighlight"] =
-   "PhpHighlight";
-$locale["PhpHighlightPlugin"] =
-   "PhpHighlightPlugin";
-$locale["PhpWeather"] =
-   "PhpWeather";
-$locale["PhpWeatherPlugin"] =
-   "PhpWeatherPlugin";
-$locale["PhpWiki"] =
-   "PhpWiki";
-$locale["PhpWiki developers should manually inspect the downloaded file for nested markup before rewrapping with emacs and checking into CVS."] =
-   "在以 emacs 重包裝與簽入之前,PhpWiki 開發者應會因為巢狀標記而手動審閱已下載的檔案.";
-$locale["PhpWiki engine version"] =
-   "PhpWiki 引擎版本";
-$locale["PhpWikiAdministration"] =
-   "PhpWikiAdministration";
-$locale["PhpWikiAdministration/Chmod"] =
-   "PhpWikiAdministration/Chmod";
-$locale["PhpWikiAdministration/Remove"] =
-   "PhpWikiAdministration/Remove";
-$locale["PhpWikiAdministration/Rename"] =
-   "PhpWikiAdministration/Rename";
-$locale["PhpWikiAdministration/Replace"] =
-   "PhpWikiAdministration/Replace";
-$locale["PhpWikiDocumentation"] =
-   "PhpWikiDocumentation";
-$locale["PhpWikiPoll"] =
-   "PhpWikiPoll";
-$locale["Please check it through before saving."] =
-   "在儲存之前請再檢查一次.";
-$locale["Please contact your PhpWiki administrator for assistance."] =
-   "請向你的 PhpWiki 管理者尋求協助.";
-$locale["Please continue editing.  (You'll find your %s at the bottom of the page.)"] =
-   "請繼續編輯. (你將在頁面的底部找到你的 %s.)";
-$locale["Please use one of the downloadable versions rather than copying and pasting from the above preview."] =
-   "請使用其中的可下載版本來代替在上面的預覽中複製與貼上.";
-$locale["Plugin"] =
-   "Plugin";
-$locale["Plugin %s disabled."] =
-   "Plugin %s 關閉.";
-$locale["Plugin %s failed."] =
-   "Plugin %s 失敗.";
-$locale["PluginManager"] =
-   "PluginManager";
-$locale["Plugins"] =
-   "Plugins";
-$locale["PreferencesInfo"] =
-   "PreferencesInfo";
-$locale["PrevNext"] =
-   "PrevNext";
-$locale["Preview"] =
-   "預覽";
-$locale["Preview as backup format"] =
-   "以備份格式預覽";
-$locale["Preview as developer format"] =
-   "以開發者格式預覽";
-$locale["Preview only!  Changes not saved."] =
-   "僅能預覽! 更動將不被儲存.";
-$locale["Preview: Page dump of %s"] =
-   "預覽: %s 的頁面傾印";
-$locale["Previous"] =
-   "上一個";
-$locale["Previous Author"] =
-   "上一次做此更動的作者";
-$locale["Previous Major Revision"] =
-   "上一次主要修訂";
-$locale["Previous Month"] =
-   "上個月";
-$locale["Previous Revision"] =
-   "上一次修訂";
-$locale["Printer"] =
-   "印表機";
-$locale["Propagate new permissions to all subpages?"] =
-   "要傳播新的權限到所有子頁面?   ";
-$locale["Provides access to PhpWiki's lower level system information."] =
-   "提供存取 PhpWiki 下層系統資訊.";
-$locale["Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."] =
-   "為此頁面清除 HTML 快取. 下次將重新由 WikiMarkup 產生.";
-$locale["Purge Markup Cache"] =
-   "清除標記快取";
-$locale["PurgeHtmlCache"] =
-   "PurgeHtmlCache";
-$locale["Querying backend directly for '%s'"] =
-   "為 '%s' 直接查詢後台";
-$locale["RandomPage"] =
-   "RandomPage";
-$locale["Rate"] =
-   "Rate";
-$locale["Rate It"] =
-   "評比";
-$locale["RateIt"] =
-   "RateIt";
-$locale["Rating system. Store user ratings per page"] =
-   "評比系統. 儲存每頁的使用者評比";
-$locale["Raw HTML"] =
-   "Raw HTML";
-$locale["Raw HTML is disabled in this wiki."] =
-   "Raw HTML 已經被關閉.";
-$locale["RawHtmlPlugin"] =
-   "RawHtmlPlugin";
-$locale["RecentChanges"] =
-   "RecentChanges";
-$locale["RecentEdits"] =
-   "RecentEdits";
-$locale["RecentVisitors"] =
-   "RecentVisitors";
-$locale["Recursive redirect to self: '%s'"] =
-   "遞迴重導向到自己: '%s'";
-$locale["Recursively get BackLinks or links"] =
-   "遞迴地取得 BackLinks 或連結";
-$locale["Redirect"] =
-   "重導向";
-$locale["RedirectTo"] =
-   "RedirectTo";
-$locale["RedirectToPlugin"] =
-   "RedirectToPlugin";
-$locale["Redirects to an external web site based on form input"] =
-   "以表單輸入方式重導向到另外一個外部站台";
-$locale["References"] =
-   "偏好設定";
-$locale["Registered Users"] =
-   "已註冊的使用者";
-$locale["Registered Users Online: "] =
-   "已註冊的使用者在線上:";
-$locale["Related Links"] =
-   "相關連結";
-$locale["ReleaseNotes"] =
-   "ReleaseNotes";
-$locale["Remove"] =
-   "移除";
-$locale["Remove Page"] =
-   "移除頁面";
-$locale["Remove selected pages"] =
-   "移除選定頁面";
-$locale["Remove this page"] =
-   "移除此頁面";
-$locale["Removed page '%s' successfully."] =
-   "成功地移除頁面 '%s'.";
-$locale["Removing pages"] =
-   "移除頁面";
-$locale["Rename"] =
-   "更名";
-$locale["Rename selected pages"] =
-   "更名已選定的頁面";
-$locale["Rename to"] =
-   "更名為";
-$locale["Renamed page '%s' to '%s'."] =
-   "更名頁面 '%s' 為 '%s'.";
-$locale["Replaced '%s' with '%s' in page '%s'."] =
-   "取代 '%s' 以 '%s' 在頁面 '%s'.";
-$locale["Requires WikiAdmin privileges to edit."] =
-   "需要 WikiAdmin 權限方能編輯.";
-$locale["Reset"] =
-   "重設";
-$locale["Restore Anyway"] =
-   "無論如何都回存";
-$locale["Return to %s"] =
-   "回到 %s";
-$locale["Revision Not Found"] =
-   "修訂未找到";
-$locale["RichTable"] =
-   "RichTable";
-$locale["RichTablePlugin"] =
-   "RichTablePlugin";
-$locale["RssFeed"] =
-   "RssFeed";
-$locale["SandBox"] =
-   "SandBox";
-$locale["Save"] =
-   "儲存";
-$locale["Saved on:"] =
-   "已存放在:";
-$locale["Saved: %s"] =
-   "已存於: %s";
-$locale["Saving this page will overwrite the current version."] =
-   "儲存此頁面將會覆寫掉目前版本.";
-$locale["Score"] =
-   "得分";
-$locale["Search"] =
-   "搜尋";
-$locale["Search & Replace"] =
-   "搜尋與取代";
-$locale["Search and replace text in selected wiki pages."] =
-   "在選定的頁面中搜尋並更換文字.";
-$locale["Search for page titles similar to %s."] =
-   "搜尋與 %s 相似的頁面標題";
-$locale["Search the content of all pages in this wiki."] =
-   "在此 wiki 所有頁面中搜尋內容.";
-$locale["Search the titles of all pages in this wiki."] =
-   "在此 wiki 的所有頁面搜尋標題.";
-$locale["See %s"] =
-   "參照 %s";
-$locale["See %s tips for editing."] =
-   "參照編輯時的 %s 小秘訣.";
-$locale["See: %s"] =
-   "參閱: %s";
-$locale["Select pages"] =
-   "選擇頁面";
-$locale["Select the pages to change:"] =
-   "選擇頁面以進行更名:";
-$locale["Select the pages to rename:"] =
-   "選擇頁面以進行更名:";
-$locale["Select: "] =
-   "選擇";
-$locale["Selected page '%s' passed to '%s'."] =
-   "已選擇的頁面 '%s' 傳遞到 '%s'.";
-$locale["Serialized file %s"] =
-   "Serialized 到檔案 %s";
-$locale["Set individual page permissions."] =
-   "設定個別頁面的權限.";
-$locale["SetAcl"] =
-   "SetAcl";
-$locale["Show and add blogs for %s"] =
-   "顯示並增加 blogs - %s";
-$locale["Show and add comments for %s"] =
-   "顯示並對 %s 發表意見";
-$locale["Show changes for:"] =
-   "顯示變更:";
-$locale["Show extra page Info and statistics for %s."] =
-   "顯示額外的頁面資訊與統計 - %s.";
-$locale["Show relative dates using 'Today' and 'Yesterday'"] =
-   "使用'今天'和'昨天'來顯示相對日期.";
-$locale["Show summary information of the current user sessions."] =
-   "顯示目前使用者 session 的摘要資訊.";
-$locale["Show translations of various words or pages"] =
-   "顯示多個字或頁面的轉換";
-$locale["Sign In"] =
-   "簽入";
-$locale["Sign Out"] =
-   "簽出";
-$locale["Sign in as:"] =
-   "簽入為:";
-$locale["Signed Users"] =
-   "已簽入的使用者";
-$locale["Simple RSS Feed aggregator Plugin"] =
-   "簡單的 RSS Feed aggregator Plugin";
-$locale["Simple Sample Plugin"] =
-   "簡單的範例 Plugin";
-$locale["Simple jabber presence plugin"] =
-   "簡單的 jabber presence plugin";
-$locale["Since you started the deletion process, someone has saved a new version of %s.  Please check to make sure you still want to permanently remove the page from the database."] =
-   "從你開始刪除到現在,有人已經儲存了一份 %s 的較新版本. 請檢查以確定你仍想要從資料庫中永久刪除此頁面.";
-$locale["SiteMap"] =
-   "SiteMap";
-$locale["Size"] =
-   "大小";
-$locale["Size:"] =
-   "大小";
-$locale["Skipping"] =
-   "跳過";
-$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."] =
-   "部份更動無法自動合併. 請搜尋以 '%s' 開頭並以 '%s' 結尾的部份.在儲存之前,你需要手動編輯這些部份.";
-$locale["Someone has edited the page!"] =
-   "有人編輯了此頁面!";
-$locale["Sorry for the inconvenience."] =
-   "抱歉造成你的不便.";
-$locale["Sorry! You must wait at least 20 minutes until you can vote again!"] =
-   "抱歉! 你必須等至少 20 分鐘才能在投票!";
-$locale["Sorry, no dynamic DB Session support."] =
-   "抱歉,無動態 DB Session 支援.";
-$locale["Sorry, this version of PHP cannot create PNG image files."] =
-   "抱歉, 這個版本的 PHP 無法建立 PNG 圖片檔.";
-$locale["Sorry. Access Restrictions not yet implemented"] =
-   "抱歉. 存取限制尚未被實作.";
-$locale["Sort by %s"] =
-   "以 %s 排序";
-$locale["Sound Score"] =
-   "音節得分";
-$locale["Spelling Score"] =
-   "拼字得分";
-$locale["SqlResult"] =
-   "SqlResult";
-$locale["Statistics about %s."] =
-   "關於 %s 的統計.";
-$locale["Status:"] =
-   "狀態:";
-$locale["SteveWainstead"] =
-   "SteveWainstead";
-$locale["SubPages of %s:"] =
-   "%s 的子頁面:";
-$locale["Submit"] =
-   "送出";
-$locale["Submit country"] =
-   "送出國家";
-$locale["Submit location"] =
-   "送出地區";
-$locale["Subpage"] =
-   "子頁面";
-$locale["Summary"] =
-   "摘要";
-$locale["Supplanted on:"] =
-   "代替為";
-$locale["Supported languages"] =
-   "已支援的語言";
-$locale["Supported themes"] =
-   "已支援的佈景主題";
-$locale["Switch to detailed list"] =
-   "切換到明細列表";
-$locale["Switch to summary"] =
-   "切換到摘要";
-$locale["Synopsis"] =
-   "概要";
-$locale["System default:"] =
-   "系統預設:";
-$locale["SystemInfo"] =
-   "SystemInfo";
-$locale["SystemInfoPlugin"] =
-   "SystemInfoPlugin";
-$locale["TODO: Google can only translate from english and french. Find a translation service for %s to language %s"] =
-   "TODO: Google 只能從英文與法文轉換. 為 %s 尋找轉換到語言 %s 的服務.";
-$locale["TextFormattingRules"] =
-   "TextFormattingRules";
-$locale["Thank you for editing %s."] =
-   "謝謝你編輯了 %s.";
-$locale["Thanks for adding this translation!"] =
-   "謝謝你增加此轉換!";
-$locale["Thanks for participating!"] =
-   "謝謝你的參與.";
-$locale["The %d least popular pages of this wiki:"] =
-   "本 wiki 前 %d 最不受歡迎頁面:";
-$locale["The %d most popular pages of this wiki:"] =
-   "本 wiki 前 %d 最受歡迎頁面:";
-$locale["The %d most recent %s are listed below."] =
-   "最近的 %d 筆列在下面 - 頁面 %s.";
-$locale["The %d most recent %s during the past %s days are listed below."] =
-   "最近的 %d 筆列在下面 - 頁面 %s - 在過去 %s 天以來.";
-$locale["The %d most recent %s during the past day are listed below."] =
-   "最近的 %d 筆列在下面 - 頁面 %s - 在過去一天以來.";
-$locale["The %d oldest %s are listed below."] =
-   "最舊的 %d 筆列在下面 - 頁面 %s.";
-$locale["The %d oldest %s during the past %s days are listed below."] =
-   "最舊的 %d 筆列在下面 - 頁面 %s - 在過去 %s 天以來.";
-$locale["The %d oldest %s during the past day are listed below."] =
-   "最舊的 %d 筆列在下面 - 頁面 %s - 在過去一天以來.";
-$locale["The %s subpage enables simple weblogging."] =
-   "%s 子頁面啟動簡易 weblogging";
-$locale["The ICAO '%s' wasn't recognized."] =
-   "ICAO '%s' 無法被認可.";
-$locale["The PhpWeather plugin provides weather reports from the Internet."] =
-   "PhpWeather plugin 由網路取得資訊並提供天氣報告";
-$locale["The PhpWiki access log file"] =
-   "PhpWiki 存取日誌檔案";
-$locale["The crypt function is not available in this version of PHP."] =
-   "此版本的 PHP 沒有 crypt 函數.";
-$locale["The current page has no subpages defined."] =
-   "目前頁面沒有定義任何子頁面.";
-$locale["The current time at the server is %s."] =
-   "目前在伺服器上的時間是 %s.";
-$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."] =
-   "密碼長度小於系統原則所允許的長度. 抱歉,你無法登入. \n 你必須詢問系統管理者以重設密碼.";
-$locale["The most recent %s during the past %s days are listed below."] =
-   "最新的紀錄已經列在下面 - 頁面 %s - 在過去 %s 天以來.";
-$locale["The most recent %s during the past day are listed below."] =
-   "最新的紀錄已經列在下面 - 頁面 %s - 在過去一天以來.";
-$locale["The result of this poll so far:"] =
-   "這次投票的結果是這樣:";
-$locale["The session.save_path directory"] =
-   "session.save_path 目錄";
-$locale["The wordwrap of the preview doesn't take nested markup or list indentation into consideration!"] =
-   "預覽的自動換行無法處理巢狀標記或縮排列出.";
-$locale["Theme"] =
-   "佈景主題";
-$locale["There is no image creation data available to id '%s'. Please reload referring page."] =
-   "沒有id '%s' 可用的圖片創作資料. 請重新載入參照頁面.";
-$locale["These page titles match fuzzy with '%s'"] =
-   "這些頁面標題與 '%s' 有點接近";
-$locale["These pages share an initial or final title word with '%s'"] =
-   "這些頁面分享為 '%s' 開頭或結尾的標題字.";
-$locale["This internal action page cannot viewed."] =
-   "內部動作頁面無法瀏覽.";
-$locale["This is a minor change."] =
-   "這是次要變更.";
-$locale["This page has been locked by the administrator so your changes can not be saved."] =
-   "此頁面已被管理者鎖定,所以你的更動無法儲存.";
-$locale["This plugin is currently under development and does not work!"] =
-   "此 plugin 正在開發還不能運作!";
-$locale["Time Zone"] =
-   "時區";
-$locale["Title Search"] =
-   "標題搜尋";
-$locale["Title search results for '%s'"] =
-   "以 '%s' 進行標題搜尋的結果";
-$locale["TitleSearch"] =
-   "標題搜索";
-$locale["Today"] =
-   "今天";
-$locale["Top & bottom toolbars"] =
-   "Top & bottom 工具列";
-$locale["Total %d plugins: "] =
-   "共有 %d 個 plugin:";
-$locale["Total of %d languages: "] =
-   "共有 %d 種語言:";
-$locale["Total of %d themes: "] =
-   "共有 %d 組佈景主題: ";
-$locale["Transclude"] =
-   "Transclude";
-$locale["TranscludePlugin"] =
-   "TranscludePlugin";
-$locale["Transcluded from %s"] =
-   "Transcluded 從 %s";
-$locale["Transcluded page"] =
-   "Transcluded 頁面";
-$locale["Translate"] =
-   "轉換";
-$locale["Translate %s to %s in %s"] =
-   "轉換 %s 到 %s 在 %s";
-$locale["Translate '%s' to '%s' in *%s*"] =
-   "轉換 '%s' 到 '%s' 在 *%s*";
-$locale["TranslateText"] =
-   "TranslateText";
-$locale["Translation Error!"] =
-   "轉換錯誤!";
-$locale["Type it again"] =
-   "再輸入一次:";
-$locale["Unable to connect to IMAP server "] =
-   "無法連結到 IMAP 伺服器";
-$locale["Unable to connect to LDAP server %s"] =
-   "無法連結到 LDAP 伺服器 %s";
-$locale["Unable to open directory '%s' for reading"] =
-   "無法開啟目錄 '%s' 進行讀取";
-$locale["Undefined method %s for special group %s"] =
-   "未定義的 %s, 對特別的群組 %s";
-$locale["Unexpected EOF in zip file"] =
-   "zip 檔案中存有不被期待的 EOF.";
-$locale["UnfoldSubpages"] =
-   "UnfoldSubpages";
-$locale["UnfoldSubpagesPlugin"] =
-   "UnfoldSubpagesPlugin";
-$locale["Unlock Page"] =
-   "解除鎖定頁面";
-$locale["Unlocking pages"] =
-   "解除鎖定頁面";
-$locale["Unsupported ACL access type %s ignored."] =
-   "忽略不支援的 ACL 存取型態 %s.";
-$locale["Up"] =
-   "上";
-$locale["UpLoad"] =
-   "UpLoad";
-$locale["Update Preferences"] =
-   "更新偏好設定";
-$locale["Upgrade disabled: user != isAdmin"] =
-   "禁止升級: user != isAdmin";
-$locale["Upgrading this PhpWiki"] =
-   "升級 PhpWiki";
-$locale["Upload"] =
-   "上傳";
-$locale["Upload files to the local InterWiki Upload:<filename>"] =
-   "上傳檔案到本地 InterWiki. Upload:<filename>";
-$locale["Uploading %s"] =
-   "上傳中 %s";
-$locale["Uploading zip dumps"] =
-   "上傳 zip dumps";
-$locale["Use old markup"] =
-   "使用舊標記";
-$locale["User page"] =
-   "使用者頁面";
-$locale["User statistics"] =
-   "使用者統計";
-$locale["UserId"] =
-   "帳號";
-$locale["UserId:"] =
-   "帳號:";
-$locale["UserPreferences"] =
-   "UserPreferences";
-$locale["Users will not be able to sign in."] =
-   "使用者將無法簽入.";
-$locale["Using directory '%s'"] =
-   "使用目錄 '%s'";
-$locale["Verification Status"] =
-   "確認狀態";
-$locale["Verify the current action"] =
-   "確認目前動作";
-$locale["Version"] =
-   "版本";
-$locale["Version %d"] =
-   "版本 %d";
-$locale["Version %s"] =
-   "版本 %s";
-$locale["Versions are identical"] =
-   "版本相同";
-$locale["View Source"] =
-   "查看源碼";
-$locale["View Source: %s"] =
-   "查看源碼: %s";
-$locale["View the current version"] =
-   "查看目前版本";
-$locale["View this page and all subpages"] =
-   "查看此頁面以及所有子頁面";
-$locale["Viewing redirecting page."] =
-   "查看重導向的頁面.";
-$locale["Viewing the source of pages"] =
-   "查看頁面源碼";
-$locale["Visited pages on this wiki, ordered by popularity:"] =
-   "在此 wiki 已被參訪頁面, 以受歡迎程度排序:";
-$locale["Visualizes the Wiki structure in a graph using the 'dot' commandline tool from graphviz."] =
-   "從 graphviz 使用 'dot' 命令列工具以圖形視覺化 Wiki 結構.";
-$locale["W"] =
-   "寬";
-$locale["WabiSabi"] =
-   "WabiSabi";
-$locale["Wanted Pages for %s (%d total):"] =
-   "%s 所需要的頁面 (共 %d):";
-$locale["Wanted Pages in this wiki (%d total):"] =
-   "在此 wiki 所需要的頁面 (共 %d):";
-$locale["WantedPages"] =
-   "WantedPages";
-$locale["Warning:"] =
-   "警告:";
-$locale["Warning: The search string cannot be empty!"] =
-   "警告: 搜尋字串不能是空白!";
-$locale["Warning: You are editing an old revision."] =
-   "警告: 你正在編輯較舊的修訂.";
-$locale["We have a total of %d registered users."] =
-   "共有 %d 位已註冊的使用者.";
-$locale["White space converted to single space"] =
-   "空白空格轉換為單一空格";
-$locale["Who Is Online"] =
-   "誰在線上";
-$locale["Who is online"] =
-   "誰在線上";
-$locale["WhoIsOnline"] =
-   "WhoIsOnline";
-$locale["Width"] =
-   "寬度";
-$locale["Wiki Name"] =
-   "Wiki 名稱";
-$locale["WikiAdminChmod"] =
-   "WikiAdminChmod";
-$locale["WikiAdminRemove"] =
-   "WikiAdminRemove";
-$locale["WikiAdminRename"] =
-   "WikiAdminRename";
-$locale["WikiAdminSearchReplace"] =
-   "WikiAdminSearchReplace";
-$locale["WikiAdminSelect"] =
-   "WikiAdminSelect";
-$locale["WikiAdminSetAcl"] =
-   "WikiAdminSetAcl";
-$locale["WikiAdminUtils"] =
-   "WikiAdminUtils";
-$locale["WikiBlog"] =
-   "WikiBlog";
-$locale["WikiBlogPlugin"] =
-   "WikiBlogPlugin";
-$locale["WikiDB::renamePage() not yet implemented for this backend"] =
-   "後台的 WikiDB::renamePage() 還沒實作出來.";
-$locale["WikiForm"] =
-   "WikiForm";
-$locale["WikiForm: %s: unknown action"] =
-   "WikiForm: %s: 未知的動作";
-$locale["WikiPlugin"] =
-   "WikiPlugin";
-$locale["WikiPoll"] =
-   "WikiPoll";
-$locale["WikiWikiWeb"] =
-   "WikiWikiWeb";
-$locale["Wikiname regexp"] =
-   "Wikiname regexp";
-$locale["With the current offset, this would be reported as %s."] =
-   "以目前時差,這將被顯示為 %s.";
-$locale["Wrong password. Try again."] =
-   "錯誤的密碼.再試一次.";
-$locale["XML-RPC access"] =
-   "XML-RPC 存取";
-$locale["Yes"] =
-   "是";
-$locale["You are signed but not authenticated as %s. "] =
-   "你已經簽入但並未認證為 %s.";
-$locale["You are viewing an old revision of this page."] =
-   "你正在查看此頁面的較舊修訂.";
-$locale["You can only use it via the _WikiTranslation plugin."] =
-   "你只能透過 _WikiTranslation plugin 使用.";
-$locale["You can personalize various settings in %s."] =
-   "你可以在 %s 自訂多種個人化設定.";
-$locale["You have not made any changes so no new version has been saved."] =
-   "你沒有做任何更動,所以沒有存入任何新版本.";
-$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."] =
-   "在使用任何 [WikiWord|AddingPages] 前必須先以你的帳號簽入. (%s 等.  或許也已經被其他人使用了). 帳號將會在近期更動中被用來作為連到你首頁的連結.";
-$locale["You must be an administrator to %s."] =
-   "你必須是一個管理者才能 %s.";
-$locale["You must be an administrator to use this plugin."] =
-   "你必須是管理者才能使用此 plugin.";
-$locale["You must sign in to %s."] =
-   "你必須簽入才能 %s.";
-$locale["You must specify a directory to dump to"] =
-   "你必須指定目錄以進行傾印";
-$locale["Your E-Mail:"] =
-   "你的 E-Mail:";
-$locale["Your browser should have redirected you to %s."] =
-   "你的瀏覽器應該會重導向到 %s.";
-$locale["Your careful attention to detail is much appreciated."] =
-   "感謝你的小心關注.";
-$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."] =
-   "無法儲存你所變更的部份,在你編輯的這段時間,已經有其他作者變更了.所以你所變更的部份已經和其他作者變更的部份合併.結果顯示在下面.";
-$locale["Your home page has not been created yet so your preferences cannot not be saved."] =
-   "你的首頁還未被建立,所以你的偏好設定無法儲存.";
-$locale["Your home page is locked so your preferences cannot not be saved."] =
-   "你的首頁已經被鎖定,所以你的偏好設定無法被儲存.";
-$locale["Your rating was %.1f"] =
-   "你的評比是 %.1f";
-$locale["Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation."] =
-   "你的轉換文字不存在於 %s, 但管理者將會取用並加到安裝中.";
-$locale["Your translated text is either empty or equal to the untranslated text. Please try again."] =
-   "你的轉換文字是空白或等於未轉換的文字. 請再試一次.";
-$locale["Your translation is stored in %s"] =
-   "你的轉換存放在 %s";
-$locale["Your version"] =
-   "你的版本";
-$locale["[%d] See [%s]"] =
-   "[%d] 參閱 [%s]";
-$locale["_WikiTranslation"] =
-   "_WikiTranslation";
-$locale["access this wiki via XML-RPC"] =
-   "透過 XML-RPC 存取此 wiki";
-$locale["argument '%s' not declared by plugin"] =
-   "引數 '%s' 沒有被 plugin 宣告";
-$locale["by"] =
-   "被";
-$locale["by %s"] =
-   "被 %s";
-$locale["cached pagedata:"] =
-   "已置於快取的頁面資料:";
-$locale["cached versiondata:"] =
-   "已快取的版本資料:";
-$locale["chmod page '%s' to '%s'."] =
-   "改變頁面 '%s' 權限為 '%s'.";
-$locale["compare revisions"] =
-   "比較修訂";
-$locale["couldn't open file '%s' for writing"] =
-   "無法寫入到 '%s'.";
-$locale["create this page"] =
-   "建立此頁面";
-$locale["current version"] =
-   "目前版本";
-$locale["days"] =
-   "天";
-$locale["default page permission"] =
-   "預設頁面權限";
-$locale["diff"] =
-   "差異";
-$locale["diff this page"] =
-   "比對此頁面";
-$locale["download a zip dump from this wiki"] =
-   "從此 wiki 下載 zip dump";
-$locale["dump html pages"] =
-   "傾印 html 頁面";
-$locale["dump serial pages"] =
-   "傾印連續頁面";
-$locale["edit area"] =
-   "編輯區域";
-$locale["edit this page"] =
-   "編輯此頁面";
-$locale["edits"] =
-   "編輯";
-$locale["from"] =
-   "從";
-$locale["from %s"] =
-   "從 %s";
-$locale["has edit conflicts - overwriting anyway"] =
-   "編輯衝突 - 無論如何都覆寫";
-$locale["has edit conflicts - skipped"] =
-   "編輯衝突 - 跳過";
-$locale["home page"] =
-   "首頁";
-$locale["load files into this wiki"] =
-   "載入檔案到此 wiki";
-$locale["lock this page"] =
-   "鎖定此頁面";
-$locale["locked"] =
-   "被鎖定";
-$locale["major edits"] =
-   "主要編輯";
-$locale["max: %d"] =
-   "最大: %d";
-$locale["mean: %2.3f"] =
-   "表示: %2.3f";
-$locale["median: %d"] =
-   "median: %d";
-$locale["minor"] =
-   "次要";
-$locale["minor edit"] =
-   "次要編輯";
-$locale["minor edits"] =
-   "次要編輯";
-$locale["no cache used"] =
-   "沒有快取被使用";
-$locale["no page specified"] =
-   "沒有指定頁面";
-$locale["not yet"] =
-   "尚未";
-$locale["only %d pages displayed"] =
-   "只有 %d 個頁面顯示出來";
-$locale["page permission inherited from %s"] =
-   "由 %s 繼承而來的頁面";
-$locale["plain file %s"] =
-   "一般檔案 %s";
-$locale["predecessor to the previous major change"] =
-   "上次主要變更的原始文件";
-$locale["previous revision"] =
-   "上一次修訂";
-$locale["recursive inclusion of page %s"] =
-   "遞迴含括頁面 %s";
-$locale["recursive inclusion of page %s ignored"] =
-   "忽略頁面 %s 的遞迴含括";
-$locale["recursive inclusion of url %s"] =
-   "遞迴含括 url %s";
-$locale["remove this page"] =
-   "移除此頁面";
-$locale["renamed from %s"] =
-   "從 %s 更名";
-$locale["revision by previous author"] =
-   "上位作者的修訂";
-$locale["saved as %s"] =
-   "存為 %s";
-$locale["stddev: %2.3f"] =
-   "stddev: %2.3f";
-$locale["the file '%s'"] =
-   "檔案 '%s'";
-$locale["to"] =
-   "到";
-$locale["today"] =
-   "今天";
-$locale["too long"] =
-   "太長";
-$locale["total hits: %d"] =
-   "總擊閱數: %d";
-$locale["trailing cruft in plugin args: '%s'"] =
-   "trailing cruft in plugin args: '%s'";
-$locale["unknown argument '%s' to SystemInfo"] =
-   "SystemInfo 未知的引數 '%s'";
-$locale["unlock this page"] =
-   "解除鎖定此頁面";
-$locale["upload a zip dump"] =
-   "上傳 zip 傾印";
-$locale["uploaded %s"] =
-   "已上傳 %s";
-$locale["use this plugin"] =
-   "使用此 plugin";
-$locale["verify the current action"] =
-   "確認目前動作";
-$locale["version %d"] =
-   "版本 %d";
-$locale["version %s"] =
-   "版本 %s";
-$locale["view the source of this page"] =
-   "查看此頁面源碼";
-$locale["view this page"] =
-   "查看此頁面";
+$locale["  %d%% (%d/%d)"] = "  %d%% (%d/%d)";
+$locale[" ... around %s"] = "... 包圍 %s";
+$locale[" ... first %d bytes"] = " ... 頭 %d bytes";
+$locale[" ... first %d lines"] = " ... 頭 %d 列";
+$locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = " 除此之外, 試著保存最近 %d 天之內所有作者的最新貢獻 (即使超過他們的 %d ,) 但是沒保存超過 %d 份單一作者修訂.";
+$locale[" Keep the latest contributions of the last %d authors up to %d days."] = "保存最後 %d 位作者的最新貢獻直到 %d 天.";
+$locale[" Keep up to %d minor edits, but keep them no longer than %d days."] = "保持 %d 份次要編輯,但不超過 %d 天.";
+$locale["%4d  %s\n"] = "%4d  %s\n";
+$locale["%d UserPreferences fields successfully updated."] = "%d UserPreference 欄位已成功地更新.";
+$locale["%d homepages"] = "%d 個主頁";
+$locale["%d minutes"] = "%d 分鐘";
+$locale["%d not-empty pages"] = "%d 個非空白頁面";
+$locale["%d online users"] = "%d 位使用者正在線上";
+$locale["%d page(s) with more than %d hits (>%d%%)."] = "%d 個頁面超過 %d 個擊閱數(>%d%%).";
+$locale["%d pages"] = "%d 個頁面";
+$locale["%d pages with less than %d hits (<%d%%)."] = "%d 個頁面少於 %d 個擊閱數(<%d%%).";
+$locale["%s already exists"] = "%s 已經存在";
+$locale["%s at %s"] = "%s 在 %s";
+$locale["%s by %s"] = "%s 被 %s";
+$locale["%s bytes"] = "%s bytes";
+$locale["%s bytes written"] = "已寫入 %s bytes";
+$locale["%s days"] = "%s 天";
+$locale["%s does not appear to be a WikiPlugin."] = "%s 看起來不是 WikiPlugin.";
+$locale["%s does not know about the language '%s', using 'en' instead."] = "%s 不認識此語言 '%s', 使用 'en' 代替.";
+$locale["%s is disallowed on this wiki."] = "在此 wiki 上, %s 是被禁止的.";
+$locale["%s is empty"] = "%s 是空白";
+$locale["%s is empty."] = "%s 是空白的.";
+$locale["%s is not writable."] = "%s 無法寫入.";
+$locale["%s is only allowed in locked pages."] = "%s 只允許在鎖定的頁面中.";
+$locale["%s not found"] = "%s 找不到.";
+$locale["%s of this page"] = "此頁面的 %s";
+$locale["%s or %s parameter missing"] = "%s 或 %s 參數遺漏";
+$locale["%s pages link to %s:"] = "%s 個頁面連結到 %s:";
+$locale["%s pages would link to %s:"] = "%s 個頁面可能連結到 %s:";
+$locale["%s parameter missing"] = "%s 參數遺漏";
+$locale["%s words"] = "共 %s 字";
+$locale["%s: %s"] = "%s: %s";
+$locale["%s: Bad action"] = "%s: 錯誤的動作";
+$locale["%s: Can't open dba database"] = "%s: 無法開啟 dba 資料庫";
+$locale["%s: Date of new revision is %s"] = "%s: 新版本的日期是 %s";
+$locale["%s: argument index out of range"] = "%s: 引數索引超出範圍";
+$locale["%s: error while handling error:"] = "%s: 處理錯誤時發生錯誤";
+$locale["%s: file not found"] = "%s: 找不到檔案.";
+$locale["%s: no such class"] = "%s: 無此類別";
+$locale["%s: not defined"] = "%s: 未被定義";
+$locale["'%s': Bad page name"] = "'%s': 錯誤的頁面名稱";
+$locale["'%s': Bad page name: %s"] = "'%s': 錯誤頁面名稱: %s";
+$locale["'%s': corrupt file"] = "'%s': 壞檔";
+$locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(複製你的更動到剪貼簿中. 你可以試著編輯另一個不同的頁面或存到文字編輯器中.)";
+$locale["(Redirected from %s)"] = "(已從 %s 重導向)";
+$locale["(Your preferences are stored as hidden data within this page)."] = "(你的偏好設定已經存放並隱藏在此頁面中).";
+$locale["(diff)"] = "(差異)";
+$locale["(disable individual page permissions, enable inheritance)?"] = "(禁制個別網頁的權限,使用繼承)?";
+$locale["(max. recursion level: %d)"] = "(最大遞迴層級: %d)";
+$locale["(ugo : rwx)"] = "(ugo : rwx)";
+$locale["- saved to database as version %d"] = "- 已經以版本 %d 存入資料庫中";
+$locale["-???"] = "-???";
+$locale["... copied to %s"] = "... 複製到 %s";
+$locale["... not found"] = "... 沒找到";
+$locale["1 day"] = "1 天";
+$locale["1 word"] = "1 個單字";
+$locale["<%s: no such section>"] = "<%s: 沒有此部份>";
+$locale["<empty>"] = "<空白>";
+$locale["<no matches>"] = "<沒有相符>";
+$locale["<none>"] = "<無>";
+$locale["<not displayed>"] = "<未能顯示>";
+$locale["<system language>"] = "<系統語言>";
+$locale["<system theme>"] = "<系統佈景主題>";
+$locale["<unknown>"] = "<未知的>";
+$locale["A plugin to provide for raw HTML within wiki pages."] = "用來在 wiki 頁面提供 raw HTML的 plugin.";
+$locale["A required argument '%s' is missing."] = "缺少引數 '%s'.";
+$locale["ACCESS DENIED: You must log in to upload files."] = "拒絕存取: 請先登入才能上傳檔案";
+$locale["ACL"] = "ACL";
+$locale["Action page"] = "動作頁面";
+$locale["Add %s hours to the server's local time when reporting times."] = "當回報時間時,在伺服器的本地時間加上 %s 個小時.";
+$locale["AddComment"] = "AddComment";
+$locale["Adjust"] = "調整";
+$locale["Admin"] = "管理者";
+$locale["Admin is also online."] = "Admin 也在線上.";
+$locale["Administrators"] = "管理者";
+$locale["All %s are listed below."] = "所有 %s 已被列在下面.";
+$locale["AllPages"] = "AllPages";
+$locale["AllUsers"] = "AllUsers";
+$locale["Allowed protocols"] = "允許的協定";
+$locale["Allows selection of multiple pages which get passed to other WikiAdmin plugins."] = "允許選擇多個已傳遞的頁面到其他 WikiAdmin plugin.";
+$locale["Also pages which have been deleted at least %s days."] = "也列出過去 %s 天被刪除的頁面.";
+$locale["An unnamed PhpWiki"] = "未被命名的 PhpWiki";
+$locale["Anonymous Users"] = "Anonymous 使用者";
+$locale["Appearance"] = "Appearance";
+$locale["Application name"] = "應用程式名稱";
+$locale["Are you sure you want to permanently change the selected files?"] = "你確定你想要永久變更選定的檔案?";
+$locale["Arguments"] = "引數";
+$locale["Attempting to use the directory '%s' instead."] = "試圖改用目錄 '%s'.";
+$locale["Auth Level"] = "認證層級";
+$locale["Auth Method"] = "認證方式";
+$locale["Authenticated Users"] = "已認證的使用者";
+$locale["Authenticated as %s"] = "認證為 %s";
+$locale["Authenticated users on this wiki (%d total):"] = "在此 wiki 上被確認的使用者 (共 %d):";
+$locale["Author"] = "作者";
+$locale["Author will be logged as %s."] = "作者將登入為 %s.";
+$locale["AuthorHistory"] = "作者歷程";
+$locale["Available plugins"] = "可用的 plugin";
+$locale["BAD URL -- remove all of <, >, \""] = "錯誤 URL -- 移除所有的 <, >, \"";
+$locale["BAD phpwiki: URL"] = "錯誤 phpwiki: URL";
+$locale["BackLinks"] = "BackLinks";
+$locale["BackLinks for %s"] = "向後連結: %s";
+$locale["Bad Version"] = "錯誤的版本";
+$locale["Bad file type: %s"] = "錯誤的檔案型態: %s";
+$locale["Bad url in src: remove all of <, >, \""] = "在 src 中錯誤的 url: 移除所有的 <, .>, \"";
+$locale["Blog page"] = "Blog 頁面";
+$locale["Bogo Users"] = "Bogo 使用者";
+$locale["Browsing pages"] = "瀏覽頁面";
+$locale["Cache statistics"] = "快取統計";
+$locale["Calendar"] = "月曆";
+$locale["CalendarList"] = "月曆列表";
+$locale["Can't inflate data: zlib support not enabled in this PHP"] = "無法壓縮資料: 此 PHP 的 zlib 支援未被啟動";
+$locale["Can't mix '%s' with '%s' type format strings"] = "無法混合 '%s' 和 '%s' 型態的格式字串.";
+$locale["Can't open zip file '%s' for reading"] = "無法開啟 zip 檔案 '%s' 進行讀取";
+$locale["Cancel"] = "取消";
+$locale["Cannot create directory '%s'"] = "無法建立目錄 '%s'";
+$locale["Cannot open AUTH_GROUP_FILE %s"] = "無法開啟 AUTH_GROUP_FILE %s";
+$locale["CategoryCategory"] = "CategoryCategory";
+$locale["CategoryGroup"] = "CategoryGroup";
+$locale["CategoryHomePages"] = "CategoryHomePages";
+$locale["CategoryHomepage"] = "分類首頁";
+$locale["CategoryPage"] = "CategoryPage";
+$locale["Change Password"] = "改變密碼";
+$locale["Change Verification Status"] = "改變確認狀態";
+$locale["Change country"] = "變更國家";
+$locale["Change page attributes"] = "變更頁面屬性";
+$locale["Change pagename in all linked pages also?"] = "也在所有連結到的頁面裡變更頁面名稱?";
+$locale["Check any two boxes then %s."] = "任找兩個空格打勾然後 %s.";
+$locale["Check any two boxes to compare revisions."] = "任找兩個空格打勾以進行比較修訂.";
+$locale["Chmod"] = "Chmod";
+$locale["Chmod to permission:"] = "改變權限為:";
+$locale["Click to authenticate as %s"] = "點擊以 %s 進行驗證.";
+$locale["Click to de-/select all pages"] = "點擊以取消選擇或選擇所有頁面";
+$locale["Click to display"] = "點擊以顯示";
+$locale["Click to reverse sort order"] = "點擊以反轉排列順序";
+$locale["Click to sort by %s"] = "點擊以 %s 排序";
+$locale["Columns: %s."] = "行: %s.";
+$locale["Comment"] = "意見";
+$locale["Comment modified on %s by %s"] = "意見在 %s 被 %s 變更";
+$locale["Comments"] = "意見";
+$locale["Complete."] = "完成";
+$locale["Conflicting Edits!"] = "發生衝突!";
+$locale["Content"] = "內容";
+$locale["Contents"] = "內容";
+$locale["ContributedTranslations"] = "ContributedTranslations";
+$locale["Control characters not allowed"] = "控制字元是不被允許的";
+$locale["Convert text into a png image using GD."] = "使用 GD 轉換文字為 png 圖片";
+$locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "轉換 TeX 為圖片. 可以用來在 PhpWiki 嵌入方程式.";
+$locale["Couldn't chmod page '%s' to '%s'."] = "無法為頁面 '%s' 變更權限為 '%s'.";
+$locale["Couldn't rename page '%s' to '%s'."] = "無法更名頁面 '%s' 為 '%s'.";
+$locale["Count"] = "計數";
+$locale["Create a Wiki page by the provided name."] = "以提供的名稱建立 Wiki 頁面.";
+$locale["Create a Wiki page."] = "建立 Wiki 頁面";
+$locale["Create a new (sub)page"] = "建立新(子)頁面";
+$locale["Create: %s"] = "建立: %s";
+$locale["CreatePage"] = "CreatePage";
+$locale["CreateToc"] = "CreateToc";
+$locale["Created by CreatePage"] = "由 CreatePage 建立";
+$locale["Created directory '%s' for the page dump..."] = "為頁面傾印建立目錄 '%s'...";
+$locale["Creating pages"] = "建立頁面";
+$locale["Creator"] = "建立者";
+$locale["Current Language"] = "目前語言";
+$locale["Current Theme"] = "目前佈景主題";
+$locale["Current language: '%s'"] = "目前語言: '%s'";
+$locale["Current theme: '%s'"] = "目前佈景主題: '%s'";
+$locale["Database"] = "資料庫";
+$locale["Date Format"] = "日期格式";
+$locale["DebugInfo"] = "DebugInfo";
+$locale["Default InterWiki map file not loaded."] = "預設 InterWiki map 檔案未能載入.";
+$locale["Default language: '%s'"] = "預設語言: '%s'";
+$locale["Default preferences will be used."] = "預設偏好設定將被使用.";
+$locale["Default theme: '%s'"] = "預設佈景主題: '%s'";
+$locale["Define a translation for a specified text"] = "為特定文字定義轉換.";
+$locale["Define the translation for %s in %s"] = "為 %s 定義轉換,在 %s";
+$locale["Describe %s here."] = "在這兒描述 %s.";
+$locale["Description"] = "描述";
+$locale["Dialog"] = "對話盒";
+$locale["Diff"] = "差異";
+$locale["Diff previous Author"] = "與上個作者做比對";
+$locale["Diff previous Revision"] = "與上個修訂做比對";
+$locale["Diff: %s"] = "差異: %s";
+$locale["Differences between %s and %s of %s."] = "在 %s 與 %s 間的差異 - %s.";
+$locale["Diffing pages"] = "比對頁面差異";
+$locale["Display arbitrary SQL result tables"] = "顯示不受限制的 SQL 結果表格";
+$locale["Display differences between revisions"] = "顯示修訂間的差異";
+$locale["Display general and user specific auth information."] = "顯示一般與使用者特定認證資訊.";
+$locale["Displays a list of randomly chosen pages or redirects to a random page."] = "顯示隨機選出的頁面列表或重導向到隨機選取的頁面.";
+$locale["Displays a set of photos listed in a text file with optional descriptions"] = "顯示帶有簡單描述的文字檔內的相片集合";
+$locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] = "在內容的分離框架中顯示 url. 只能放一個框架.";
+$locale["Don't cache this page."] = "不要快取此頁面.";
+$locale["Double redirect not allowed."] = "雙重重導向是不允許的.";
+$locale["Download for backup"] = "給備份用的下載";
+$locale["Downloading html zip dumps"] = "下載 html zip dumps";
+$locale["Downloading zip dumps"] = "下載 zip dumps";
+$locale["Dump Pages"] = "傾印頁面";
+$locale["Dump Pages as XHTML"] = "傾印頁面為 XHTML";
+$locale["Dumping Pages"] = "傾印頁面中";
+$locale["Dumping html pages"] = "傾印 html 頁面";
+$locale["Dumping serial pages"] = "傾印連續頁面";
+$locale["E-Mail"] = "E-Mail";
+$locale["E-mail"] = "E-mail";
+$locale["Easy navigation buttons for %s"] = "簡單的巡覽按鈕 - %s";
+$locale["Edit"] = "編輯";
+$locale["Edit %s"] = "編輯 %s";
+$locale["Edit Area Size"] = "編輯區域大小";
+$locale["Edit Old Revision"] = "編輯舊的修訂";
+$locale["Edit aborted."] = "編輯中止.";
+$locale["Edit metadata for %s"] = "為 %s 編輯中繼資料";
+$locale["Edit old revision"] = "編輯舊修訂";
+$locale["Edit this page"] = "編輯此頁面";
+$locale["Edit this page and all subpages"] = "編輯此頁面以及所有子頁面";
+$locale["Edit: %s"] = "編輯: %s";
+$locale["EditMetaData"] = "編輯中繼資料";
+$locale["EditText"] = "EditText";
+$locale["Edited by: %s"] = "由 %s 編輯";
+$locale["Editing pages"] = "編輯頁面";
+$locale["Elapsed time: %s s"] = "經過時間: %s s";
+$locale["Email Verification"] = "Email 驗證.";
+$locale["Email not yet verified."] = "Email 尚未被驗證.";
+$locale["Email verified."] = "Email 已被驗證.";
+$locale["Embed hidden comments in WikiPages."] = "在 Wiki頁面嵌入隱藏意見.";
+$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "空的偏好設定或 UserPreferences cookie 格式無法辨認.";
+$locale["Empty link to: %s"] = "沒有連結到: %s";
+$locale["Empty pagename!"] = "空白的頁面名稱!";
+$locale["Enable configurable polls"] = "啟動設定好的投票";
+$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing).";
+$locale["Enter your UserId to sign in"] = "輸入你的帳號進行簽入";
+$locale["Error: Empty search string."] = "錯誤: 空白的搜尋字串.";
+$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "錯誤: 使用者的首頁必須是一個合法的 WikiWord. 抱歉, UserPreferences 無法儲存.";
+$locale["Every"] = "每";
+$locale["Expiry parameters"] = "過期參數";
+$locale["External Links"] = "外部連結";
+$locale["ExternalSearch"] = "外部搜尋";
+$locale["Fatal PhpWiki Error"] = "致命的 PhpWiki 錯誤";
+$locale["File successfully uploaded."] = "檔案已經成功地上傳.";
+$locale["FindPage"] = "FindPage";
+$locale["First"] = "開頭";
+$locale["FrameInclude"] = "FrameInclude";
+$locale["From english to %s: "] = "從英文到 %s:";
+$locale["Full text search results for '%s'"] = "以 '%s' 全文搜尋的結果";
+$locale["FullDump"] = "完整傾印";
+$locale["FullRecentChanges"] = "FullRecentChanges";
+$locale["FullTextSearch"] = "FullTextSearch";
+$locale["FuzzyPages"] = "FuzzyPages";
+$locale["General Auth Settings"] = "一般認證設定";
+$locale["Get an email notification at changes of the following pages:"] = "在變更下列頁面時取得 email 通知:";
+$locale["Get debugging information for %s."] = "為 %s 取得除錯資訊.";
+$locale["Get preferences information for current user %s."] = "為目前使用者 %s 取得偏好設定資訊.";
+$locale["Go"] = "Go";
+$locale["Go to or create page."] = "前往或建立頁面.";
+$locale["GoTo"] = "GoTo";
+$locale["GooglePlugin"] = "GooglePlugin";
+$locale["Group %s does not exist"] = "群組 %s 不存在";
+$locale["Guest"] = "訪客";
+$locale["Guests"] = "訪客";
+$locale["H"] = "高";
+$locale["Height"] = "高度";
+$locale["HelloWorld"] = "HelloWorld";
+$locale["Here you can override site-specific default values."] = "你可以在這裡覆寫掉站台預設的值.";
+$locale["Hide %s:"] = "隱藏 %s:";
+$locale["Hide or show LinkIcons (if supported by the current theme). Useful for text-only browsers or slow connections."] = "隱藏或顯示連結圖示 (如果目前佈景主題有支援). 只有在瀏覽器認為頻寬過慢的情況下被使用.";
+$locale["History of all major and minor edits by %s to page %s."] = "所有被 %s 修改的主要和次要修訂歷程 - 頁面 %s.";
+$locale["History of all major and minor modifications for any page edited by %s."] = "被 %s 修改的所有頁面的主要與次要變更歷程.";
+$locale["History of changes."] = "變更的歷程.";
+$locale["Hit statistics"] = "擊閱數統計";
+$locale["Hits"] = "點擊";
+$locale["Hits:"] = "點擊數:";
+$locale["HomePage"] = "首頁";
+$locale["HomePageAlias"] = "HomePageAlias";
+$locale["HowToUseWiki"] = "HowToUseWiki";
+$locale["I'm just doing minor edits. Please divert the usual logging to %s instead."] = "我正在做次要編輯. 請轉移常用日誌到替代的 %s.";
+$locale["I'm sorry, there is no such page as %s."] = "抱歉,這裡沒有任何被命名為 %s 的頁面.";
+$locale["I'm sorry.  Version %d of %s is not in the database."] = "抱歉, 版本是 %d 的 %s 不在資料庫中.";
+$locale["Image loaded from cache file: %s"] = "影像已從快取檔案: %s 載入";
+$locale["Image saved to cache file: %s"] = "影像存於快取檔案: %s";
+$locale["In the time since you started editing this page, another user has saved a new version of it."] = "從你上次修改這個頁面到現在的這段時間,已經有使用者儲存了較新的版本.";
+$locale["Include an external web page within the body of a wiki page."] = "含括外部網頁到 wiki 頁面的內容中.";
+$locale["Include recursively all linked pages starting at %s"] = "遞迴地含括所有從 %s 開始有連結到的網頁.";
+$locale["Include text from another wiki page."] = "從其他 wiki 頁面含括文字.";
+$locale["IncludePage"] = "含括頁面";
+$locale["IncludeSiteMap"] = "IncludeSiteMap";
+$locale["Included from %s"] = "從 %s 含括進來";
+$locale["Included from %s:"] = "已從 %s 含括:";
+$locale["Includes the content of all SubPages of the current page."] = "含括目前頁面所有子頁面的內容.";
+$locale["Index"] = "索引";
+$locale["Info"] = "Info";
+$locale["Inline images"] = "Inline 圖片";
+$locale["Insufficient permissions."] = "權限不足.";
+$locale["InterWiki"] = "InterWiki";
+$locale["InterWiki Address"] = "InterWiki 位址";
+$locale["InterWikiMap"] = "InterWikiMap";
+$locale["InterWikiSearch"] = "InterWikiSearch";
+$locale["Invalid chmod string"] = "錯誤的 chmod 字串";
+$locale["Invalid color: %s"] = "錯誤的顏色值: %s";
+$locale["Invalid password or userid."] = "錯誤的密碼或使用者帳號.";
+$locale["JabberPresence"] = "JabberPresence";
+$locale["Keep up to %d major edits, but keep them no longer than %d days."] = "保持 %d 份主要編輯,但不超過 %d 天.";
+$locale["Language"] = "語言";
+$locale["Last"] = "最後";
+$locale["Last Author"] = "最後一位修改的作者";
+$locale["Last Modified"] = "最後修改";
+$locale["Last Summary"] = "最後摘要";
+$locale["LatestSnapshot"] = "最新快照";
+$locale["Layout tables using a very rich markup style."] = "使用豐富標記風格進行佈局的表格.";
+$locale["Layout tables using the old markup style."] = "使用舊標記風格佈局的表格.";
+$locale["Leading %s not allowed"] = "前面的 %s 是不被允許的";
+$locale["Legend"] = "圖例";
+$locale["LikePages"] = "LikePages";
+$locale["List PageHistory for %s"] = "列出 PageHistory (頁面歷程) - %s";
+$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."] = "列出所有被使用者編輯的頁面修訂,並帶有差異連結,或顯示像是頁面歷程的單一頁面列表.";
+$locale["List all pages in this wiki."] = "在此 wiki 列出所有頁面.";
+$locale["List all pages which link to %s."] = "列出所有連結到 %s 的頁面.";
+$locale["List page names which share an initial or final title word with '%s'."] = "列出分享為 '%s' 開頭或結尾的標題字的頁面名稱";
+$locale["List pages which are not linked to by any other page."] = "列出未被其他頁面連結到的頁面.";
+$locale["List the most popular pages."] = "列出最受歡迎的頁面.";
+$locale["List this page and all subpages"] = "列出所有頁面以及子頁面";
+$locale["ListSubpages"] = "ListSubpages";
+$locale["Lists referenced page names which do not exist yet."] = "列出還未存在的頁面名稱.";
+$locale["Lists the names of all SubPages of the current page."] = "列出目前頁面的所有子頁面名稱.";
+$locale["Load File"] = "載入檔案";
+$locale["Loading '%s'"] = "載入 '%s'";
+$locale["Loading InterWikiMap from external file %s."] = "從外部檔案 %s 載入 InterWikiMap";
+$locale["Loading files"] = "載入檔案";
+$locale["Loading up virgin wiki"] = "載入原始 wiki";
+$locale["Lock Page"] = "鎖定頁面";
+$locale["Lock page to enable link"] = "鎖定頁面以打開此連結";
+$locale["Locked"] = "已鎖定";
+$locale["Locking pages"] = "鎖定頁面";
+$locale["Login"] = "登入";
+$locale["MIME file %s"] = "MIME 檔案 %s";
+$locale["Make use of the Google API"] = "Make use of the Google API";
+$locale["Markup"] = "標記";
+$locale["Markup cache purged!"] = "標記快取已經清除!";
+$locale["Markup:"] = "標記";
+$locale["Merge Edit"] = "合併編輯";
+$locale["Merge and Edit: %s"] = "合併並離開: %s";
+$locale["Method '%s' not implemented in this GROUP_METHOD %s"] = "方法 '%s' 未實作在 GROUP_METHOD %s";
+$locale["Minor"] = "次要";
+$locale["Minor Edit"] = "次要編輯";
+$locale["Missing %s for %s"] = "遺失了 %s 的 %s";
+$locale["Modern"] = "Modern";
+$locale["Modified"] = "已變更";
+$locale["Moniker"] = "名字";
+$locale["MostPopular"] = "MostPopular";
+$locale["Name"] = "名稱";
+$locale["New comment."] = "新意見.";
+$locale["New password"] = "新密碼";
+$locale["New users may use an empty password."] = "新使用者可以使用空白密碼.";
+$locale["Newer page:"] = "較新的頁面:";
+$locale["Next"] = "下一個";
+$locale["Next Month"] = "下個月";
+$locale["No LDAP in this PHP version"] = "此版本的 PHP 無 LDAP";
+$locale["No changes found"] = "沒發現任何變更";
+$locale["No changes."] = "沒有變更.";
+$locale["No or not enough GROUP_DB SQL statements defined"] = "沒有或缺少足夠的 GROUP_DB SQL 敘述定義";
+$locale["No or unsupported GROUP_METHOD defined"] = "沒有或不支援的 GROUP_METHOD 定義.";
+$locale["No other page links to %s yet."] = "沒有頁面連結到 %s.";
+$locale["No page links to %s."] = "沒有頁面連結到 %s.";
+$locale["No pagedata for %s"] = "無頁面資料 %s";
+$locale["No pagename specified"] = "沒有指定頁面名稱";
+$locale["No pages changed."] = "沒有頁面被變更.";
+$locale["No revisions found"] = "沒找到修訂";
+$locale["No uploaded file to upload?"] = "沒有要上傳的檔案?";
+$locale["No userid"] = "沒有此使用者帳號";
+$locale["NoCache"] = "NoCache";
+$locale["None"] = "無";
+$locale["Not enough questions answered!"] = "沒有足夠的已回答問題!";
+$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."] = "注意:許多瀏覽器會自動調整編輯區域的寬度以填滿瀏覽視窗. 在這種情況下,寬度設定將會被忽略.";
+$locale["Note, that user accounts with bouncing emails will be disabled."] = "注意, 使用者帳號的回信(bouncing emails)將被關閉.";
+$locale["Note:"] = "注意:";
+$locale["Okay"] = "Okay";
+$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] = "Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences.";
+$locale["OldStyleTable"] = "OldStyleTable";
+$locale["Older page:"] = "較舊的頁面:";
+$locale["One page links to %s:"] = "一個頁面連結到 %s:";
+$locale["One page would link to %s:"] = "有個頁面可能連結到 %s:";
+$locale["Oops! Revision %s of %s seems to have been deleted!"] = "Acck! 修訂 %s - %s 看來已經被刪除了!";
+$locale["Original (1.2 or 1.0)"] = "原始 (1.2 或 1.0)";
+$locale["Orphaned Pages in this wiki (%d total):"] = "在此 wiki 中所有遺漏的頁面 (共 %d):";
+$locale["OrphanedPages"] = "OrphanedPages";
+$locale["Other diffs:"] = "其他差異:";
+$locale["Other version"] = "其他版本";
+$locale["Our users created a total of %d pages."] = "這兒的使用者共建立了 %d 個頁面.";
+$locale["Owner"] = "擁有者";
+$locale["PHP syntax highlighting"] = "PHP 語法效果";
+$locale["PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."] = "PHP 無法建立新的 GD 影像流. 閱讀 lib/plugin/text2png.php 以取得更多資訊.";
+$locale["Page %s not found."] = "未找到頁面 %s.";
+$locale["Page Execution took %s seconds"] = "執行此頁面花了 %s 秒";
+$locale["Page Locked"] = "頁面已被鎖定";
+$locale["Page Name"] = "頁面名稱";
+$locale["Page Type:"] = "頁面型態:";
+$locale["Page Version:"] = "頁面版本";
+$locale["Page names with prefix '%s'"] = "頁面名稱以 '%s' 開頭的";
+$locale["Page names with suffix '%s'"] = "頁面名稱以 '%s' 結尾的";
+$locale["Page now locked."] = "頁面已被鎖定.";
+$locale["Page now unlocked."] = "頁面已被解鎖定.";
+$locale["Page statistics"] = "頁面統計";
+$locale["PageChange Notification Error: Couldn't send %s to %s"] = "PageChange 通知錯誤: 無法送 %s 給 %s";
+$locale["PageChange Notification of %s sent to %s"] = "%s 的 PageChange 通知已送給 %s";
+$locale["PageDump"] = "PageDump";
+$locale["PageGroup"] = "PageGroup";
+$locale["PageGroup for %s"] = "頁面群組 - %s";
+$locale["PageHistory"] = "PageHistory";
+$locale["PageHistory for %s"] = "頁面歷程 - %s";
+$locale["PageInfo"] = "PageInfo";
+$locale["PageTrail"] = "PageTrail";
+$locale["PageTrail Plugin"] = "PageTrail Plugin";
+$locale["Password cannot be changed."] = "無法變更密碼.";
+$locale["Password updated."] = "密碼已經更新.";
+$locale["Password:"] = "密碼:";
+$locale["Perform searches on InterWiki sites listed in InterWikiMap."] = "在列在 InterWikiMap 清單中的 InterWiki 站台進行搜尋.";
+$locale["Permanently remove all selected pages."] = "永久移除選定的頁面.";
+$locale["Permission"] = "權限";
+$locale["Personal Auth Settings for '%s'"] = "'%s' 的個人認證設定.";
+$locale["Personal language:"] = "個人語言:";
+$locale["Personal theme:"] = "個人佈景主題:";
+$locale["PgsrcTranslation"] = "PgsrcTranslation";
+$locale["PhotoAlbum"] = "PhotoAlbum";
+$locale["PhpHighlight"] = "PhpHighlight";
+$locale["PhpWeather"] = "PhpWeather";
+$locale["PhpWiki engine version"] = "PhpWiki 引擎版本";
+$locale["PhpWikiAdministration"] = "PhpWikiAdministration";
+$locale["PhpWikiAdministration/Chmod"] = "PhpWikiAdministration/Chmod";
+$locale["PhpWikiAdministration/Remove"] = "PhpWikiAdministration/Remove";
+$locale["PhpWikiAdministration/Rename"] = "PhpWikiAdministration/Rename";
+$locale["PhpWikiAdministration/Replace"] = "PhpWikiAdministration/Replace";
+$locale["PhpWikiDocumentation"] = "PhpWikiDocumentation";
+$locale["PhpWikiPoll"] = "PhpWikiPoll";
+$locale["Please check it through before saving."] = "在儲存之前請再檢查一次.";
+$locale["Please contact your PhpWiki administrator for assistance."] = "請向你的 PhpWiki 管理者尋求協助.";
+$locale["Please continue editing.  (You'll find your %s at the bottom of the page.)"] = "請繼續編輯. (你將在頁面的底部找到你的 %s.)";
+$locale["Please use one of the downloadable versions rather than copying and pasting from the above preview."] = "請使用其中的可下載版本來代替在上面的預覽中複製與貼上.";
+$locale["Plugin"] = "Plugin";
+$locale["Plugin %s disabled."] = "Plugin %s 關閉.";
+$locale["Plugin %s failed."] = "Plugin %s 失敗.";
+$locale["PluginManager"] = "PluginManager";
+$locale["Plugins"] = "Plugins";
+$locale["PreferencesInfo"] = "PreferencesInfo";
+$locale["PrevNext"] = "PrevNext";
+$locale["Preview"] = "預覽";
+$locale["Preview as backup format"] = "以備份格式預覽";
+$locale["Preview as developer format"] = "以開發者格式預覽";
+$locale["Preview only!  Changes not saved."] = "僅能預覽! 更動將不被儲存.";
+$locale["Preview: Page dump of %s"] = "預覽: %s 的頁面傾印";
+$locale["Previous"] = "上一個";
+$locale["Previous Author"] = "上一次做此更動的作者";
+$locale["Previous Major Revision"] = "上一次主要修訂";
+$locale["Previous Month"] = "上個月";
+$locale["Previous Revision"] = "上一次修訂";
+$locale["Printer"] = "印表機";
+$locale["Propagate new permissions to all subpages?"] = "要傳播新的權限到所有子頁面?   ";
+$locale["Provides access to PhpWiki's lower level system information."] = "提供存取 PhpWiki 下層系統資訊.";
+$locale["Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."] = "為此頁面清除 HTML 快取. 下次將重新由 WikiMarkup 產生.";
+$locale["Purge Markup Cache"] = "清除標記快取";
+$locale["PurgeHtmlCache"] = "PurgeHtmlCache";
+$locale["Querying backend directly for '%s'"] = "為 '%s' 直接查詢後台";
+$locale["RandomPage"] = "RandomPage";
+$locale["Rate"] = "Rate";
+$locale["Rate It"] = "評比";
+$locale["RateIt"] = "RateIt";
+$locale["Rating system. Store user ratings per page"] = "評比系統. 儲存每頁的使用者評比";
+$locale["Raw HTML"] = "Raw HTML";
+$locale["Raw HTML is disabled in this wiki."] = "Raw HTML 已經被關閉.";
+$locale["RecentChanges"] = "RecentChanges";
+$locale["RecentEdits"] = "RecentEdits";
+$locale["RecentVisitors"] = "RecentVisitors";
+$locale["Recursive redirect to self: '%s'"] = "遞迴重導向到自己: '%s'";
+$locale["Recursively get BackLinks or links"] = "遞迴地取得 BackLinks 或連結";
+$locale["Redirect"] = "重導向";
+$locale["RedirectTo"] = "RedirectTo";
+$locale["Redirects to an external web site based on form input"] = "以表單輸入方式重導向到另外一個外部站台";
+$locale["References"] = "偏好設定";
+$locale["Registered Users"] = "已註冊的使用者";
+$locale["Registered Users Online: "] = "已註冊的使用者在線上:";
+$locale["Related Links"] = "相關連結";
+$locale["ReleaseNotes"] = "ReleaseNotes";
+$locale["Remove"] = "移除";
+$locale["Remove Page"] = "移除頁面";
+$locale["Remove selected pages"] = "移除選定頁面";
+$locale["Remove this page"] = "移除此頁面";
+$locale["Removed page '%s' successfully."] = "成功地移除頁面 '%s'.";
+$locale["Removing pages"] = "移除頁面";
+$locale["Rename"] = "更名";
+$locale["Rename selected pages"] = "更名已選定的頁面";
+$locale["Rename to"] = "更名為";
+$locale["Renamed page '%s' to '%s'."] = "更名頁面 '%s' 為 '%s'.";
+$locale["Replaced '%s' with '%s' in page '%s'."] = "取代 '%s' 以 '%s' 在頁面 '%s'.";
+$locale["Requires WikiAdmin privileges to edit."] = "需要 WikiAdmin 權限方能編輯.";
+$locale["Reset"] = "重設";
+$locale["Restore Anyway"] = "無論如何都回存";
+$locale["Return to %s"] = "回到 %s";
+$locale["Revision Not Found"] = "修訂未找到";
+$locale["RichTable"] = "RichTable";
+$locale["RssFeed"] = "RssFeed";
+$locale["SandBox"] = "SandBox";
+$locale["Save"] = "儲存";
+$locale["Saved on:"] = "已存放在:";
+$locale["Saved: %s"] = "已存於: %s";
+$locale["Saving this page will overwrite the current version."] = "儲存此頁面將會覆寫掉目前版本.";
+$locale["Score"] = "得分";
+$locale["Search"] = "搜尋";
+$locale["Search & Replace"] = "搜尋與取代";
+$locale["Search and replace text in selected wiki pages."] = "在選定的頁面中搜尋並更換文字.";
+$locale["Search for page titles similar to %s."] = "搜尋與 %s 相似的頁面標題";
+$locale["Search the content of all pages in this wiki."] = "在此 wiki 所有頁面中搜尋內容.";
+$locale["Search the titles of all pages in this wiki."] = "在此 wiki 的所有頁面搜尋標題.";
+$locale["See %s"] = "參照 %s";
+$locale["See %s tips for editing."] = "參照編輯時的 %s 小秘訣.";
+$locale["See: %s"] = "參閱: %s";
+$locale["Select pages"] = "選擇頁面";
+$locale["Select the pages to change:"] = "選擇頁面以進行更名:";
+$locale["Select the pages to rename:"] = "選擇頁面以進行更名:";
+$locale["Select: "] = "選擇";
+$locale["Selected page '%s' passed to '%s'."] = "已選擇的頁面 '%s' 傳遞到 '%s'.";
+$locale["Serialized file %s"] = "Serialized 到檔案 %s";
+$locale["Set individual page permissions."] = "設定個別頁面的權限.";
+$locale["SetAcl"] = "SetAcl";
+$locale["Show and add blogs for %s"] = "顯示並增加 blogs - %s";
+$locale["Show and add comments for %s"] = "顯示並對 %s 發表意見";
+$locale["Show changes for:"] = "顯示變更:";
+$locale["Show extra page Info and statistics for %s."] = "顯示額外的頁面資訊與統計 - %s.";
+$locale["Show relative dates using 'Today' and 'Yesterday'"] = "使用'今天'和'昨天'來顯示相對日期.";
+$locale["Show summary information of the current user sessions."] = "顯示目前使用者 session 的摘要資訊.";
+$locale["Show translations of various words or pages"] = "顯示多個字或頁面的轉換";
+$locale["Sign In"] = "簽入";
+$locale["Sign Out"] = "簽出";
+$locale["Sign in as:"] = "簽入為:";
+$locale["Signed Users"] = "已簽入的使用者";
+$locale["Simple RSS Feed aggregator Plugin"] = "簡單的 RSS Feed aggregator Plugin";
+$locale["Simple Sample Plugin"] = "簡單的範例 Plugin";
+$locale["Simple jabber presence plugin"] = "簡單的 jabber presence plugin";
+$locale["Since you started the deletion process, someone has saved a new version of %s.  Please check to make sure you still want to permanently remove the page from the database."] = "從你開始刪除到現在,有人已經儲存了一份 %s 的較新版本. 請檢查以確定你仍想要從資料庫中永久刪除此頁面.";
+$locale["SiteMap"] = "SiteMap";
+$locale["Size"] = "大小";
+$locale["Size:"] = "大小";
+$locale["Skipping"] = "跳過";
+$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."] = "部份更動無法自動合併. 請搜尋以 '%s' 開頭並以 '%s' 結尾的部份.在儲存之前,你需要手動編輯這些部份.";
+$locale["Someone has edited the page!"] = "有人編輯了此頁面!";
+$locale["Sorry for the inconvenience."] = "抱歉造成你的不便.";
+$locale["Sorry! You must wait at least 20 minutes until you can vote again!"] = "抱歉! 你必須等至少 20 分鐘才能在投票!";
+$locale["Sorry, no dynamic DB Session support."] = "抱歉,無動態 DB Session 支援.";
+$locale["Sorry, this version of PHP cannot create PNG image files."] = "抱歉, 這個版本的 PHP 無法建立 PNG 圖片檔.";
+$locale["Sorry. Access Restrictions not yet implemented"] = "抱歉. 存取限制尚未被實作.";
+$locale["Sort by %s"] = "以 %s 排序";
+$locale["Sound Score"] = "音節得分";
+$locale["Spelling Score"] = "拼字得分";
+$locale["SqlResult"] = "SqlResult";
+$locale["Statistics about %s."] = "關於 %s 的統計.";
+$locale["Status:"] = "狀態:";
+$locale["SteveWainstead"] = "SteveWainstead";
+$locale["SubPages of %s:"] = "%s 的子頁面:";
+$locale["Submit"] = "送出";
+$locale["Submit country"] = "送出國家";
+$locale["Submit location"] = "送出地區";
+$locale["Subpage"] = "子頁面";
+$locale["Summary"] = "摘要";
+$locale["Supplanted on:"] = "代替為";
+$locale["Supported languages"] = "已支援的語言";
+$locale["Supported themes"] = "已支援的佈景主題";
+$locale["Switch to detailed list"] = "切換到明細列表";
+$locale["Switch to summary"] = "切換到摘要";
+$locale["Synopsis"] = "概要";
+$locale["System default:"] = "系統預設:";
+$locale["SystemInfo"] = "SystemInfo";
+$locale["TODO: Google can only translate from english and french. Find a translation service for %s to language %s"] = "TODO: Google 只能從英文與法文轉換. 為 %s 尋找轉換到語言 %s 的服務.";
+$locale["TextFormattingRules"] = "TextFormattingRules";
+$locale["Thank you for editing %s."] = "謝謝你編輯了 %s.";
+$locale["Thanks for adding this translation!"] = "謝謝你增加此轉換!";
+$locale["Thanks for participating!"] = "謝謝你的參與.";
+$locale["The %d least popular pages of this wiki:"] = "本 wiki 前 %d 最不受歡迎頁面:";
+$locale["The %d most popular pages of this wiki:"] = "本 wiki 前 %d 最受歡迎頁面:";
+$locale["The %d most recent %s are listed below."] = "最近的 %d 筆列在下面 - 頁面 %s.";
+$locale["The %d most recent %s during the past %s days are listed below."] = "最近的 %d 筆列在下面 - 頁面 %s - 在過去 %s 天以來.";
+$locale["The %d most recent %s during the past day are listed below."] = "最近的 %d 筆列在下面 - 頁面 %s - 在過去一天以來.";
+$locale["The %d oldest %s are listed below."] = "最舊的 %d 筆列在下面 - 頁面 %s.";
+$locale["The %d oldest %s during the past %s days are listed below."] = "最舊的 %d 筆列在下面 - 頁面 %s - 在過去 %s 天以來.";
+$locale["The %d oldest %s during the past day are listed below."] = "最舊的 %d 筆列在下面 - 頁面 %s - 在過去一天以來.";
+$locale["The %s subpage enables simple weblogging."] = "%s 子頁面啟動簡易 weblogging";
+$locale["The ICAO '%s' wasn't recognized."] = "ICAO '%s' 無法被認可.";
+$locale["The PhpWeather plugin provides weather reports from the Internet."] = "PhpWeather plugin 由網路取得資訊並提供天氣報告";
+$locale["The PhpWiki access log file"] = "PhpWiki 存取日誌檔案";
+$locale["The crypt function is not available in this version of PHP."] = "此版本的 PHP 沒有 crypt 函數.";
+$locale["The current page has no subpages defined."] = "目前頁面沒有定義任何子頁面.";
+$locale["The current time at the server is %s."] = "目前在伺服器上的時間是 %s.";
+$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."] = "密碼長度小於系統原則所允許的長度. 抱歉,你無法登入. \n 你必須詢問系統管理者以重設密碼.";
+$locale["The most recent %s during the past %s days are listed below."] = "最新的紀錄已經列在下面 - 頁面 %s - 在過去 %s 天以來.";
+$locale["The most recent %s during the past day are listed below."] = "最新的紀錄已經列在下面 - 頁面 %s - 在過去一天以來.";
+$locale["The result of this poll so far:"] = "這次投票的結果是這樣:";
+$locale["The session.save_path directory"] = "session.save_path 目錄";
+$locale["The wordwrap of the preview doesn't take nested markup or list indentation into consideration!"] = "預覽的自動換行無法處理巢狀標記或縮排列出.";
+$locale["Theme"] = "佈景主題";
+$locale["There is no image creation data available to id '%s'. Please reload referring page."] = "沒有id '%s' 可用的圖片創作資料. 請重新載入參照頁面.";
+$locale["These page titles match fuzzy with '%s'"] = "這些頁面標題與 '%s' 有點接近";
+$locale["These pages share an initial or final title word with '%s'"] = "這些頁面分享為 '%s' 開頭或結尾的標題字.";
+$locale["This internal action page cannot viewed."] = "內部動作頁面無法瀏覽.";
+$locale["This is a minor change."] = "這是次要變更.";
+$locale["This page has been locked by the administrator so your changes can not be saved."] = "此頁面已被管理者鎖定,所以你的更動無法儲存.";
+$locale["This plugin is currently under development and does not work!"] = "此 plugin 正在開發還不能運作!";
+$locale["Time Zone"] = "時區";
+$locale["Title Search"] = "標題搜尋";
+$locale["Title search results for '%s'"] = "以 '%s' 進行標題搜尋的結果";
+$locale["TitleSearch"] = "標題搜索";
+$locale["Today"] = "今天";
+$locale["Top & bottom toolbars"] = "Top & bottom 工具列";
+$locale["Total %d plugins: "] = "共有 %d 個 plugin:";
+$locale["Total of %d languages: "] = "共有 %d 種語言:";
+$locale["Total of %d themes: "] = "共有 %d 組佈景主題: ";
+$locale["Transclude"] = "Transclude";
+$locale["Transcluded from %s"] = "Transcluded 從 %s";
+$locale["Transcluded page"] = "Transcluded 頁面";
+$locale["Translate"] = "轉換";
+$locale["Translate %s to %s in %s"] = "轉換 %s 到 %s 在 %s";
+$locale["Translate '%s' to '%s' in *%s*"] = "轉換 '%s' 到 '%s' 在 *%s*";
+$locale["TranslateText"] = "TranslateText";
+$locale["Translation Error!"] = "轉換錯誤!";
+$locale["Type it again"] = "再輸入一次:";
+$locale["Unable to connect to IMAP server "] = "無法連結到 IMAP 伺服器";
+$locale["Unable to connect to LDAP server %s"] = "無法連結到 LDAP 伺服器 %s";
+$locale["Unable to open directory '%s' for reading"] = "無法開啟目錄 '%s' 進行讀取";
+$locale["Undefined method %s for special group %s"] = "未定義的 %s, 對特別的群組 %s";
+$locale["Unexpected EOF in zip file"] = "zip 檔案中存有不被期待的 EOF.";
+$locale["UnfoldSubpages"] = "UnfoldSubpages";
+$locale["Unlock Page"] = "解除鎖定頁面";
+$locale["Unlocking pages"] = "解除鎖定頁面";
+$locale["Unsupported ACL access type %s ignored."] = "忽略不支援的 ACL 存取型態 %s.";
+$locale["Up"] = "上";
+$locale["UpLoad"] = "UpLoad";
+$locale["Update Preferences"] = "更新偏好設定";
+$locale["Upgrade disabled: user != isAdmin"] = "禁止升級: user != isAdmin";
+$locale["Upgrading this PhpWiki"] = "升級 PhpWiki";
+$locale["Upload"] = "上傳";
+$locale["Upload files to the local InterWiki Upload:<filename>"] = "上傳檔案到本地 InterWiki. Upload:<filename>";
+$locale["Uploading %s"] = "上傳中 %s";
+$locale["Uploading zip dumps"] = "上傳 zip dumps";
+$locale["Use old markup"] = "使用舊標記";
+$locale["User page"] = "使用者頁面";
+$locale["User statistics"] = "使用者統計";
+$locale["UserId"] = "帳號";
+$locale["UserId:"] = "帳號:";
+$locale["UserPreferences"] = "UserPreferences";
+$locale["Users will not be able to sign in."] = "使用者將無法簽入.";
+$locale["Using directory '%s'"] = "使用目錄 '%s'";
+$locale["Verification Status"] = "確認狀態";
+$locale["Verify the current action"] = "確認目前動作";
+$locale["Version"] = "版本";
+$locale["Version %d"] = "版本 %d";
+$locale["Version %s"] = "版本 %s";
+$locale["Versions are identical"] = "版本相同";
+$locale["View Source"] = "查看源碼";
+$locale["View Source: %s"] = "查看源碼: %s";
+$locale["View the current version"] = "查看目前版本";
+$locale["View this page and all subpages"] = "查看此頁面以及所有子頁面";
+$locale["Viewing redirecting page."] = "查看重導向的頁面.";
+$locale["Viewing the source of pages"] = "查看頁面源碼";
+$locale["Visited pages on this wiki, ordered by popularity:"] = "在此 wiki 已被參訪頁面, 以受歡迎程度排序:";
+$locale["Visualizes the Wiki structure in a graph using the 'dot' commandline tool from graphviz."] = "從 graphviz 使用 'dot' 命令列工具以圖形視覺化 Wiki 結構.";
+$locale["W"] = "寬";
+$locale["Wanted Pages for %s (%d total):"] = "%s 所需要的頁面 (共 %d):";
+$locale["Wanted Pages in this wiki (%d total):"] = "在此 wiki 所需要的頁面 (共 %d):";
+$locale["WantedPages"] = "WantedPages";
+$locale["Warning:"] = "警告:";
+$locale["Warning: The search string cannot be empty!"] = "警告: 搜尋字串不能是空白!";
+$locale["Warning: You are editing an old revision."] = "警告: 你正在編輯較舊的修訂.";
+$locale["We have a total of %d registered users."] = "共有 %d 位已註冊的使用者.";
+$locale["White space converted to single space"] = "空白空格轉換為單一空格";
+$locale["Who Is Online"] = "誰在線上";
+$locale["Who is online"] = "誰在線上";
+$locale["WhoIsOnline"] = "WhoIsOnline";
+$locale["Width"] = "寬度";
+$locale["Wiki Name"] = "Wiki 名稱";
+$locale["WikiAdminChmod"] = "WikiAdminChmod";
+$locale["WikiAdminRemove"] = "WikiAdminRemove";
+$locale["WikiAdminRename"] = "WikiAdminRename";
+$locale["WikiAdminSearchReplace"] = "WikiAdminSearchReplace";
+$locale["WikiAdminSelect"] = "WikiAdminSelect";
+$locale["WikiAdminSetAcl"] = "WikiAdminSetAcl";
+$locale["WikiAdminUtils"] = "WikiAdminUtils";
+$locale["WikiBlog"] = "WikiBlog";
+$locale["WikiDB::renamePage() not yet implemented for this backend"] = "後台的 WikiDB::renamePage() 還沒實作出來.";
+$locale["WikiForm"] = "WikiForm";
+$locale["WikiForm: %s: unknown action"] = "WikiForm: %s: 未知的動作";
+$locale["WikiPoll"] = "WikiPoll";
+$locale["WikiWikiWeb"] = "WikiWikiWeb";
+$locale["Wikiname regexp"] = "Wikiname regexp";
+$locale["With the current offset, this would be reported as %s."] = "以目前時差,這將被顯示為 %s.";
+$locale["Wrong password. Try again."] = "錯誤的密碼.再試一次.";
+$locale["XML-RPC access"] = "XML-RPC 存取";
+$locale["Yes"] = "是";
+$locale["You are signed but not authenticated as %s. "] = "你已經簽入但並未認證為 %s.";
+$locale["You are viewing an old revision of this page."] = "你正在查看此頁面的較舊修訂.";
+$locale["You can only use it via the _WikiTranslation plugin."] = "你只能透過 _WikiTranslation plugin 使用.";
+$locale["You can personalize various settings in %s."] = "你可以在 %s 自訂多種個人化設定.";
+$locale["You have not made any changes so no new version has been saved."] = "你沒有做任何更動,所以沒有存入任何新版本.";
+$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."] = "在使用任何 [WikiWord|AddingPages] 前必須先以你的帳號簽入. (%s 等.  或許也已經被其他人使用了). 帳號將會在近期更動中被用來作為連到你首頁的連結.";
+$locale["You must be an administrator to %s."] = "你必須是一個管理者才能 %s.";
+$locale["You must be an administrator to use this plugin."] = "你必須是管理者才能使用此 plugin.";
+$locale["You must sign in to %s."] = "你必須簽入才能 %s.";
+$locale["You must specify a directory to dump to"] = "你必須指定目錄以進行傾印";
+$locale["Your E-Mail:"] = "你的 E-Mail:";
+$locale["Your browser should have redirected you to %s."] = "你的瀏覽器應該會重導向到 %s.";
+$locale["Your careful attention to detail is much appreciated."] = "感謝你的小心關注.";
+$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."] = "無法儲存你所變更的部份,在你編輯的這段時間,已經有其他作者變更了.所以你所變更的部份已經和其他作者變更的部份合併.結果顯示在下面.";
+$locale["Your home page has not been created yet so your preferences cannot not be saved."] = "你的首頁還未被建立,所以你的偏好設定無法儲存.";
+$locale["Your home page is locked so your preferences cannot not be saved."] = "你的首頁已經被鎖定,所以你的偏好設定無法被儲存.";
+$locale["Your rating was %.1f"] = "你的評比是 %.1f";
+$locale["Your translated text doesn't yet appear in this %s, but the Administrator will pick it up and add to the installation."] = "你的轉換文字不存在於 %s, 但管理者將會取用並加到安裝中.";
+$locale["Your translated text is either empty or equal to the untranslated text. Please try again."] = "你的轉換文字是空白或等於未轉換的文字. 請再試一次.";
+$locale["Your translation is stored in %s"] = "你的轉換存放在 %s";
+$locale["Your version"] = "你的版本";
+$locale["[%d] See [%s]"] = "[%d] 參閱 [%s]";
+$locale["_WikiTranslation"] = "_WikiTranslation";
+$locale["access this wiki via XML-RPC"] = "透過 XML-RPC 存取此 wiki";
+$locale["argument '%s' not declared by plugin"] = "引數 '%s' 沒有被 plugin 宣告";
+$locale["by"] = "被";
+$locale["by %s"] = "被 %s";
+$locale["cached pagedata:"] = "已置於快取的頁面資料:";
+$locale["cached versiondata:"] = "已快取的版本資料:";
+$locale["chmod page '%s' to '%s'."] = "改變頁面 '%s' 權限為 '%s'.";
+$locale["compare revisions"] = "比較修訂";
+$locale["couldn't open file '%s' for writing"] = "無法寫入到 '%s'.";
+$locale["create this page"] = "建立此頁面";
+$locale["current version"] = "目前版本";
+$locale["days"] = "天";
+$locale["default page permission"] = "預設頁面權限";
+$locale["diff"] = "差異";
+$locale["diff this page"] = "比對此頁面";
+$locale["download a zip dump from this wiki"] = "從此 wiki 下載 zip dump";
+$locale["dump html pages"] = "傾印 html 頁面";
+$locale["dump serial pages"] = "傾印連續頁面";
+$locale["edit area"] = "編輯區域";
+$locale["edit this page"] = "編輯此頁面";
+$locale["edits"] = "編輯";
+$locale["from"] = "從";
+$locale["from %s"] = "從 %s";
+$locale["has edit conflicts - overwriting anyway"] = "編輯衝突 - 無論如何都覆寫";
+$locale["has edit conflicts - skipped"] = "編輯衝突 - 跳過";
+$locale["home page"] = "首頁";
+$locale["load files into this wiki"] = "載入檔案到此 wiki";
+$locale["lock this page"] = "鎖定此頁面";
+$locale["locked"] = "被鎖定";
+$locale["major edits"] = "主要編輯";
+$locale["max: %d"] = "最大: %d";
+$locale["mean: %2.3f"] = "表示: %2.3f";
+$locale["median: %d"] = "median: %d";
+$locale["minor"] = "次要";
+$locale["minor edit"] = "次要編輯";
+$locale["minor edits"] = "次要編輯";
+$locale["no cache used"] = "沒有快取被使用";
+$locale["no page specified"] = "沒有指定頁面";
+$locale["not yet"] = "尚未";
+$locale["only %d pages displayed"] = "只有 %d 個頁面顯示出來";
+$locale["page permission inherited from %s"] = "由 %s 繼承而來的頁面";
+$locale["plain file %s"] = "一般檔案 %s";
+$locale["predecessor to the previous major change"] = "上次主要變更的原始文件";
+$locale["previous revision"] = "上一次修訂";
+$locale["remove this page"] = "移除此頁面";
+$locale["renamed from %s"] = "從 %s 更名";
+$locale["revision by previous author"] = "上位作者的修訂";
+$locale["saved as %s"] = "存為 %s";
+$locale["stddev: %2.3f"] = "stddev: %2.3f";
+$locale["the file '%s'"] = "檔案 '%s'";
+$locale["to"] = "到";
+$locale["today"] = "今天";
+$locale["too long"] = "太長";
+$locale["total hits: %d"] = "總擊閱數: %d";
+$locale["trailing cruft in plugin args: '%s'"] = "trailing cruft in plugin args: '%s'";
+$locale["unknown argument '%s' to SystemInfo"] = "SystemInfo 未知的引數 '%s'";
+$locale["unlock this page"] = "解除鎖定此頁面";
+$locale["upload a zip dump"] = "上傳 zip 傾印";
+$locale["uploaded %s"] = "已上傳 %s";
+$locale["use this plugin"] = "使用此 plugin";
+$locale["verify the current action"] = "確認目前動作";
+$locale["version %d"] = "版本 %d";
+$locale["version %s"] = "版本 %s";
+$locale["view the source of this page"] = "查看此頁面源碼";
+$locale["view this page"] = "查看此頁面";
 $locale["yesterday"] =
    "昨天";
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/%E9%A6%96%E9%A0%81
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/%E9%A6%96%E9%A0%81	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/%E9%A6%96%E9%A0%81	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:49 +0000
+Date: Wed, 26 Jan 2011 17:26:48 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: %E9%A6%96%E9%A0%81 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: %E9%A6%96%E9%A0%81 7908 2011-01-26 16:28:16Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=%E9%A6%96%E9%A0%81;
   flags="";
@@ -14,6 +14,6 @@
 * 請在 RecentVisitors 簽上你的大名.
 * 參閱 RecentChanges 取得最新的頁面增加部份與變更.
 * 點擊 MostPopular 以得知那些頁面是最受歡迎的.
-* 閱讀 ReleaseNotes.
+* 閱讀 [[ReleaseNotes]].
 * 透過 PhpWikiAdministration 管理本 wiki.
 * 閱讀更多... PhpWikiDocumentation.

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/AllUsers
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/AllUsers	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/AllUsers	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:49 +0000
+Date: Fri,  4 Feb 2011 16:44:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AllUsers 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AllUsers 7928 2011-02-04 15:46:03Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AllUsers;
   flags=PAGE_LOCKED;
@@ -12,5 +12,6 @@
 的使用者列表.
 ----
 <<AllUsers>>
+
 ----
-WikiPlugin PluginManager
+[[CategoryActionPage]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/FindPage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/FindPage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/FindPage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:49 +0000
+Date: Tue,  4 Jan 2011 11:57:23 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: FindPage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: FindPage 7799 2011-01-04 11:05:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=FindPage;
   flags=PAGE_LOCKED;
@@ -29,4 +29,4 @@
 ==== Tips
 使用空白分隔每個字. 所有的字都必須符合.
 %%%在標題搜索或全文檢索時,要排除某個字的話,在該字的前面加上 '-'.
-%%%Example: 'wiki text -php' 表示搜索所有頁面包含 'wiki' __和__ 'text', 但 __不__ 包含 'php'.
+%%%Example: 'wiki text -php' 表示搜索所有頁面包含 'wiki' **和** 'text', 但 **不** 包含 'php'.

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/HomePage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/HomePage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/HomePage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:49 +0000
+Date: Wed, 26 Jan 2011 17:26:48 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: HomePage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: HomePage 7908 2011-01-26 16:28:16Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=HomePage;
   flags="";
@@ -14,6 +14,6 @@
 * 請在 RecentVisitors 簽上你的大名.
 * 參閱 RecentChanges 取得最新的頁面增加部份與變更.
 * 點擊 MostPopular 以得知那些頁面是最受歡迎的.
-* 閱讀 ReleaseNotes.
+* 閱讀 [[ReleaseNotes]].
 * 透過 PhpWikiAdministration 管理本 wiki.
 * 閱讀更多... PhpWikiDocumentation.

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/InterWikiSearch
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/InterWikiSearch	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/InterWikiSearch	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:49 +0000
+Date: Fri,  4 Feb 2011 16:44:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: InterWikiSearch 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: InterWikiSearch 7928 2011-02-04 15:46:03Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=InterWikiSearch;
   flags="";
@@ -13,5 +13,6 @@
 要查詢其他頁面的話可以用 ExternalSearchPlugin.
 
 <<InterWikiSearch>>
+
 ----
-WikiPlugin
+[[CategoryActionPage]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/PhpWikiAdministration
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/PhpWikiAdministration	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/PhpWikiAdministration	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:49 +0000
+Date: Fri,  4 Feb 2011 16:58:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PhpWikiAdministration 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PhpWikiAdministration 7929 2011-02-04 16:01:23Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
   flags=PAGE_LOCKED;
@@ -38,8 +38,8 @@
 這些連結引領你下載動態產生的 zip 檔案,裡面包含了 Wiki 裡的所有頁面.
 你可以直接下載這些 zip 檔案到你的本地電腦中.
 
-  __[ZIP Snapshot | phpwiki:?action=zip]__ 只包含了目前每個頁面的最新版本.
-  而 __[ZIP Dump | phpwiki:?action=zip&include=all]__ 則包含了所有版本.
+  **[ZIP Snapshot | phpwiki:?action=zip]** 只包含了目前每個頁面的最新版本.
+  而 **[ZIP Dump | phpwiki:?action=zip&include=all]** 則包含了所有版本.
 
   ( PhpWiki 可以設置為讓每個人都能下載 zip 檔案.)
 
@@ -87,12 +87,12 @@
 
 === Old Formats
 
-__Serialized Files__
+**Serialized Files**
 
   傾印到目錄的結果是使用了 PHP ''serialized()'' 的回傳字串.
   對人類來說,這會使得檔案難以被閱讀,而且幾乎不太可能被編輯.
 
-__Plain Files__
+**Plain Files**
 
   只傾印頁面文字到檔案 --這表示頁面的 meta-data 會遺失. 注意, 當載入
   ''plain files'' 時,頁面名稱由檔案名稱決定.
@@ -109,7 +109,7 @@
 在的環境上使用. 頁面編輯與巡覽的連結將會從頁面上移除.
 
   XHTML 檔案群也可以下載為
-  __[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]__.
+  **[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]**.
 
 ----
 
@@ -145,5 +145,4 @@
    >>
 
 ----
-
-PhpWikiDocumentation
+[[CategoryActionPage]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/UpLoad
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/UpLoad	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/locale/zh/pgsrc/UpLoad	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:48:49 +0000
+Date: Fri,  4 Feb 2011 16:44:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: UpLoad 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: UpLoad 7928 2011-02-04 15:46:03Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=UpLoad;
   flags="";
@@ -8,9 +8,10 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-__這是實驗性的頁面. 現在只有 Wiki 管理者才能使用.__
+**這是實驗性的頁面. 現在只有 Wiki 管理者才能使用.**
 
 ----
-<<UpLoad >>
+<<UpLoad>>
+
 ----
-WikiPlugin PluginManager
+[[CategoryActionPage]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/passencrypt.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/passencrypt.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/passencrypt.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<!-- $Id: passencrypt.php 6198 2008-08-26 09:14:36Z vargenau $ -->
+<!-- $Id: passencrypt.php 8071 2011-05-18 14:56:14Z vargenau $ -->
 <title>Password Encryption Tool</title>
 <!--
 Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
@@ -22,7 +22,7 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
+with PhpWiki; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -->
 </head>

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/AllUsers
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/AllUsers	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/AllUsers	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AllUsers 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: AllUsers 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AllUsers;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,7 +8,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Here is a list of all users who have once successfully logged in, 
+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.
 ----
 <<AllUsers>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/AppendText
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/AppendText	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/AppendText	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: AppendText 7682 2010-09-10 12:03:36Z vargenau $ 
+X-Rcs-Id: $Id: AppendText 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=AppendText;
   flags=PAGE_LOCKED;

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/BackLinks
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/BackLinks	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/BackLinks	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: BackLinks 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: BackLinks 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=BackLinks;
   flags=PAGE_LOCKED;
@@ -19,7 +19,7 @@
 ----
 
 To display the list of pages which all contain multiple links use a pagelist as page argument.
-For example {{{<<BackLinks page=Milk,Honey>>}}} would display all pages which 
+For example {{{<<BackLinks page=Milk,Honey>>}}} would display all pages which
 contain links to Milk AND Honey.
 
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FAddCommentPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FAddCommentPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FAddCommentPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FAddCommentPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FAddCommentPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAddCommentPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -26,7 +26,7 @@
 ! Default value
 |-
 | **jshide**
-| Boolean if the comments and/or textbox should be initially hidden and on click expanded. 
+| Boolean if the comments and/or textbox should be initially hidden and on click expanded.
 | 0
 |-
 | **order**
@@ -34,15 +34,15 @@
 | normal
 |-
 | **mode**
-| List of add and/or show.  
+| List of add and/or show.
 | add,show
 |-
 | **noheader**
-| Boolean if the "Comments" header should be omitted. 
+| Boolean if the "Comments" header should be omitted.
 | 0
 |-
 | **pagename**
-| Attach to which page? 
+| Attach to which page?
 | current pagename
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FAnalyseAccessLogSqlPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FAnalyseAccessLogSqlPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FAnalyseAccessLogSqlPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FAnalyseAccessLogSqlPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAnalyseAccessLogSqlPlugin;
   flags=PAGE_LOCKED;
@@ -8,13 +8,13 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~AnalyseAccessLogSql** [[Help:WikiPlugin|plugin]] provides a framework to analyse the SQL access log 
+The **~AnalyseAccessLogSql** [[Help:WikiPlugin|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 
+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 ##lib/plugin/~AnalyseAccessLogSql.php##. 
+specific dialect of SQL are provided in ##lib/plugin/~AnalyseAccessLogSql.php##.
 For more information, please see the section *Adding new queries* below.
 
 == Usage ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FBackLinksPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FBackLinksPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FBackLinksPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FBackLinksPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FBackLinksPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FBackLinksPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -39,7 +39,7 @@
 | false
 |-
 | **linkmore**
-| If count > 0 and limit > 0 display a link with the number of all results, linked to the given pagename. 
+| If count > 0 and limit > 0 display a link with the number of all results, linked to the given pagename.
 |
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCacheTestPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCacheTestPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCacheTestPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FCacheTestPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FCacheTestPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCacheTestPlugin;
   flags=PAGE_LOCKED;
@@ -28,11 +28,11 @@
 | This is a simple example using WikiPluginCached
 |-
 | **font**
-| 
+|
 | 3
 |-
 | **type**
-| 
+|
 | png
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCategories
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCategories	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCategories	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FCategories 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FCategories 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCategories;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -17,7 +17,7 @@
 
 == Creating a new category ==
 
-The simplest way to create a new category is to to go the 
+The simplest way to create a new category is to to go the
 [[:CategoryCategory|CategoryCategory]] page.
 
 Enter its name (starting with "Category") and hit "CreatePage" button.

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCreateBibPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCreateBibPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCreateBibPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 16:09:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FCreateBibPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FCreateBibPlugin 7761 2010-12-09 15:10:09Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCreateBibPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,17 +8,25 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~CreateBib** [[Help:WikiPlugin|plugin]] creates a ~BibTex file from linked pages.
 
 == Usage ==
 {{{
-<<CreateBib>>
+<<CreateBib arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **pagename**
+| The page from which the ~BibTex file is generated
+|
+|}
 
 == Example ==
 
@@ -29,7 +37,7 @@
 <<CreateBib>>
 
 == Author ==
-* [[PhpWiki:ReiniUrban|Reini Urban]]
+* Lea Viljanen
 
 == See Also ==
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCreateTocPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FCreateTocPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Tue, 21 Sep 2010 09:44:16 +0000
+Date: Wed,  4 May 2011 17:46:02 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FCreateTocPlugin 7705 2010-09-21 07:45:12Z vargenau $
+X-Rcs-Id: $Id: Help%2FCreateTocPlugin 8068 2011-05-04 15:48:08Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCreateTocPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -32,7 +32,7 @@
 | true
 |-
 | **firstlevelstyle**
-| Style of first level numbering: number, letter or roman.
+| Style of first level numbering: //number//, //letter// or //roman//.
 | number
 |-
 | **headers**
@@ -48,7 +48,7 @@
 | false
 |-
 | **liststyle**
-| List style: dl or ol or ul. Using ol is equivalent to with_counter=1.
+| List style: //dl// or //ol// or //ul//. Using //ol// is equivalent to //with_counter=1//.
 | dl
 |-
 | **noheader**
@@ -63,16 +63,16 @@
 | Table of Contents of which page?
 | current pagename
 |-
+| **position**
+| Where to display the Table of Contents: //full//, //left// or //right//.
+| full
+|-
 | **version**
-| page version
+| Page version
 | most recent version
 |-
-| **position**
-| Where to display the Table of Contents: full, left or right.
-| full
-|-
 | **width**
-| Width of Table of Contents (if position is left or right)
+| Width of Table of Contents (if position is //left// or //right//)
 | 200px
 |-
 | **with_counter**

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FDynamicIncludePagePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FDynamicIncludePagePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FDynamicIncludePagePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FDynamicIncludePagePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FDynamicIncludePagePlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FDynamicIncludePagePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -44,7 +44,7 @@
 
 == See Also ==
 
-* [[Help:IncludePagePlugin]] 
+* [[Help:IncludePagePlugin]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FExternalSearchPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FExternalSearchPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FExternalSearchPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue,  4 Jan 2011 12:30:30 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FExternalSearchPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FExternalSearchPlugin 7801 2011-01-04 11:31:19Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FExternalSearchPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -30,16 +30,16 @@
 | **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
+'##**%s**##' can be used to insert a search query into the url rather
 than appending it.
 |
 |-
 | **name**
-| Text to display in the submit button. 
+| 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. 
+| Specify the input area size.
 | 30 characters
 |-
 | **debug**
@@ -72,6 +72,12 @@
 Enter any existing page name on ~PhpWiki to jump to that page:
 <<ExternalSearch url=PhpWiki>>
 
+== See Also ==
+* [[Help:TitleSearchPlugin]]
+* [[Help:FullTextSearchPlugin]]
+* [[Help:ExternalSearchPlugin]]
+* [[Help:InterWikiSearchPlugin]]
+
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FFileInfoPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FFileInfoPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FFileInfoPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FFileInfoPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FFileInfoPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFileInfoPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -44,7 +44,7 @@
 |-
 | **quiet**
 | print no error if file not found
-| false 
+| false
 |}
 
 == Examples ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FFullTextSearchPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FFullTextSearchPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:39:15 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FFullTextSearchPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FFullTextSearchPlugin 7755 2010-12-09 13:39:40Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFullTextSearchPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,19 +8,55 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~FullTextSearch** [[Help:WikiPlugin|plugin]] searches the content of all pages in this wiki.
 
 == Usage ==
 {{{
-<<FullTextSearch>>
+<<FullTextSearch arguments>>
 }}}
 
 == Arguments ==
 
 All [[Help:PageList|PageList]] arguments, plus the following ones.
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **s**
+| The search term
+| //none//
+|-
+| **hilight**
+| Highlight results (boolean)
+| true
+|-
+| **case_exact**
+| Search with case exact (boolean)
+| false
+|-
+| **regex**
+| Type of regular expression used for searching
+| auto
+|-
+| **sortby**
+| Sorting order for results
+| ~-hi_content
+|-
+| **noheader**
+| Do not display header (boolean)
+| false
+|-
+| **exclude**
+| Comma-seperated list of glob to exclude
+| false
+|-
+| **quiet**
+| Be less verbose (boolean)
+| true
+|}
 
 == Example ==
 
@@ -34,6 +70,9 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
+* [[Help:TitleSearchPlugin]]
+* [[Help:ExternalSearchPlugin]]
+* [[Help:InterWikiSearchPlugin]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FGooglePluginPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FGooglePluginPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FGooglePluginPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FGooglePluginPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FGooglePluginPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FGooglePluginPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -38,15 +38,15 @@
 | search
 |-
 | **startIndex**
-| 
+|
 | 1
 |-
 | **maxResults**
-| 
+|
 | 10
 |-
 | **formsize**
-| 
+|
 | 30
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FGraphVizPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FGraphVizPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FGraphVizPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:49:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FGraphVizPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FGraphVizPlugin 7756 2010-12-09 13:49:21Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FGraphVizPlugin;
   flags=PAGE_LOCKED;
@@ -44,17 +44,17 @@
 {{{
 <<GraphViz
 digraph automata_0 {
-	size ="8.5, 11";
-	node  [ shape  = circle];
-	0 [ style = filled, color=lightgrey ];
-	2 [ shape = doublecircle ];
-	0 -> 2 [ label = "a " ];
-	0 -> 1 [ label = "other " ];
-	1 -> 2 [ label = "a " ];
-	1 -> 1 [ label = "other " ];
-	2 -> 2 [ label = "a " ];
-	2 -> 1 [ label = "other " ];
-	"Machine: a" [ shape = plaintext ];
+        size ="8.5, 11";
+        node  [ shape  = circle];
+        0 [ style = filled, color=lightgrey ];
+        2 [ shape = doublecircle ];
+        0 -> 2 [ label = "a " ];
+        0 -> 1 [ label = "other " ];
+        1 -> 2 [ label = "a " ];
+        1 -> 1 [ label = "other " ];
+        2 -> 2 [ label = "a " ];
+        2 -> 1 [ label = "other " ];
+        "Machine: a" [ shape = plaintext ];
 }
 >>
 }}}
@@ -63,17 +63,17 @@
 
 <<GraphViz
 digraph automata_0 {
-	size ="8.5, 11";
-	node  [shape  = circle];
-	0 [ style = filled, color=lightgrey ];
-	2 [ shape = doublecircle ];
-	0 -> 2 [ label = "a " ];
-	0 -> 1 [ label = "other " ];
-	1 -> 2 [ label = "a " ];
-	1 -> 1 [ label = "other " ];
-	2 -> 2 [ label = "a " ];
-	2 -> 1 [ label = "other " ];
-	"Machine: a" [ shape = plaintext ];
+        size ="8.5, 11";
+        node  [shape  = circle];
+        0 [ style = filled, color=lightgrey ];
+        2 [ shape = doublecircle ];
+        0 -> 2 [ label = "a " ];
+        0 -> 1 [ label = "other " ];
+        1 -> 2 [ label = "a " ];
+        1 -> 1 [ label = "other " ];
+        2 -> 2 [ label = "a " ];
+        2 -> 1 [ label = "other " ];
+        "Machine: a" [ shape = plaintext ];
 }
 >>
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FHtmlConverterPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FHtmlConverterPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FHtmlConverterPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 17:30:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FHtmlConverterPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FHtmlConverterPlugin 7764 2010-12-09 16:36:20Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FHtmlConverterPlugin;
   flags=PAGE_LOCKED;
@@ -28,7 +28,7 @@
 <<HtmlConverter>>
 
 == Authors ==
-* [Hendrik Scheider|mailto:hendrik.scheider at wincor-nixdorf.com]
+* [[mailto:hendrik.scheider at wincor-nixdorf.com|Hendrik Scheider]]
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FImages
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FImages	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FImages	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,8 +1,8 @@
-Date: Tue,  9 Nov 2010 16:13:37 +0000
+Date: Tue, 11 Jan 2011 13:48:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FRichTablePlugin 7682 2010-09-10 12:03:36Z vargenau $ 
+X-Rcs-Id: $Id: Help%2FImages 7826 2011-01-11 12:52:54Z vargenau $
 Content-Type: application/x-phpwiki;
-  pagename=Help%2FRichTablePlugin;
+  pagename=Help%2FImages;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
   markup=2;
   charset=UTF-8
@@ -12,7 +12,7 @@
 
 == Uploaded images ==
 
-First, image files need to be uploaded in the wiki. For that purpose, you will use the 
+First, image files need to be uploaded in the wiki. For that purpose, you will use the
 [[Help:UpLoadPlugin|UpLoad]] plugin.
 
 === Toolbar ===
@@ -43,12 +43,12 @@
 inlines the image with an alternative text.
 
 {{{
-[[some link|{{myimage.png}}]] 
+[[some link|{{myimage.png}}]]
 }}}
 if you click on the image, will goto "some link"
 
 {{{
-[[some link|{{myimage.png|alt text}}]] 
+[[some link|{{myimage.png|alt text}}]]
 }}}
 same with alternative
 
@@ -100,7 +100,12 @@
 
 [[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/poweredby_phpwiki_51x31.png]]
 
+== See Also ==
+* [[Help:Adobe Flash]]
+* [[Help:VideoPlugin]]
+* [[Help:Wikicreole]]
+
 <noinclude>
 ----
-[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
+[[PhpWikiDocumentation]]
 </noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludePagePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludePagePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Mon, 20 Sep 2010 16:44:13 +0000
+Date: Mon, 17 Jan 2011 17:13:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FIncludePagePlugin 7699 2010-09-20 14:45:28Z vargenau $
+X-Rcs-Id: $Id: Help%2FIncludePagePlugin 7839 2011-01-17 16:16:15Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludePagePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -33,10 +33,6 @@
 | the revision
 | most recent revision
 |-
-| **version**
-| page revision (same as ##rev##)
-| most recent revision
-|-
 | **quiet**
 | if set, inclusion appears as normal content
 | false

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludePagesPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludePagesPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludePagesPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 17:45:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FIncludePagesPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FIncludePagesPlugin 7765 2010-12-09 16:47:26Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludePagesPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,31 +8,45 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~IncludePages** [[Help:WikiPlugin|plugin]] will "include" a list of multiple pages, based on [IncludePage|Help:IncludePage] plugin.
+The **~IncludePages** [[Help:WikiPlugin|plugin]] will "include" a list of multiple pages, based on [[Help:IncludePagePlugin|IncludePage]] plugin.
 
 == Usage ==
 {{{
-<<IncludePages pages=<!plugin-list BackLinks !> >>
+<<IncludePages arguments >>
 }}}
 
 == Arguments ==
 
-pages
-  The list of pages to execute upon.
+All arguments from [[Help:IncludePagePlugin|IncludePage]] plugin, plus the following ones.
 
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **pages**
+| The pages to include
+| //none//
+|-
+| **exclude**
+| The pages to exclude
+| false
+|}
+
 == Example ==
 
 {{{
-<<IncludePages>>
+<<IncludePages pages=<!plugin-list BackLinks !> >>
 }}}
 
-<<IncludePages>>
+<<IncludePages pages=<!plugin-list BackLinks !> >>
 
 == Author ==
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
-* [Help:IncludePagePlugin]
+* [[Help:IncludePagePlugin]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludeSiteMapPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludeSiteMapPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FIncludeSiteMapPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 10:37:40 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FIncludeSiteMapPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FIncludeSiteMapPlugin 7753 2010-12-09 09:39:02Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludeSiteMapPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,30 +8,82 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+This is a quick mod of [[Help:BackLinksPlugin|BackLinks plugin]] to do the job recursively. If your
+site is categorized correctly, and all the categories are listed in
+[[:CategoryCategory|CategoryCategory]], then a recursive ~BackLinks there will produce a contents
+page for the entire site.
 
+The list is as deep as the recursion level (##reclimit##).
+
 == Usage ==
 {{{
-<<IncludeSiteMap>>
+<<IncludeSiteMap direction=back|forward reclimit=4>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **direction**
+| Get BackLinks or forward links (links listed on the page)
+|
+|-
+| **firstreversed**
+| If true, get BackLinks for the first page and forward links for the rest.  Only applicable when direction = 'forward'.
+|
+|-
+| **excludeunknown**
+| If true (default) then exclude any mentioned pages which don't exist yet.  Only applicable when direction = 'forward'.
+|
+|-
+| **exclude**
+|
+|
+|-
+| **include_self**
+|
+| 0
+|-
+| **noheader**
+|
+| 0
+|-
+| **page**
+|
+| The current page
+|-
+| **description**
+| Override default Description. Printed as header.
+|
+|-
+| **reclimit**
+|
+| 4
+|-
+| **info**
+|
+| false
+|}
 
 == Example ==
 
 {{{
-<<IncludeSiteMap>>
+<<SiteMap page=PhpWikiDocumentation>>
 }}}
 
-<<IncludeSiteMap>>
+<<SiteMap page=PhpWikiDocumentation>>
 
 == Author ==
-* [[PhpWiki:ReiniUrban|Reini Urban]]
+* Cuthbert Cat
+* Redesigned by [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
+* [[Help:BackLinksPlugin]]
+* [[Help:SiteMapPlugin]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FInterWikiSearchPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FInterWikiSearchPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FInterWikiSearchPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:39:15 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FInterWikiSearchPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FInterWikiSearchPlugin 7755 2010-12-09 13:39:40Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FInterWikiSearchPlugin;
   flags=PAGE_LOCKED;
@@ -8,17 +8,29 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~FullTextSearch** [[Help:WikiPlugin|plugin]] performs searches on ~InterWiki sites listed in InterWikiMap.
 
 == Usage ==
 {{{
-<<InterWikiSearch>>
+<<InterWikiSearch arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **s**
+| The search term
+| //none//
+|-
+| **formsize**
+|
+| 30
+|}
 
 == Example ==
 
@@ -32,6 +44,9 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
+* [[Help:TitleSearchPlugin]]
+* [[Help:FullTextSearchPlugin]]
+* [[Help:ExternalSearchPlugin]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FJabberPresencePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FJabberPresencePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FJabberPresencePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 20:12:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FJabberPresencePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FJabberPresencePlugin 7773 2010-12-09 19:41:24Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FJabberPresencePlugin;
   flags=PAGE_LOCKED;
@@ -8,28 +8,47 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~JabberPresence** [[Help:WikiPlugin|plugin]] shows Jabber presence status.
 
 == Usage ==
 {{{
-<<JabberPresence>>
+<<JabberPresence arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **scripturl**
+| 
+| http://edgar.netflint.net/status.php
+|-
+| **jid**
+| 
+|
+|-
+| **type**
+| 
+| image
+|-
+| **iconset**
+| 
+| gabber
+|}
 
 == Example ==
 
 {{{
-<<JabberPresence>>
+<<JabberPresence scripturl=http://edgar.netflint.net/status.php
+                 jid=yourid at jabberserver type=html iconset=phpbb >>
 }}}
 
-<<JabberPresence>>
-
 == Author ==
-* [[PhpWiki:ReiniUrban|Reini Urban]]
+* Arnaud Fontaine
 
 == See Also ==
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FLdapSearchPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FLdapSearchPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FLdapSearchPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FLdapSearchPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FLdapSearchPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FLdapSearchPlugin;
   flags=PAGE_LOCKED;
@@ -17,54 +17,54 @@
            host="localhost"
            port=389
            basedn=""
- 	   filter="(cn=*)"
-           attributes=""  
- >>
-<<LdapSearch host=ldap.example.com filter="(ou=web-team)" 
+           filter="(cn=*)"
+           attributes=""
+>>
+<<LdapSearch host=ldap.example.com filter="(ou=web-team)"
                       attributes="sn cn telephonenumber">>
 <<LdapSearch host="ldap.itd.umich.edu" basedn="" filter="(sn=jensen)" attributes="cn drink">>
 <<LdapSearch host=ldap.example.com attributes="cn sn telephonenumber">>
 <<LdapSearch host=bugs.debian.org port=10101 basedn="dc=current,dc=bugs,dc=debian,dc=org"
-                      filter="(debbugsPackage=phpwiki)" 
+                      filter="(debbugsPackage=phpwiki)"
                       attributes="debbugsSeverity debbugsState debbugsTitle">>
 }}}
 
 == Arguments ==
 
 host _(default: from LDAP_AUTH_HOST or localhost)_:
-	hostname or ip or ldap:// uri to connect to.
+        hostname or ip or ldap:// uri to connect to.
 
 port _(default: from LDAP_AUTH_HOST or 389)_:
-	portnumber to connect to.
+        portnumber to connect to.
 
 basedn _(default: LDAP_BASE_DN)_:
-	connect string: "ou=Users,o=Development,dc=mycompany.com"
+        connect string: "ou=Users,o=Development,dc=mycompany.com"
 
 filter _(default: "(cn=*)")_:
-	Optional ldap_search() filter argument
+        Optional ldap_search() filter argument
 
 attributes _(default: empty)_ :
-	space seperated fields to return as table columns: "cn sn"
+        space seperated fields to return as table columns: "cn sn"
 
 options:
-	ldap_set_option(). Default: LDAP_SET_OPTION if host == LDAP_AUTH_HOST
-	Column seperated name=value pairs. Esp. needed for Windows Active directory:
-	"LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0"
+        ldap_set_option(). Default: LDAP_SET_OPTION if host == LDAP_AUTH_HOST
+        Column seperated name=value pairs. Esp. needed for Windows Active directory:
+        "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0"
 user:
-	Default: LDAP_AUTH_USER if host == LDAP_AUTH_HOST
+        Default: LDAP_AUTH_USER if host == LDAP_AUTH_HOST
 password:
-	Default: LDAP_AUTH_PASSWORD if host == LDAP_AUTH_HOST
-	user and password are required for Windows Active directory.
+        Default: LDAP_AUTH_PASSWORD if host == LDAP_AUTH_HOST
+        user and password are required for Windows Active directory.
 
 == Examples ==
 
-<<WikiFormRich action=LdapSearch 
+<<WikiFormRich action=LdapSearch
         editbox[] name=host value=bugs.debian.org size=80
         editbox[] name=port value=10101 size=80
         editbox[] name=basedn value="dc=current,dc=bugs,dc=debian,dc=org" size=80
-	editbox[] name=filter value="(debbugsPackage=phpwiki)" size=80
+        editbox[] name=filter value="(debbugsPackage=phpwiki)" size=80
         editbox[] name=attributes value="debbugsSeverity debbugsState debbugsTitle" size=80
-	submit[] reset[]
+        submit[] reset[]
 >>
 
 == Author ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FListPagesPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FListPagesPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FListPagesPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FListPagesPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FListPagesPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FListPagesPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -55,9 +55,9 @@
 }}}
 
 {{{
-<<ListPages info=hits 
-            sortby=hits 
-            pages=<!plugin-list BackLink page=[] !> 
+<<ListPages info=hits
+            sortby=hits
+            pages=<!plugin-list BackLink page=[] !>
             exclude=ListPagesPlugin,WikiPlugin
 >>
 }}}

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FModeratedPagePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FModeratedPagePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FModeratedPagePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FModeratedPagePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FModeratedPagePlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FModeratedPagePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -10,14 +10,14 @@
 
 == What is a ModeratedPage? ==
 
-A ModeratedPage is a page-internal setting, which restricts certain actions on certain pages. 
+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. 
+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. 
+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? ==
@@ -49,7 +49,7 @@
 ! Default value
 |-
 | **moderators**
-| comma-separated list of registered usernames or groups. 
+| comma-separated list of registered usernames or groups.
 Each user should have his email defined in his prefs.
 | "Administrators" or "<<SystemInfo ADMIN_USER>>"
 |-
@@ -57,7 +57,7 @@
 | one of 0, 1, 2 or 10 on which moderation is used
 | false (use requireaccess instead)
 |-
-| **requireaccess** 
+| **requireaccess**
 | comma-separated list of access perms, on which the moderation is used
 "view,edit,create,list,remove,change"
 | edit,remove,change
@@ -71,25 +71,25 @@
 
 == 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 
+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. 
+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 
+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 
+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 
+There may come another administrative plugin to change the moderation
 status on selected pages.
 
 == Author ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FNoCachePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FNoCachePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FNoCachePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu, 16 Dec 2010 12:28:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FNoCachePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FNoCachePlugin 7776 2010-12-16 11:28:24Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FNoCachePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -12,7 +12,7 @@
 
 == Usage ==
 {{{
-<<NoCache>>
+<<NoCache arguments>>
 }}}
 
 == Arguments ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FOldStyleTablePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FOldStyleTablePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FOldStyleTablePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu, 16 Dec 2010 12:53:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FOldStyleTablePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FOldStyleTablePlugin 7777 2010-12-16 11:53:55Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FOldStyleTablePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -11,6 +11,10 @@
 The **~OldStyleTable** [[Help:WikiPlugin|plugin]] can be used to include tables within a wiki
 page using the old-style markup syntax for tables.
 
+This plugin is included for legacy only. We recommand to
+use [[Help:Wikicreole#Tables|Wikicreole tables]]
+or [[Help:MediawikiTablePlugin|Mediawiki tables]] instead.
+
 == Usage ==
 
 {{{
@@ -31,36 +35,43 @@
 |> 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
+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.)
 
 == Arguments ==
 
-__caption__:
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **caption**
+| Any string
+| Empty string
+|-
+| **border**
+| Any number
+| 1
+|-
+| **cellspacing**
+| Any number
+| 1
+|-
+| **cellpadding**
+| Any number
+| 1
+|-
+| **summary**
+| Any string
+| Empty string
+|}
 
-  Any string. Default: ""
+== Syntax ==
 
-__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
+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.
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageDumpPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageDumpPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageDumpPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu, 16 Dec 2010 13:54:52 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPageDumpPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPageDumpPlugin 7781 2010-12-16 12:55:28Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageDumpPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,25 +8,43 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~PageDump** [[Help:WikiPlugin|plugin]] allows to view a single page dump online.
 
 == Usage ==
 {{{
-<<PageDump>>
+<<PageDump arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **page**
+| Page to dump
+| pagename
+|-
+| **format**
+| 'normal', 'forsvn', 'forcvs', 'backup'
+| none
+|-
+| **download**
+| 
+| false
+|}
 
+Note: 'forsvn' and 'forcvs' are the same.
+
 == Example ==
 
 {{{
-<<PageDump>>
+<<PageDump page=HomePage>>
 }}}
 
-<<PageDump>>
+<<PageDump page=HomePage>>
 
 == Author ==
 * [[PhpWiki:ReiniUrban|Reini Urban]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageGroupPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageGroupPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageGroupPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPageGroupPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPageGroupPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageGroupPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -24,23 +24,23 @@
 ! Default value
 |-
 | **parent**
-| 
 |
+|
 |-
 | **rev**
-| 
+|
 | false
 |-
 | **section**
-| 
+|
 | "Contents"
 |-
 | **label**
-| 
 |
+|
 |-
 | **loop**
-| 
+|
 | false
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageInfoPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageInfoPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageInfoPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 16:21:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPageInfoPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPageInfoPlugin 7763 2010-12-09 15:22:58Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageInfoPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,17 +8,32 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~PageInfo** [[Help:WikiPlugin|plugin]] returns extra information about a page.
 
+This plugin just passes a page revision handle to the Template
+'info.tmpl', which does all the real work.
+
 == Usage ==
 {{{
-<<PageInfo>>
+<<PageInfo arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **page**
+|
+| pagename
+|-
+| **version**
+|
+|
+|}
 
 == Example ==
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageList
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageList	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageList	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPageList 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPageList 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageList;
   flags="";
@@ -53,7 +53,7 @@
 | //none//
 |-
 | **limit**
-| number of rows 
+| number of rows
 | 50
 |-
 | **paging**

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPagePermissions
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPagePermissions	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPagePermissions	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPagePermissions 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPagePermissions 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPagePermissions;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -107,9 +107,9 @@
 Those perms are mapped to those actions. [[Help:ActionPage|Action Pages]] (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 
+|= 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, setaclsimple, rename. \\ All other actionpages which are not wikiwords.
 
@@ -132,17 +132,17 @@
         // view:
         if (!ALLOW_ANON_USER) {
             if (!ALLOW_USER_PASSWORDS)
-            	$perm['view'] = array(ACL_SIGNED => true);
+                $perm['view'] = array(ACL_SIGNED => true);
             else
-            	$perm['view'] = array(ACL_AUTHENTICATED => true);
+                $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);
+                $perm['edit'] = array(ACL_SIGNED => true);
             else
-            	$perm['edit'] = array(ACL_AUTHENTICATED => true);
+                $perm['edit'] = array(ACL_AUTHENTICATED => true);
             $perm['edit'][ACL_BOGOUSER] = ALLOW_BOGO_LOGIN ? true : false;
             $perm['create'] = $perm['edit'];
         }

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageTrailPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageTrailPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPageTrailPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPageTrailPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPageTrailPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageTrailPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -33,11 +33,11 @@
 | 5
 |-
 | **invisible**
-| 
+|
 | false
 |-
 | **duplicates**
-| 
+|
 | false
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPhotoAlbumPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPhotoAlbumPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPhotoAlbumPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPhotoAlbumPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -31,14 +31,14 @@
 _Only the ='src'= parameter is mandatory._
 
 *src*:
-  Url or local path to a CSV textfile which separates filename and 
+  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 
+  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.
 
-*url*: 
+*url*:
   defines the the webpath to the srcdir directory (formerly called weblocation)
 
 *mode*:
@@ -56,9 +56,9 @@
   "desc"   - Only description (from textfile) shown %%%
   "both"   - If no description found, then filename will be used %%%
 
-*link*: 
+*link*:
   true or false
-  If true, each image will be hyperlinked to a page where the single 
+  If true, each image will be hyperlinked to a page where the single
   photo will be shown full-size. Only works when mode != 'normal'
 
 *align*:
@@ -79,7 +79,7 @@
 
 *height*, *width*:
   Height and width are calculated compared to original metrics
-  retrieved by [php-function:getimagesize] and can be absolute (50px) 
+  retrieved by [php-function:getimagesize] and can be absolute (50px)
   or a percentage (e.g. "50%").
 
 *attrib*:

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPhpHighlightPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPhpHighlightPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPhpHighlightPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 17:30:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPhpHighlightPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPhpHighlightPlugin 7764 2010-12-09 16:36:20Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhpHighlightPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -49,7 +49,7 @@
   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]
+  [[http://www.w3.org/TR/REC-html40/types.html#h-6.5|HTML 4 color name]]
   in lowercase, such as ##'#0f0344'## or ##blue##. You can set the
   following options:
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPloticusPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPloticusPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPloticusPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue,  4 Jan 2011 12:22:49 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPloticusPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPloticusPlugin 7800 2011-01-04 11:25:32Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPloticusPlugin;
   flags=PAGE_LOCKED;
@@ -8,7 +8,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **Ploticus** [[Help:WikiPlugin|plugin]] passes all its arguments to the ploticus
+The **Ploticus** [[Help:WikiPlugin|plugin]] 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.
@@ -27,38 +27,56 @@
 
 {{{
 <<Ploticus -prefab vbars
-	data=myfile.dat delim=tab y=1 
-	clickmapurl="http://mywiki.url/wiki/?pagename=@2" 
-	clickmaplabel="@3" -csmap 
+        data=myfile.dat delim=tab y=1
+        clickmapurl="http://mywiki.url/wiki/?pagename=@2"
+        clickmaplabel="@3" -csmap
 >>
 }}}
 
-TODO: ~PloticusSql - create intermediate data from SQL. Similar to [SqlResult|Help:SqlResultPlugin], 
+TODO: ~PloticusSql - create intermediate data from SQL. Similar to [[Help:SqlResultPlugin|SqlResult]] plugin,
 just in graphic form.
 For example to produce nice looking pagehit statistics or ratings statistics.
 Ploticus has its own sql support within #getproc data, but this would expose security information.
 
 == Arguments ==
-__device__: |
-  gif, png, jpeg, svg, svgz, eps, swf. Any -T parameter supported by ploticus. Default: png
-__data__:  |
-  optionally add data by <!plugin-list !> pagelist plugins.  See [WikiPlugin|Help:WikiPlugin]
-__alt__:  |
-  alt text for the image
-__-prefab__:  |
-  use the given prefab script (may need PLOTICUS_PREFABS)
-__-csmap__:  |
-  If a clickable map should be produced (not yet tested)
-  passed to ploticus as -csmap -mapfile $tempfile.map 
-__help__:  |
-  Show a help screen
 
-All other arguments are used as source to ploticus.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **device**
+| gif, png, jpeg, svg, svgz, eps, swf. Any -T parameter supported by Ploticus.
+| png
+|-
+| **data**
+| optionally add data by <!plugin-list !> pagelist plugins.  See [[Help:WikiPlugin]]
+|
+|-
+| **alt**
+| alt text for the image
+|
+|-
+| **~-prefab**
+| use the given prefab script (may need PLOTICUS_PREFABS)
+|
+|-
+| **~-csmap**
+| If a clickable map should be produced (not yet tested) passed to Ploticus as -csmap -mapfile $tempfile.map
+|
+|-
+| **help**
+| Show a help screen
+|
+|}
 
+All other arguments are used as source to Ploticus.
+
 == 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 
+a Ploticus with PNG support. This comes only with the Cygwin
 build so far.
 
 == Optional Configuration ==
@@ -70,7 +88,7 @@
 prefabs need the environment variable PLOTICUS_PREFABS. Default: /usr/share/ploticus.
 Maybe also set by the config variable PLOTICUS_PREFABS.
 
-See also [WikiPluginCached|Help:WikiPluginCached] options in config.ini.
+See also [[Help:WikiPluginCached]] options in config.ini.
 
 == Examples ==
 
@@ -82,16 +100,16 @@
 
 //  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
+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
@@ -106,7 +124,7 @@
 labelfarout: 1.05
 >>
 
-The pie chart above was produced by this code from the ploticus
+The pie chart above was produced by this code from the Ploticus
 testsuite:
 
 {{{
@@ -118,16 +136,16 @@
 
 //  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
+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

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPluginManagerPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPluginManagerPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FPluginManagerPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FPluginManagerPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FPluginManagerPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPluginManagerPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -52,20 +52,20 @@
 
 == 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 [[Help:text2pngPlugin|text2png]] plugin, 
+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 [[Help:text2pngPlugin|text2png]] plugin,
 * [LaTeX2HTML | ftp://ftp.dante.de/tex-archive/support/latex2html ] for the [[Help:TexToPngPlugin|TexToPng]] plugin and [[Help:TeX2pngPlugin|TeX2png]] plugin,
-* [graphviz | http://graphviz.org/] for the [[Help:GraphVizPlugin|GraphViz]] plugin and [[Help:VisualWikiPlugin|VisualWiki]] plugin, 
-* [ploticus | http://ploticus.sourceforge.net/] for the [[Help:PloticusPlugin|Ploticus]] plugin, 
+* [graphviz | http://graphviz.org/] for the [[Help:GraphVizPlugin|GraphViz]] plugin and [[Help:VisualWikiPlugin|VisualWiki]] plugin,
+* [ploticus | http://ploticus.sourceforge.net/] for the [[Help:PloticusPlugin|Ploticus]] plugin,
 * [phpweather | http://phpweather.sf.net] for the [[Help:PhpWeatherPlugin|PhpWeather]] plugin,
 * [highlight | http://www.andre-simon.de/] for the [[Help:SyntaxHighlighterPlugin|SyntaxHighlighter]] plugin,
 * a browser with [<iframe> support|http://www.cs.tut.fi/~jkorpela/html/iframe.html] for the [[Help:TranscludePlugin|Transclude]] plugin,
 * USE_DB_SESSION = true (default for the peardb, adodb or dba backends) for the [[Help:WhoIsOnlinePlugin|WhoIsOnline]] plugin,
 * --with-xml support (with expat or libxml2) for the [[Help:RssFeedPlugin|RssFeed]] plugin (~ProjectSummary, ~RecentReleases) and ~HtmlParser support (~ImportHtml, ~HtmlAreaEditing),
-* PHP Mail functionality (php.ini: SMTP + sendmail_from on Windows or sendmail_path) for email 
+* PHP Mail functionality (php.ini: SMTP + sendmail_from on Windows or sendmail_path) for email
   PhpWiki:PageChangeNotifications and ModeratedPage's,
-* a [Google license key | http://www.google.com/apis/] for the [[Help:GooglePluginPlugin|GooglePlugin]] plugin, 
+* a [Google license key | http://www.google.com/apis/] for the [[Help:GooglePluginPlugin|GooglePlugin]] plugin,
 * optionally an external recommender engine (none yet, php only so far) and the wikilens theme for the [[Help:RateItPlugin|RateIt]] plugin,
 * optionally apache/mod_log_{my}sql for fast, external log analysis if ACCESS_LOG_SQL=1 (Referer, Abuse Prevention).
   See ##lib/Request.php## and http://www.outoforder.cc/projects/apache/mod_log_sql/

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentCommentsPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentCommentsPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentCommentsPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 20:12:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FRecentCommentsPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FRecentCommentsPlugin 7772 2010-12-09 19:22:40Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRecentCommentsPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,17 +8,77 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~RecentComments** [[Help:WikiPlugin|plugin]] lists basepages with recently added comments.
 
 == Usage ==
 {{{
-<<RecentComments>>
+<<RecentComments arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **pagename**
+| The page to execute upon
+| current pagename
+|-
+| **days**
+| Number of days. Specifying 0 will display modifications since wiki creation.
+| 2
+|-
+| **show_major**
+| Show major modifications
+| true
+|-
+| **show_deleted**
+| Show deleted pages
+| sometimes
+|-
+| **only_new**
+| Show only new pages
+| false
+|-
+| **author**
+| Show only modifications from a specific author
+| false
+|-
+| **owner**
+| Show only pages from a specific owner
+| false
+|-
+| **limit**
+| Do not show more pages that the limit.
+| false
+|-
+| **format**
+| Default is HTML. Other: rss, rss2, rss091, atom, sidebar, box, contribs
+| false
+|-
+| **daylist**
+| Comma-separated list of days
+| false
+|-
+| **difflinks**
+| Show diff links
+| true
+|-
+| **historylinks**
+| Show history links
+| false (true for Monobook and FusionForge)
+|-
+| **category**
+| Limit pages to a given category
+|
+|-
+| **pagematch**
+| Limit to pages matching pattern
+|
+|}
 
 == Example ==
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentEditsPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentEditsPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentEditsPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 18:12:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FRecentEditsPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FRecentEditsPlugin 7768 2010-12-09 17:14:11Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRecentEditsPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,17 +8,81 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~RecentEdits** [[Help:WikiPlugin|plugin]] lists all recent edits in this wiki.
 
 == Usage ==
 {{{
-<<RecentEdits>>
+<<RecentEdits arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **pagename**
+| The page to execute upon
+| current pagename
+|-
+| **days**
+| Number of days. Specifying 0 will display modifications since wiki creation.
+| 2
+|-
+| **show_major**
+| Show major modifications
+| true
+|-
+| **show_deleted**
+| Show deleted pages
+| sometimes
+|-
+| **only_new**
+| Show only new pages
+| false
+|-
+| **author**
+| Show only modifications from a specific author
+| false
+|-
+| **owner**
+| Show only pages from a specific owner
+| false
+|-
+| **limit**
+| Do not show more pages that the limit.
+| false
+|-
+| **format**
+| Default is HTML. Other: rss, rss2, rss091, atom, sidebar, box, contribs
+| false
+|-
+| **daylist**
+| Comma-separated list of days
+| false
+|-
+| **difflinks**
+| Show diff links
+| true
+|-
+| **historylinks**
+| Show history links
+| false (true for Monobook and FusionForge)
+|-
+| **caption**
+| Custom caption
+|
+|-
+| **category**
+| Limit pages to a given category
+|
+|-
+| **pagematch**
+| Limit to pages matching pattern
+|
+|}
 
 == Example ==
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentReferrersPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentReferrersPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRecentReferrersPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 18:04:52 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FRecentReferrersPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FRecentReferrersPlugin 7767 2010-12-09 17:05:52Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRecentReferrersPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,22 +8,33 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~RecentReferrers** [[Help:WikiPlugin|plugin]] allows to analyse access log.
 
 == Usage ==
 
 {{{
-<<RecentReferrers>>
+<<RecentReferrers arguments>>
 }}}
 
 == Arguments ==
 
 All [[Help:PageList|PageList]] arguments, plus the following ones.
 
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **noheader**
+| do not display header
+| false
+|-
+| **limit**
+|
+| 15
+|}
 
-page _(default: current pagename)_:
-  The page to execute upon.
-
 == Example ==
 
 {{{

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRichTablePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRichTablePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FRichTablePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Wed, 13 Apr 2011 16:54:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FRichTablePlugin 7682 2010-09-10 12:03:36Z vargenau $ 
+X-Rcs-Id: $Id: Help%2FRichTablePlugin 8048 2011-04-13 14:56:50Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRichTablePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -10,24 +10,46 @@
 
 The **~RichTable** [[Help:WikiPlugin|plugin]] is a plugin that takes off from the [[Help:OldStyleTablePlugin|OldStyleTable]] plugin. It allows a user to specify arbitrary properties of ##<table>##, ##<tr>## and ##<td>## with a very simple markup.
 
+This plugin is included for legacy only. We recommand to
+use [[Help:MediawikiTablePlugin|Mediawiki tables]] instead.
+
+== Syntax ==
+
 The contents of each cell are individually processed by the ~BlockParser. This means that you can do interesting things like put **invoke plugins**, use **enumerated lists** etc within each cell!
 
-* A ##"-"## (dash) at the start of a new line represents a new row in the table.
-* A ##"|"## (vertical bar or pipe) at the start of a new line represents a cell.
-* Attributes for the tags
-** A line that starts with a ##"*"## (star or asterisk) after a ##"|"## is parsed for attributes for the corresponding cell.
-** Attributes for the table are given on line that starts with a ##"*"##, only if the line appears before any other line except whitespace.
-** A line that starts with a ##-## 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 ##"*"## 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 ##"*"## after the ##"|"## 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 ##"~~"## and ##"?>"## should be escaped as ##"\~~"## and ##"?\>"##. I havn't discovered any other characters yet that might need to be escaped. This is required for the block parser to work.
+A ##"-"## (dash) at the start of a new line represents a new row in the table.
 
-We allow attributes with or without quotes (")
+A ##"|"## (vertical bar or pipe) at the start of a new line represents a cell.
+
+=== Attributes for the tags ===
+
+A line that starts with a ##"~*"## (star or asterisk) after a ##"|"## is parsed for attributes for the corresponding cell.
+
+Attributes for the table are given on line that starts with a ##"~*"##, only if the line appears before any other line except whitespace.
+
+A line that starts with a ##-## 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 ##"~*"## 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 ##"~*"## after the ##"|"## 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.
+
+=== Special characters ===
+
+The two special characters ##"~~"## and ##"?>"## should be escaped as ##"\~~"## and ##"?\>"##. I havn't discovered any other characters yet that might need to be escaped. This is required for the block parser to work.
+
+=== Attributes ===
+
+We allow attributes with or without quotes ("):
 {{{
 border=1, cellpadding="5"
 style="font-family: sans-serif; border-top:1px solid #dddddd;"
@@ -105,10 +127,10 @@
 }}}
 
 == Known Bugs ==
-* The plugin can't nest itself yet. Thus nested tables are currently not possible.
+* The plugin can't nest itself. Thus nested tables are currently not possible. See [[Help:MediawikiTablePlugin|Mediawiki tables]] to have nested tables.
 
 == Author ==
-* [Sameer D. Sahasrabuddhe|http://www.it.iitb.ac.in/~sameerds/phpwiki/index.php/RichTablePlugin]
+* [[http://www.it.iitb.ac.in/~sameerds/phpwiki/index.php/RichTablePlugin|Sameer D. Sahasrabuddhe]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSemanticRelations
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSemanticRelations	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSemanticRelations	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FSemanticRelations 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FSemanticRelations 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSemanticRelations;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -12,12 +12,12 @@
 implementation of the semantic mediawiki extension. It features:
 
 * Annotation of article-article-links by means of configurable relations (link-types).
-* Annotation of articles with simple data-values that are assigned to numeric 
+* Annotation of articles with simple data-values that are assigned to numeric
   attributes.
-* Support for using physical units of measurement in all numerical attributes, 
+* Support for using physical units of measurement in all numerical attributes,
   without need for prior configuration.
 
-Relations can be searched for with regular expressions, attributes can be 
+Relations can be searched for with regular expressions, attributes can be
 searched for with full mathematical expressions.
 
 The annotation data will be combined with annotations from the current
@@ -35,10 +35,10 @@
 
 == Attributes ==
 
-Attributes are defined as link to numbers (understandable by 
-[GNU Units|http://www.gnu.org/software/units/units.html]) with 
+Attributes are defined as link to numbers (understandable by
+[GNU Units|http://www.gnu.org/software/units/units.html]) with
 the following markup syntax:
- 
+
 {{{
   attribute:=value
 }}}
@@ -63,7 +63,7 @@
 United States and is noted for its temperate climate and many beaches.
 
 According to the United States Census Bureau, the city has a total
-area of [963.6 km²|area:=963.6 km^2] (372.0 mi²). 840.0 km² 
+area of [963.6 km²|area:=963.6 km^2] (372.0 mi²). 840.0 km²
 (324.3 mi²) of it is land and 123.5 km² (47.7 mi²) of it is water.
 The total area is 12.82% water.
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSemanticSearchPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSemanticSearchPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSemanticSearchPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu, 16 Dec 2010 14:00:38 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FSemanticSearchPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FSemanticSearchPlugin 7783 2010-12-16 13:01:01Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSemanticSearchPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -50,7 +50,7 @@
 |-
 | **page**
 | which pages (glob allowed)
-| * (all)
+| ~* (all)
 |-
 | **relation**
 | linkname. which relations.
@@ -62,7 +62,7 @@
 |-
 | **attr_op**
 | a funny written way for equality for pure aesthetic pleasure "All attributes which have this value set"
-| :=
+| ~:=
 |-
 | **units**
 |
@@ -101,6 +101,10 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
+* [[Help:TitleSearchPlugin]]
+* [[Help:FullTextSearchPlugin]]
+* [[Help:ExternalSearchPlugin]]
+* [[Help:InterWikiSearchPlugin]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSiteMapPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSiteMapPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSiteMapPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FSiteMapPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FSiteMapPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSiteMapPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -13,7 +13,7 @@
 [[:CategoryCategory|CategoryCategory]], then a recursive ~BackLinks there will produce a contents
 page for the entire site.
 
-The list is as deep as the recursion level.
+The list is as deep as the recursion level (##reclimit##).
 
 == Usage ==
 
@@ -33,11 +33,11 @@
 | Get BackLinks or forward links (links listed on the page)
 |
 |-
-| **firstreversed** 
+| **firstreversed**
 | If true, get BackLinks for the first page and forward links for the rest.  Only applicable when direction = 'forward'.
 |
 |-
-| **excludeunknown** 
+| **excludeunknown**
 | If true (default) then exclude any mentioned pages which don't exist yet.  Only applicable when direction = 'forward'.
 |
 |-
@@ -67,7 +67,7 @@
 |-
 | **info**
 |
-| false 
+| false
 |}
 
 == Example ==
@@ -83,6 +83,7 @@
 
 == See Also ==
 * [[Help:BackLinksPlugin]]
+* [[Help:IncludeSiteMapPlugin]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSqlResultPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSqlResultPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSqlResultPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 19:59:28 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FSqlResultPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FSqlResultPlugin 7770 2010-12-09 19:02:38Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSqlResultPlugin;
   flags=PAGE_LOCKED;
@@ -8,26 +8,83 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~SqlResult** [[Help:WikiPlugin|plugin]] displays results of arbitrary SQL select statements in table form.
 
+The database definition, the DSN, must be defined in the local file ##config/SqlResult.ini##
+
+A simple textfile with alias = dsn lines.
+
+Optional template file to format the result and handle some logic.
+
+Template vars: %%where%%, %%sortby%%, %%limit%%
+
 == Usage ==
 {{{
-<<SqlResult>>
+<<SqlResult parameters
+SELECT statement
+>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **alias**
+| DSN database specification
+| false
+|-
+| **ordered**
+| if to display as {{{<ol>}}} list: single col only without template
+| false
+|-
+| **template**
+| use a custom {{{<theme>/template.tmpl}}}
+| false
+|-
+| **where**
+| custom filter for the query
+| false
+|-
+| **sortby**
+| for paging
+| false (no paging)
+|-
+| **limit**
+| for paging
+| 0,50 (only the first 50)
+|}
 
-== Example ==
+== Examples ==
 
 {{{
-<<SqlResult>>
+<<SqlResult alias=mysql
+         SELECT 'mysql password for string "xx":',
+                PASSWORD('xx')
+>>
+
+<<SqlResult alias=videos template=videos
+         SELECT rating,title,date
+                FROM video
+                ORDER BY rating DESC
+                LIMIT 5
+>>
+
+<<SqlResult alias=imdb template=imdbmovies where||="Davies, Jeremy%"
+SELECT m.title, m.date, n.name, c.role
+  FROM movies as m, names as n, jobs as j, characters as c
+  WHERE n.name LIKE "%%where%%"
+  AND m.title_id = c.title_id
+  AND n.name_id = c.name_id
+  AND c.job_id = j.job_id
+  AND j.description = 'Actor'
+  ORDER BY m.date DESC
+>>
 }}}
 
-<<SqlResult>>
-
 == Author ==
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSyntaxHighlighterPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSyntaxHighlighterPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FSyntaxHighlighterPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FSyntaxHighlighterPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FSyntaxHighlighterPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSyntaxHighlighterPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -20,23 +20,23 @@
 ! Default value
 |-
 | **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)
 |}
 
@@ -73,7 +73,7 @@
 ** support options: syntax, style, color,
 ** php version switch,
 ** HIGHLIGHT_DATA_DIR, HIGHLIGHT_EXE constants,
- 
+
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTemplatePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTemplatePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTemplatePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 20 Sep 2010 13:46:13 +0000
+Date: Mon, 17 Jan 2011 17:13:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FTemplatePlugin 7698 2010-09-20 13:28:46Z vargenau $
+X-Rcs-Id: $Id: Help%2FTemplatePlugin 7839 2011-01-17 16:16:15Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTemplatePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -73,10 +73,6 @@
 | page revision
 | most recent revision
 |-
-| **version**
-| page revision (same as ##rev##)
-| most recent revision
-|-
 | **section**
 | just include a named section
 | (empty)

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTextFormattingRules
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTextFormattingRules	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTextFormattingRules	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FTextFormattingRules 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FTextFormattingRules 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTextFormattingRules;
   flags=PAGE_LOCKED;
@@ -151,7 +151,7 @@
 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 [[Help:RawHtmlPlugin]] if it is enabled by the Admin and e.g. the ##&#num;## syntax.
 
-E.g. These Japanese chars 'から 新規ページ' 
+E.g. These Japanese chars 'から 新規ページ'
 on this <<SystemInfo CHARSET>> wiki.
 
 And with the plugin: <<RawHtml から 新規ページ>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTitleSearchPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTitleSearchPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTitleSearchPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:39:15 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FTitleSearchPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FTitleSearchPlugin 7755 2010-12-09 13:39:40Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTitleSearchPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -73,6 +73,9 @@
 * [[PhpWiki:ReiniUrban|Reini Urban]]
 
 == See Also ==
+* [[Help:FullTextSearchPlugin]]
+* [[Help:ExternalSearchPlugin]]
+* [[Help:InterWikiSearchPlugin]]
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTranscludePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTranscludePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTranscludePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FTranscludePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FTranscludePlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTranscludePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -32,7 +32,7 @@
 |-
 | **quiet**
 | If set, frame appears as normal content
-| false 
+| false
 |}
 
 == Bugs / Caveats ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTranslateTextPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTranslateTextPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FTranslateTextPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 19:42:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FTranslateTextPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FTranslateTextPlugin 7769 2010-12-09 18:43:35Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTranslateTextPlugin;
   flags=PAGE_LOCKED;
@@ -8,17 +8,33 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~TranslateText** [[Help:WikiPlugin|plugin]] allows to define a translation for a specified text.
 
 == Usage ==
 {{{
-<<TranslateText>>
+<<TranslateText arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **lang**
+|
+| false
+|-
+| **pagename**
+|
+|
+|-
+| **translate**
+|
+|
+|}
 
 == Example ==
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUpLoadPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUpLoadPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUpLoadPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri,  7 Jan 2011 17:32:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FUpLoadPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FUpLoadPlugin 7825 2011-01-07 16:35:43Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FUpLoadPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,13 +8,11 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~UpLoad** [[Help:WikiPlugin|plugin]] 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~:" 
+The **~UpLoad** [[Help:WikiPlugin|plugin]] displays an editbox and two buttons.
+* The first button lets 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 ==
 
@@ -41,6 +39,14 @@
 | **page**
 | The page where the uploaded files are publicly listed, if autolink is true.
 | Current page
+|-
+| **size**
+| Size of file input box.
+| 50
+|-
+| **mode**
+| 'actionpage' or 'edit'
+| actionpage
 |}
 
 == Notes ==
@@ -58,6 +64,10 @@
 
 <<UpLoad>>
 
+== See Also ==
+
+* [[PhpWiki:InlineUploadedImages]]
+
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUserPreferencesPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUserPreferencesPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUserPreferencesPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 16:17:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FUserPreferencesPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FUserPreferencesPlugin 7762 2010-12-09 15:18:27Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FUserPreferencesPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,7 +8,9 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~UserPreferences** [[Help:WikiPlugin|plugin]] allows any user to adjust his own preferences.
+The plugin must be used in the page [[UserPreferences]].
+Preferences are stored in metadata in the current session, within the user's home page or in a database.
 
 == Usage ==
 {{{
@@ -17,9 +19,6 @@
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
-
 == Example ==
 
 {{{

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUserRatingsPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUserRatingsPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FUserRatingsPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FUserRatingsPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FUserRatingsPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FUserRatingsPlugin;
   flags=PAGE_LOCKED;
@@ -53,11 +53,11 @@
 | 0
 |-
 | **noheader**
-| 
+|
 | 0
 |-
 | **userPage**
-| 
+|
 | false
 |-
 | **info**

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FVideoPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FVideoPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FVideoPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 11 Jan 2011 13:48:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FVideoPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FVideoPlugin 7826 2011-01-11 12:52:54Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FVideoPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -66,6 +66,11 @@
 * Roger Guignard, Alcatel-Lucent
 * Marc-Etienne Vargenau, Alcatel-Lucent
 
+== See Also ==
+* [[Help:Images]]
+* [[Help:Adobe Flash]]
+* [[Help:Wikicreole]]
+
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWantedPagesOldPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWantedPagesOldPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWantedPagesOldPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 15:16:49 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FWantedPagesOldPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FWantedPagesOldPlugin 7758 2010-12-09 14:18:28Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWantedPagesOldPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,17 +8,48 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~WantedPagesOld** [[Help:WikiPlugin|plugin]] returns a list of referenced pages which do not exist yet.
 
+All empty pages which are linked from any page - with an ending question mark, or for just a single page, when the page argument is present.
+
 == Usage ==
+
 {{{
-<<WantedPagesOld>>
+<<WantedPagesOld arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **page**
+| just for a single page
+| pagename
+|-
+| **noheader**
+| do not display header
+| false
+|-
+| **exclude**
+| pages to exclude
+| PgsrcTranslation
+|-
+| **limit**
+| maximum number of wanted pages to display
+| 50
+|-
+| **paging**
+|
+| auto
+|-
+| **sortby**
+|
+|
+|}
 
 == Example ==
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWantedPagesPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWantedPagesPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWantedPagesPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FWantedPagesPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FWantedPagesPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWantedPagesPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -49,7 +49,7 @@
 | 100
 |-
 | **paging**
-| 
+|
 | auto
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWatchPagePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWatchPagePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWatchPagePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FWatchPagePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FWatchPagePlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWatchPagePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -28,7 +28,7 @@
 | current pagename
 |-
 | **mode**
-| 
+|
 | add
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWhoIsOnlinePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWhoIsOnlinePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWhoIsOnlinePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FWhoIsOnlinePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FWhoIsOnlinePlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWhoIsOnlinePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -36,7 +36,7 @@
 | false
 |-
 | **mode**
-| 
+|
 | false
 |}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiForumPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiForumPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiForumPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 20:12:29 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FWikiForumPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FWikiForumPlugin 7771 2010-12-09 19:13:27Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiForumPlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -8,17 +8,42 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-_short description_
+The **~WikiForum** [[Help:WikiPlugin|plugin]] handles a threaded list of comments/news associated with a
+particular page (one page per topic) and provides an input form for adding a new message.
 
 == Usage ==
 {{{
-<<WikiForum>>
+<<WikiForum arguments>>
 }}}
 
 == Arguments ==
 
-page _(default: current pagename)_:
-  The page to execute upon.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **pagename**
+|
+| pagename
+|-
+| **order**
+|
+| normal (oldest first)
+|-
+| **mode**
+|
+|
+|-
+| **info**
+|
+|
+|-
+| **noheader**
+| do not display header
+| false
+|}
 
 == Example ==
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
-X-Rcs-Id: $Id: Help%2FWikiPlugin 7682 2010-09-10 12:03:36Z vargenau $
+Date: Thu,  9 Dec 2010 14:51:45 +0000
+X-Rcs-Id: $Id: Help%2FWikiPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiPlugin;
@@ -39,14 +39,14 @@
 Currently, one invokes a plugin by putting something like:
 
 {{{
-<<AllPages limit=20 cols=3>> 
+<<AllPages limit=20 cols=3>>
 }}}
 
 into a regular wiki-page.  That particular example produces a list
 of the first 20 existing pages in 3 columns, via the [[Help:PageList|PageList]]
 library.
 
-<<AllPages limit=20 cols=3>> 
+<<AllPages limit=20 cols=3>>
 
 == Details ==
 
@@ -81,7 +81,7 @@
   (The BackLinks plugin uses the current page as the default value for
   the *page* argument.)
 
-  Most plugins using the [[Help:PageList|PageList]] library inherit their 
+  Most plugins using the [[Help:PageList|PageList]] library inherit their
   default arguments from the ~PageList.
 
 === Standard Arguments ===
@@ -173,17 +173,17 @@
 reasons:
 
 # Support translated action buttons and customizable action descriptions.
-# Customize standard actions by tuning the plugin invocation arguments. 
+# Customize standard actions by tuning the plugin invocation arguments.
   Override or add plugin defaults.
-# Split simple plugins into multiple actions, like RecentChanges/RecentEdits, 
+# Split simple plugins into multiple actions, like RecentChanges/RecentEdits,
   MostPopular/LeastPopular, AllPages/AllPagesCreatedByMe/AllPagesLastEditedByMe/
   AllPagesOwnedByMe which differ only in one argument.
 # Simplify the syntax for actions on another actions using a ~PageList
   as result of an actionpage as input parameter for another action or
   format.
 
-* Those actions which have buttons or links in the theme or are 
-  referenced in the standard pgsrc pageset require their 
+* 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.

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiWikiWeb
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiWikiWeb	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikiWikiWeb	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 25 Jan 2011 17:23:56 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FWikiWikiWeb 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FWikiWikiWeb 7874 2011-01-25 16:24:43Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiWikiWeb;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -14,20 +14,20 @@
 
 You and I will find these statements there particularly relevant:
 
-//The point is to make the [EditText|Help:EditText] form simple and the [FindPage]
+//The point is to make the [[Help:EditText|EditText]] form simple and the [[FindPage]]
 search fast.//
 
 //In addition to being quick, this site also aspires to Zen ideals
-generally labeled [WabiSabi|Help:WabiSabi]. Zen finds beauty in the imperfect and
+generally labeled [[Help:WabiSabi|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|Help:HowToUseWiki] and
-[AddingPages|Help:AddingPages]. Currently this Wiki has no theme for discussion, so go
+You can say hello on [[RecentVisitors]], or read about [[Help:HowToUseWiki|HowToUseWiki]] and
+[[Help:AddingPages|AddingPages]]. Currently this Wiki has no theme for discussion, so go
 ahead and play with it and have fun!!
 
---SteveWainstead.
+--[[SteveWainstead]].
 
 <noinclude>
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikicreole
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikicreole	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FWikicreole	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue,  4 Jan 2011 12:37:33 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FWikicreole 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FWikicreole 7802 2011-01-04 11:38:12Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikicreole;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -44,7 +44,7 @@
 
 === Underline ===
 
-Underline text is made using two hashes:
+Underline text is made using two underscores:
 
 {{{
 This sentence contains __underlined text__.

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FYouTubePlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FYouTubePlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2FYouTubePlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:49:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2FYouTubePlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2FYouTubePlugin 7756 2010-12-09 13:49:21Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2FYouTubePlugin;
   flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
@@ -11,19 +11,19 @@
 == Usage ==
 {{{
   <<YouTube v=-dnL00TdmLY
-	   width=425 height=350
-	   size=medium|small|large
+           width=425 height=350
+           size=medium|small|large
            style=inline|link
            autoplay=0|1
-	   browse="Daily Pick|Most Recent|Most Viewed|Top Rated|
-		   Most Discussed|Top Favorites|Most Linked|
-		   Recently Featured|Most Responded|Watch on Mobile"
-	   time="Today|This week|This month|All Time"
-	   category="All|Autos & Vehicles|Comedy|Entertainment|
-		   Film & Animation|Gadgets & Games|Howto & DIY|Music
-		   News & Politics|People & Blogs|Pets & Animals|
-	           Sports|Travel & Places"
-	   language="All|English|Spanish|Japanese|German|Chinese|French"
+           browse="Daily Pick|Most Recent|Most Viewed|Top Rated|
+                   Most Discussed|Top Favorites|Most Linked|
+                   Recently Featured|Most Responded|Watch on Mobile"
+           time="Today|This week|This month|All Time"
+           category="All|Autos & Vehicles|Comedy|Entertainment|
+                   Film & Animation|Gadgets & Games|Howto & DIY|Music
+                   News & Politics|People & Blogs|Pets & Animals|
+                   Sports|Travel & Places"
+           language="All|English|Spanish|Japanese|German|Chinese|French"
  >>
 }}}
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_AuthInfoPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_AuthInfoPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_AuthInfoPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2F_AuthInfoPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2F_AuthInfoPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2F_AuthInfoPlugin;
   flags=PAGE_LOCKED;
@@ -9,11 +9,11 @@
 Content-Transfer-Encoding: binary
 
 Administrative plugin, used to debug auth problems and settings.
-This plugin is only for testing purposes. 
-If DEBUG has no _DEBUG_LOGIN bit set, only the admin user can call it, 
+This plugin is only for testing purposes.
+If DEBUG has no _DEBUG_LOGIN bit set, only the admin user can call it,
 which is of no real use.
 
-Warning! This may display DB and user passwords in cleartext. We think we 
+Warning! This may display DB and user passwords in cleartext. We think we
 cleared everything out though.
 
 == Usage ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_BackendInfoPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_BackendInfoPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_BackendInfoPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2F_BackendInfoPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2F_BackendInfoPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2F_BackendInfoPlugin;
   flags=PAGE_LOCKED;
@@ -13,7 +13,7 @@
 
 Displays all/most database infos about a page.
 
-Warning! This may display db and user passwords in cleartext. We think we 
+Warning! This may display db and user passwords in cleartext. We think we
 cleared everything out though.
 
 == Usage ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_GroupInfoPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_GroupInfoPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_GroupInfoPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2F_GroupInfoPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2F_GroupInfoPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2F_GroupInfoPlugin;
   flags=PAGE_LOCKED;
@@ -9,11 +9,11 @@
 Content-Transfer-Encoding: binary
 
 Administrative plugin, used to debug auth problems and settings.
-This [[Help:WikiPlugin|plugin]] is only for testing purposes. 
-If DEBUG has no _DEBUG_LOGIN bit set, only the admin user can call it, 
+This [[Help:WikiPlugin|plugin]] is only for testing purposes.
+If DEBUG has no _DEBUG_LOGIN bit set, only the admin user can call it,
 which is of no real use.
 
-Warning! This may display db and user passwords in cleartext. We think we 
+Warning! This may display db and user passwords in cleartext. We think we
 cleared everything out though.
 
 == Usage ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_WikiTranslationPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_WikiTranslationPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2F_WikiTranslationPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2F_WikiTranslationPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2F_WikiTranslationPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2F_WikiTranslationPlugin;
   flags=PAGE_LOCKED;
@@ -10,12 +10,12 @@
 
 Display pagenames and other internal strings in various languages.
 
-Can also be used to let a favorite translation service translate a whole page. 
+Can also be used to let a favorite translation service translate a whole page.
 Current favorite: translate.google.com if from_lang = en or fr
 
 == Usage ==
 {{{
-  <<_WikiTranslation languages=de,en,sv string="" page="" 
+  <<_WikiTranslation languages=de,en,sv string="" page=""
                             what=pages from_lang=0 nolinks=0 noT=0 debug=0
  >>
 }}}
@@ -40,7 +40,7 @@
   Do not display any links (for development only)
 noT:
   Do not display the T link (for development only)
-  
+
 == Example ==
 
 {{{

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2Ftext2pngPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2Ftext2pngPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Help%2Ftext2pngPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Help%2Ftext2pngPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Help%2Ftext2pngPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Help%2Ftext2pngPlugin;
   flags=PAGE_LOCKED;
@@ -9,7 +9,7 @@
 Content-Transfer-Encoding: binary
 
 Convert text into a png image using GD without using [WikiPluginCached|Help:WikiPlugin].
-The images are stored in a private <PHPWIKI_DIR>/images/<LANG> subdirectory instead, 
+The images are stored in a private <PHPWIKI_DIR>/images/<LANG> subdirectory instead,
 which are not timestamp checked at all. Delete the .png file(s) if you change anything.
 
 This is a really simple and stupid plugin, which might need some work.

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/HomePage
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/HomePage	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/HomePage	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu, 16 Dec 2010 13:58:33 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: HomePage 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: HomePage 7782 2010-12-16 12:58:57Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=HomePage;
   flags="";
@@ -16,4 +16,4 @@
 * Find out which pages are [[MostPopular]].
 * Read the [[ReleaseNotes]] and [[RecentReleases]].
 * Administer this wiki via [[PhpWikiAdministration]].
-* See more [[PhpWikiDocumentation]].
+* See more [[:PhpWikiDocumentation]].

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/InterWikiSearch
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/InterWikiSearch	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/InterWikiSearch	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 25 Jan 2011 18:13:01 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: InterWikiSearch 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: InterWikiSearch 7882 2011-01-25 17:13:36Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=InterWikiSearch;
   flags=PAGE_LOCKED;
@@ -8,11 +8,11 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Query any Wiki listed in the [InterWikiMap] by entering a desired page
+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|Help:ExternalSearchPlugin].
+[[Help:ExternalSearchPlugin|ExternalSearch]] plugin.
 
 <<InterWikiSearch>>
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/LinkDatabase
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/LinkDatabase	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/LinkDatabase	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: LinkDatabase 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: LinkDatabase 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=LinkDatabase;
   flags=PAGE_LOCKED;
@@ -10,7 +10,7 @@
 
 <<LinkDatabase>>
 
-<<Comment 
+<<Comment
   With ?format=text to be used by WikiBrowser at http://touchgraph.sourceforge.net/
   Save the output as textfile.
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/MyRecentEdits
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/MyRecentEdits	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/MyRecentEdits	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: MyRecentEdits 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: MyRecentEdits 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=MyRecentEdits;
   flags=PAGE_LOCKED;
@@ -8,7 +8,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Here's a list of all my recently changed pages on this wiki, including minor edits. 
+Here's a list of all my recently changed pages on this wiki, including minor edits.
 
 //See [[RecentChanges]] for all recent edits and changes and [[MyRecentChanges]] for all major edits only.//
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PasswordReset
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PasswordReset	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PasswordReset	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PasswordReset 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PasswordReset 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PasswordReset;
   flags=PAGE_LOCKED;
@@ -8,10 +8,10 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-Any Administrator may reset (i.e. delete) any users password. The user may login with an empty 
+Any Administrator may reset (i.e. delete) any users password. The user may login with an empty
 password then or set a new one at the sign in page.
 
-A normal user may only reset a users password who has his email address defined. 
+A normal user may only reset a users password who has his email address defined.
 For users with undefined email address you have to ask an Administrator to reset any password.
 
 Authenticated users should change their passwords at their UserPreferences page.

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PhpWikiManual
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PhpWikiManual	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PhpWikiManual	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Tue,  9 Nov 2010 16:13:37 +0000
+Date: Thu, 27 Jan 2011 17:05:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PhpWikiManual 7736 2010-11-09 15:14:11Z vargenau $
+X-Rcs-Id: $Id: PhpWikiManual 7918 2011-01-27 16:07:56Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiManual;
   flags=EXTERNAL_PAGE;
@@ -10,6 +10,7 @@
 
 <<IncludePage page="Help/PhpWiki">>
 <<IncludePage page="Help/WikiWikiWeb">>
+<<IncludePage page="SteveWainstead">>
 <<IncludePage page="Help/WabiSabi">>
 <<IncludePage page="Help/AddingPages">>
 <<IncludePage page="Help/EditText">>
@@ -18,10 +19,12 @@
 <<IncludePage page="Help/HowToUseWiki">>
 <<IncludePage page="FindPage">>
 <<IncludePage page="Help/Images">>
+<<IncludePage page="Help/Adobe Flash">>
 <<IncludePage page="Help/Categories">>
 <<IncludePage page="Help/InterWiki">>
 <<IncludePage page="Help/LinkIcons">>
-<<IncludePage page="Help/ActionPage">>
+<<IncludePage page="Help/PredefinedIcons">>
+<<IncludePage page="Help/WikiPlugin">>
 <<IncludePage page="Help/MagicPhpWikiURLs">>
 <<IncludePage page="Help/MoreAboutMechanics">>
 <<IncludePage page="Help/Wikicreole">>
@@ -32,3 +35,8 @@
 <<IncludePage page="Help/PageList">>
 <<IncludePage page="Help/Advice for Mediawiki users">>
 <<IncludePages pages=<!plugin-list BackLinks page=CategoryWikiPlugin sortby=pagename exclude="Template/*" !> >>
+
+{| width="100%"
+|- align="center"
+| **END OF DOCUMENT**
+|}

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PhpWikiRecentChanges
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PhpWikiRecentChanges	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/PhpWikiRecentChanges	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:49:00 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PhpWikiRecentChanges 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PhpWikiRecentChanges 7756 2010-12-09 13:49:21Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiRecentChanges;
   flags="";
@@ -9,7 +9,7 @@
 Content-Transfer-Encoding: binary
 
 <<RssFeed feed=PhpWikiRecentChanges description="PhpWiki:RecentChanges"
-	         url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
+          url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
 
 ----
 [[PhpWikiDocumentation]]

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/RecentVisitors
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/RecentVisitors	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/RecentVisitors	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 14:12:16 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: RecentVisitors 7684 2010-09-10 12:13:48Z vargenau $
+X-Rcs-Id: $Id: RecentVisitors 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=RecentVisitors;
   flags="";
@@ -10,7 +10,7 @@
 
 Sign and date your name below!
 
-Arno Hollosi, Aredridel Stauck, Jeff Dairiki, Steve Wainstead, Carsten Klapp, 
+Arno Hollosi, Aredridel Stauck, Jeff Dairiki, Steve Wainstead, Carsten Klapp,
 Reini Urban, Marc-Etienne Vargenau, the [[PhpWiki:ThePhpWikiProgrammingTeam|PhpWiki authors]].
 
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/ReleaseNotes
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/ReleaseNotes	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/ReleaseNotes	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 17 Sep 2010 14:12:16 +0000
+Date: Thu,  9 Dec 2010 17:30:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ReleaseNotes 7695 2010-09-17 11:49:14Z rurban $
+X-Rcs-Id: $Id: ReleaseNotes 7764 2010-12-09 16:36:20Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
   flags=PAGE_LOCKED;
@@ -14,12 +14,12 @@
 
 This is a new major release, where everything changed from 1.2, and lots of changes since 13.4.
 
-An important modification in this release is the implementation 
+An important modification in this release is the implementation
 of full Wikicreole 1.0 syntax, including additions.
 
 The "classic" Phpwiki syntax is still supported.
 
-The documentation pages found in pgsrc have been mostly converted to UTF-8 and 
+The documentation pages found in pgsrc have been mostly converted to UTF-8 and
 Wikicreole syntax (with the addition of tables in Mediawiki syntax, since Wikicreole 1.0
 does not support "complex" tables with block elements in cells, like lists or
 paragraphs).
@@ -27,7 +27,7 @@
 Improved dumping, pageset handling for format= with ~ActionPages.
 e.g. dump pagesets or multi-page pdf's.
 
-The Sidebar theme is now an extension of the Monobook theme (known from Wikipedia), 
+The Sidebar theme is now an extension of the Monobook theme (known from Wikipedia),
 the new fusionforge theme is to be used together with FusionForge (the successor of Gforge).
 
 === Fixes ===
@@ -49,7 +49,7 @@
 * XHTML validation corrections (vargenau)
 * avoid recursive modification when renaming a page like '~PageFoo to '~PageFooTwo' (vargenau)
 * fix Bug#1808002 Table of contents plugin does not nest numbering (vargenau)
-* fix Bug#1903815 Cannot put "0" in ~RichTable cell, cell becomes empty (vargenau) 
+* fix Bug#1903815 Cannot put "0" in ~RichTable cell, cell becomes empty (vargenau)
 * fix Bug#1904088  Some brackets links with \n cause the parser to crash
 * fixed incorrect numbering in Table of Contents numbering (vargenau)
 * fix Bug#1967147 ~FileInfoPlugin does not allow display=owner
@@ -70,8 +70,8 @@
 * aesthetic request: remove ?action=edit after edit
 * create interim pages as minor not see them in RecentChanges
 * default theme: use standard search template (~LiveSearch)
-* [Help:CalendarPlugin] changed default start_wday from 0 to 1 (Monday)
-* [Help:CalendarListPlugin] pages now in parallel with Calendar: year + month args as start base.
+* [[Help:CalendarPlugin]] changed default start_wday from 0 to 1 (Monday)
+* [[Help:CalendarListPlugin]] pages now in parallel with Calendar: year + month args as start base.
   The behaviour before 2007 with last/next_n_days was to start now.
 * removed fpdf support. only use external converters
 * change rename action from access perm change to edit: allow the signed-in user to rename.
@@ -247,7 +247,7 @@
 * changed Semantic attribute syntax from ":-" to ":=" (relevant to cvs users only)
 * change ~TextSearchQuery handling of regex=pcre: plain string, no parsing at all,
   detect and apply modifiers.
-* enhance text2png arguments and features. See [Help:text2pngPlugin]
+* enhance text2png arguments and features. See [[Help:text2pngPlugin]]
 * Template plugin: allow passing arbitrary args, not just in vars.
 * added old gd support to ~PhotoAlbum thumbs (~ImageTile)
 * Improve ~LdapSearch plugin and add action page.

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/SteveWainstead
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/SteveWainstead	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/SteveWainstead	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Wed, 26 Jan 2011 18:03:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: SteveWainstead 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: SteveWainstead 7910 2011-01-26 17:04:39Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=SteveWainstead;
   flags="";
@@ -13,5 +13,7 @@
 
 Please report bugs to [[mailto:phpwiki-talk at lists.sourceforge.net]]
 
+<noinclude>
 ----
 [[PhpWikiDocumentation]]
+</noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FAttribute
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FAttribute	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FAttribute	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Wed, 13 Apr 2011 15:41:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Template%2FAttribute 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Template%2FAttribute 8045 2011-04-13 13:43:01Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Template%2FAttribute;
   flags="";
@@ -8,7 +8,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-//SemanticSearch for pages with the *%%PAGENAME%%* attribute://
+//SemanticSearch for pages with the// **//%%PAGENAME%%//** //attribute://
 
 <<SemanticSearch attribute=%%PAGENAME%% s="*" page="*" case_exact=1 noform=1 >>
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FExample
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FExample	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FExample	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Template%2FExample 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Template%2FExample 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Template%2FExample;
   flags="";
@@ -9,13 +9,13 @@
 Content-Transfer-Encoding: binary
 
 <noinclude>
-The following predefined variables are automatically expanded by 
+The following predefined variables are automatically expanded by
 the [[Help:CreatePagePlugin|CreatePage]] plugin if existing:
   PAGENAME
   MTIME     - last modified date + time
   CTIME     - creation date + time
   AUTHOR    - last author
-  OWNER     
+  OWNER
   CREATOR   - first author
   SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
 </noinclude>

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FLinkto
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FLinkto	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FLinkto	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Wed, 13 Apr 2011 15:47:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Template%2FLinkto 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Template%2FLinkto 8046 2011-04-13 13:50:57Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Template%2FLinkto;
   flags="";
@@ -8,7 +8,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-//SemanticSearch for pages with the relation %%LINKTO%% :: *%%PAGENAME%%* (a Linkto)//
+//SemanticSearch for pages with the relation %%LINKTO%% ::// **//%%PAGENAME%%//** //(a Linkto)//
 
 <<SemanticSearch page="*" relation="%%LINKTO%%$" s="%%PAGENAME%%$" case_exact=1 noform=1 >>
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FNewPlugin
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FNewPlugin	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FNewPlugin	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Template%2FNewPlugin 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Template%2FNewPlugin 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Template%2FNewPlugin;
   flags="";
@@ -12,7 +12,7 @@
 
 == Usage ==
 {{{
-<<New arguments>> 
+<<New arguments>>
 }}}
 
 == Arguments ==
@@ -31,7 +31,7 @@
 == Example ==
 
 {{{
-<<New page=HomePage>> 
+<<New page=HomePage>>
 }}}
 
 == Author ==

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FRelation
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FRelation	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/Template%2FRelation	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Wed, 13 Apr 2011 15:47:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: Template%2FRelation 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: Template%2FRelation 8046 2011-04-13 13:50:57Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=Template%2FRelation;
   flags="";
@@ -8,14 +8,14 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-//SemanticSearch for pages with the *%%PAGENAME%%* relation://
+//SemanticSearch for pages with the// **//%%PAGENAME%%//** //relation://
 
 <<SemanticSearch page="*" relation=%%PAGENAME%% s="*" case_exact=1 noform=1 >>
 
 Create a new relation page:
 <?plugin-form CreatePage initial_content={{Template/Relation}} ?>
 
-Note: Relations are created implicitly by using the ##~:~:## syntax. 
+Note: Relations are created implicitly by using the ##~:~:## syntax.
 See [[Help:SemanticRelations|SemanticRelations]]
 
 List of all other used relations:

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/TranslateText
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/TranslateText	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/TranslateText	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,9 +1,9 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: TranslateText 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: TranslateText 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=TranslateText;
-  flags=PAGE_LOCKED; 
+  flags=PAGE_LOCKED;
   markup=2;
   charset=UTF-8
 Content-Transfer-Encoding: binary

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/UserContribs
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/UserContribs	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/UserContribs	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
-X-Rcs-Id: $Id: UserContribs 7682 2010-09-10 12:03:36Z vargenau $
+Date: Thu,  9 Dec 2010 14:51:45 +0000
+X-Rcs-Id: $Id: UserContribs 7757 2010-12-09 13:53:00Z vargenau $
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 Content-Type: application/x-phpwiki;
   pagename=UserContribs;
@@ -8,7 +8,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-<<RecentChanges days||=90 daylist=1,3,7,30,90,0 show_deleted||=1 
+<<RecentChanges days||=90 daylist=1,3,7,30,90,0 show_deleted||=1
                        format=contribs author||=[]>>
 
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/pgsrc/WikiBlog
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/pgsrc/WikiBlog	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/pgsrc/WikiBlog	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu,  9 Dec 2010 14:51:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: WikiBlog 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: WikiBlog 7757 2010-12-09 13:53:00Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=WikiBlog;
   flags="";
@@ -9,7 +9,7 @@
 Content-Transfer-Encoding: binary
 
 <<Comment
-  Required actionpage for blogs. You can override a user base here. 
+  Required actionpage for blogs. You can override a user base here.
   The default is the current username.
   If user=ADMIN_USER and BLOG_DEFAULT_EMPTY_PREFIX=true then the base will be /Blog.
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/schemas/mysql-destroy.sql
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/schemas/mysql-destroy.sql	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/schemas/mysql-destroy.sql	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
--- $Id: mysql-destroy.sql 6203 2008-08-26 13:23:56Z vargenau $
+-- $Id: mysql-destroy.sql 7798 2010-12-23 12:43:55Z rurban $
 
 drop table if exists page;
 drop table if exists version;
@@ -12,6 +12,7 @@
 drop table if exists pref;
 --drop table if exists user;
 drop table if exists member;
+drop table if exists accesslog;
 
 -- if you plan to use the wikilens theme
 drop table if exists rating;

Modified: branches/Branch_5_1/src/plugins/wiki/www/tests/CompatInfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/tests/CompatInfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/tests/CompatInfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -2,7 +2,7 @@
 /* Get the Compatibility info for phpwiki
    http://pear.php.net/package/PHP_CompatInfo
 
-   $Id: CompatInfo.php 7638 2010-08-11 11:58:40Z vargenau $
+   $Id: CompatInfo.php 8071 2011-05-18 14:56:14Z vargenau $
 */
 /*
  * Copyright (C) 2004 Reini Urban <rurban at x-ray.at>
@@ -20,7 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -47,7 +47,7 @@
 $debug = !empty($_GET['debug']);
 $detail = !empty($_GET['detail']);
 // echo $dir;
-$options = array('file_ext' 	=> array('php'),
+$options = array('file_ext'     => array('php'),
                  'ignore_files' => array(__FILE__),
                  'recurse_dir'  => true,
                  'ignore_functions' => array(),
@@ -102,7 +102,7 @@
                 $const = array_shift($info['constants']);
             }
             out_row(array($file, $info['version'], $ext, $const));
-          
+
             if (is_array($info['extensions'])
                 and sizeof($info['extensions']) >= sizeof($info['constants'])) {
                 foreach ($info['extensions'] as $i => $ext) {
@@ -158,5 +158,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End:  
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/AtomParserTest.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/AtomParserTest.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/AtomParserTest.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// $Id: AtomParserTest.php 7466 2010-06-07 08:12:29Z rurban $
+// $Id: AtomParserTest.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2010 Sébastien Le Callonnec
  *
@@ -16,15 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**
  * @author: Sébastien Le Callonnec
  */
-
 require_once('lib/AtomParser.php');
-require_once('PHPUnit/Framework.php');
+require_once('PHPUnit/Autoload.php');
 
 class AtomParserTest
 extends phpwiki_TestCase
@@ -218,4 +217,4 @@
         $this->assertEquals($payload, $current_entry["content"]);
     }
 }
-?>
\ No newline at end of file
+?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/HtmlParserTest.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/HtmlParserTest.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/HtmlParserTest.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: HtmlParserTest.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: HtmlParserTest.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /* Copyright (C) 2004, Reini Urban <rurban at x-ray.at>
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/InlineParserTest.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/InlineParserTest.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/InlineParserTest.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: InlineParserTest.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: InlineParserTest.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /* Copyright (C) 2004 Dan Frankowski <dfrankow at cs.umn.edu>
  *           (C) 2006, 2007 Reini Urban <rurban at x-ray.at>

Modified: branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/XmlRpcTest.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/XmlRpcTest.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/XmlRpcTest.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: XmlRpcTest.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: XmlRpcTest.php 7956 2011-03-03 17:08:31Z vargenau $
 
 /* Copyright (C) 2007 Reini Urban
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/plugin/AtomFeedTest.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/plugin/AtomFeedTest.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/tests/unit/lib/plugin/AtomFeedTest.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// $Id: AtomFeedTest.php 7466 2010-06-07 08:12:29Z rurban $
+// $Id: AtomFeedTest.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright 2010 Sébastien Le Callonnec
  *
@@ -16,13 +16,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 /**
  * @author: Sébastien Le Callonnec
  */
-
 require_once('lib/plugin/AtomFeed.php');
 require_once('lib/AtomParser.php');
 require_once('lib/HtmlElement.php');

Modified: branches/Branch_5_1/src/plugins/wiki/www/tests/unit/test.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/tests/unit/test.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/tests/unit/test.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,7 +1,7 @@
 <?php // #!/usr/local/bin/php -Cq
 /* Copyright (C) 2004 Dan Frankowski <dfrankow at cs.umn.edu>
  * Copyright (C) 2004,2005,2006 Reini Urban <rurban at x-ray.at>
- * $Id: test.php 7638 2010-08-11 11:58:40Z vargenau $
+ * $Id: test.php 8071 2011-05-18 14:56:14Z vargenau $
  *
  * This file is part of PhpWiki.
  *
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -98,7 +98,7 @@
     array_push($database_backends, 'PDO_pqsql', 'PDO_sqlite', 'PDO_mysql');
                                    //'PDO_oci', 'PDO_odbc'
 
-//TODO: convert cvs test                         
+//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/flatfile"
@@ -146,10 +146,8 @@
 function assert_callback( $script, $line, $message ) {
    echo "assert failed: script ", $script," line ", $line," :";
    echo "$message";
-   if (function_exists('debug_backtrace')) { // >= 4.3.0
-       echo "Traceback:\n";
-       printSimpleTrace(debug_backtrace());
-   }
+   echo "Traceback:\n";
+   printSimpleTrace(debug_backtrace());
    exit;
 }
 $foo = assert_options( ASSERT_CALLBACK, 'assert_callback');
@@ -386,7 +384,7 @@
 elseif (!ini_get("register_argc_argv"))
     echo "Could not read cmd args (register_argc_argv=Off?)\n";
 // purge the testbox
-  
+
 $debug_level = 1; //was 9, _DEBUG_VERBOSE | _DEBUG_TRACE
 //if (defined('E_STRICT')) $debug_level = 5; // add PARSER flag on php5
 $user_level  = 1; // BOGO (conflicts with RateIt)
@@ -417,7 +415,7 @@
     }
 } elseif (!empty($argv) and preg_match("/test\.php$/", $argv[0])) {
     array_shift($argv);
-}  
+}
 if (!empty($argv)) {
     $runtests = array();
     $define = array();
@@ -635,7 +633,7 @@
         $suite  = new PHPUnit_TestSuite("phpwiki");
         if (file_exists(dirname(__FILE__).'/lib/'.$test.'.php'))
             require_once dirname(__FILE__).'/lib/'.$test.'.php';
-        else  
+        else
             require_once dirname(__FILE__).'/lib/plugin/'.$test.'.php';
         $suite->addTest( new PHPUnit_TestSuite($test) );
 
@@ -667,5 +665,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/tests/unit_test_backend_cvs.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/tests/unit_test_backend_cvs.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/tests/unit_test_backend_cvs.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -5,7 +5,7 @@
  * is designed to be run directly using the php4 command.
  *
  * Author: Gerrit Riessen, gerrit.riessen at open-source-consultants.de
- * $Id: unit_test_backend_cvs.php 7417 2010-05-19 12:57:42Z vargenau $
+ * $Id: unit_test_backend_cvs.php 7964 2011-03-05 17:05:30Z vargenau $
  */
 
 // assume that the we've cd'ed to the tests directory
@@ -24,7 +24,7 @@
 
 $db_params                           = array();
 /**
- * These are the parameters required by the backend. 
+ * These are the parameters required by the backend.
  */
 $db_params[CVS_PAGE_SOURCE]          = "../pgsrc";
 $db_params[CVS_CHECK_FOR_REPOSITORY] = true;
@@ -44,12 +44,12 @@
 while ( $entry = readdir( $d ) ) {
     exec( "grep 'Checking in $entry' " . $db_params[CVS_DEBUG_FILE],
           $cmdOutput, $cmdRetval );
-    
+
     if ( !is_dir( $db_params[CVS_PAGE_SOURCE] . "/" . $entry )) {
         $allPageNames[] = $entry;
-        
+
         if ( $cmdRetval ) {
-            print "*** Error: [$entry] was not checked in -- view " 
+            print "*** Error: [$entry] was not checked in -- view "
                 . $db_params[CVS_DEBUG_FILE] . " for details\n";
             $REMOVE_DEBUG = false;
         }
@@ -60,7 +60,7 @@
 //
 // Check that the meta data files were created
 //
-function get_pagedata( $page_name, $key, &$cvsdb ) 
+function get_pagedata( $page_name, $key, &$cvsdb )
 {
     global $REMOVE_DEBUG;
     $pageHash = $cvsdb->get_pagedata( $page_name );

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/crao-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/crao-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/crao-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-body{background-color:#ccc;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:12px;line-height:14px;margin:0;padding:0;border:0 none;color:#000;text-align:left;}img{border:0;vertical-align:middle;}table{border-spacing:0;empty-cells:show;}a:link,a{color:#33c;text-decoration:underline;background-color:transparent;}a:visited{color:#33c;text-decoration:underline;background-color:transparent;}a:hover{color:#03f;text-decoration:underline;background-color:transparent;}hr{background-color:#ccc;height:1px;border:1px solid #ccc;}div.wikitext pre{font-family:monospace;}p{font-size:1em;margin:0;margin-bottom:1em;}ul{position:relative;padding:0;margin:0;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;line-height:120%;list-style:inside;background-color:transparent;}ul ul{position:relative;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;margin-left:2em;}li.rc-major{list-style:none;display:block;background-color:#fff;margin:6px 0;border:1px #666 dashed;padding:.5ex;}li.evenrow{border:0;padding:1ex;}li.oddrow{border:0;padding:1ex;}li strong{font-weight:normal;background-color:transparent;}strong.wiki-summary{display:block;padding:5px 0;background-color:transparent;}li a.wiki-rc-action{display:inline;}li a.wiki-rc-action{border:0;}li.rc-major a.wiki{font-size:1.2em;font-weight:bold;}li>p{display:inline;}p.wiki-rc-action{text-align:center;vertical-align:middle;padding:5px 5px 5px 5px;border:1px #000 solid;background-color:transparent;}p a.wiki-rc-action{display:inline;padding:0 10px;font-weight:bold;background-color:transparent;}#header{background-color:#333;}#logo{color:#ccc;display:inline;margin-top:0;margin-left:0;height:50px;width:auto;background-color:transparent;font:bolder 67px/50px Verdana,Arial,Helvetica,sans-serif;letter-spacing:-0.1em;}#logo img{border:0;}#logo a{color:#ccc;font:bolder 67px/50px Arial,Verdana,Helvetica,sans-serif;text-decoration:none;}div.ie-actionbuttons{position:relative;height:22px;right:0;bottom:0;margin:0;background:transparent url(images/BG.png) no-repeat top right;text-align:right;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none;}#actionbuttons{position:fixed;max-width:30%;height:22px;right:0;bottom:0;margin:0;background:transparent url(images/BG.png) top left;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none;}#actionbuttons a,#actionbuttons a:link{position:relative;display:inline;text-align:right;width:100%;margin-bottom:.5em;margin-top:auto;background-color:transparent;border:0;}#content{margin-top:0;margin-left:7%;margin-right:7%;margin-bottom:7%;background-color:#f2f2f2;border:1px #999 solid;padding-left:2em;padding-right:15px;padding-top:15px;padding-bottom:.5ex;}div.wikitext{font-size:1em;line-height:130%;text-align:left;}blockquote.mail-style-quote{border-left:#F93;margin:0;margin-bottom:1em;border:1px solid #F93;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:2px solid #F93;padding:0;padding-left:.5em;}blockquote p{margin-top:.5ex;margin-bottom:.5ex;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}div.toolbar{display:block;background-color:#f2f2f2;border:1px #666 solid;margin:2% 7%;}.toolbar{padding:0;margin:0;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}#navbuttons{display:inline;}#navbuttons img{margin:5px 0 5px 10px;}#navbuttons a:link,#navbuttons a{font-weight:bold;padding-left:1ex;padding-right:1ex;color:#333;}#signin{width:auto;text-align:right;padding-right:10px;background-color:transparent;color:#ccc;font-size:12px;}#signin form{text-align:center;padding:1px;margin:0;display:inline;}#signin input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px;}#signin input.wikisignin{padding:0;margin:0;border:0 none;}#signin a.wiki{color:#FFF;background-color:transparent;}#search{font-size:12px;margin:5px 10px 5px 10px;float:right;}#search form{text-align:center;padding:1px;margin:0;display:inline;}#search input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px;}#search input.wikiaction{padding:0;margin:0;border:0 none;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#livesearch{height:13px;width:100px;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar{padding-left:1em;}body.sidebar h2{margin-top:0;}form.wikiadmin div{color:#000;background-color:#f2f2f2;}a.wikiaction,a.wikiadmin{line-height:2.6ex;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}img.linkicon{vertical-align:middle;}img.rssicon{vertical-align:baseline;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe{text-decoration:none;font-family:Verdana,Arial,Helvetica,sans-serif;}.wikiunsafe{color:#000;background-color:#f2f2f2;}input.wikiadmin{color:#000;background-color:#fff;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;background-color:transparent;}.wikiunknown a,.named-wikiunknown a{color:#FFF;background-color:#000;text-decoration:none;font-weight:normal;font-size:1em;padding:1px;padding-top:0;padding-bottom:0;border-top:1px solid #000;border-bottom:1px solid #000;margin-right:2px;}.backlinks{text-decoration:underline;background-color:transparent;color:#006;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{margin-top:10px;background-color:transparent;color:#555;}h1 a.backlinks{color:#777;text-decoration:none;}h1 a.wiki{color:#777;text-decoration:none;}h1 a.pagetitle{color:#555;text-decoration:none;}h1 a:hover{color:#888;text-decoration:underline;}h4,h5,h6{margin-bottom:0;background-color:transparent;color:#111;}div.rss{background-color:#fff;color:#000;border:2px solid #ddd;}div.feed{font-size:1.4em;padding:.5em;}.chandesc{font-size:.9em;}div.rssitem{display:block;background-color:#fff;color:#000;border-top:1px solid #ddd;padding:0 .5em;}div.itemname{display:block;border:0;margin-top:.5em;}div.itemdesc{font-size:1em;margin-bottom:.5em;}table,td{font-family:Verdana,Arial,Helvetica,sans-serif;}caption{font-family:Verdana,Arial,Helvetica,sans-serif;width:auto;}.pagelist{background-color:white;border:1px #333 dashed;}.pagelist tr.evenrow{background-color:white;}.pagelist tr.oddrow{background-color:white;}.pagelist td{padding:3px;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;height:18px;margin:5px 0;float:none;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikilink{display:block;}#revision{font-size:10px;text-align:right;background-color:#f2f2f2;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;clear:both;}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex;}#xhtml-validator{font-size:small;text-align:center;margin-top:1em;}form{margin:0;}input,textarea{margin:.1em;background-color:#FFF;vertical-align:middle;font-size:1em;}input.wikisignin{border:0 none;background-color:#FFF;}input.wikiaction{border:1px solid black;background-color:#D7FA8C;}input.numeric{text-align:center;}textarea.wikiedit{width:90%;margin:.5ex;padding:2px;font-family:Verdana,Arial,Helvetica,sans-serif;}#editarea-size{margin-top:1ex;margin-bottom:-1ex;text-align:right;font-size:smaller;border:1px none;}#editarea-size legend{text-align:right;font-size:smaller;border:1px solid #CCC;background-color:#ccc;}.editarea legend{font-family:Verdana,Helvetica,Arial,sans-serif;font-size:1em;line-height:1em;padding:.2em;border:1px solid #333;background-color:#eee;}fieldset.editarea{margin:1ex;margin-top:1em;text-align:center;padding:10px;border:1px solid #333;background-color:#E8E8E5;}fieldset.toolbar{margin:1ex;margin-top:0;text-align:center;padding:3px;border:1px solid #FFF;background-color:#FFF;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Helvetica,Arial,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{float:right;font-size:10px;border:1px solid #333;background-color:#ccc;margin:10px;padding:1px;empty-cells:hide;}table.cal td{text-align:right;}table.cal-header{font-size:larger;background-color:#333;color:#f2f2f2;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;color:#fff;}a.cal-arrow{color:#fff;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;background-color:#f2f2f2;}a.cal-hide{font-size:9px;text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid #333;color:#000;background-color:#f2f2f2;}table.cal td.cal-day a.cal-day{font-size:9px;text-decoration:underline;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:.5em;top:0;}.diff{color:#000;background-color:transparent;border:1px solid black;}.diff .block{color:#000;background-color:#ccc;padding-left:1em;}.diff .context{color:#000;background-color:transparent;border:none;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;background-color:transparent;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{color:#000;background-color:white;}.diff .original,.diff .deleted{color:#000;background-color:#fcc;border:none;}.diff .final,.diff .added{color:#000;background-color:#cfc;border:none;}.diff del{color:#000;background-color:#f99;}.diff ins{color:#000;background-color:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.hint{color:black;background-color:#eee;font-size:smaller;margin-left:5em;border:thin solid #aaa;}#clear{clear:both;margin:0;margin-top:-7px;padding:2px;text-align:center;color:#000;background-color:#FFF;border:solid 0;}#clear{margin-top:0;}img.inlineimage{border:0;vertical-align:middle;margin:0 5px 0 5px;}em>img.inlineimage{float:left;border:0;vertical-align:middle;margin:5px 15px 15px 0;}strong>img.inlineimage{float:right;border:0;vertical-align:middle;margin:5px 0 15px 15px;}h2.wikiblog-heading{font-size:2em;padding-bottom:.5em;border-bottom:2px solid gray;}.interwiki-map thead td{text-decoration:underline;}.printer{display:none;}div.errors{color:black;background-color:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.errors h4{color:red;margin:0;padding:0;text-decoration:underline;background-color:transparent;}.error{font-family:monospace;}.error ul{font-family:monospace;}.debug{color:black;background-color:transparent;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;}div.br{display:none;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file
+body{background-color:#ccc;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:12px;line-height:14px;margin:0;padding:0;border:0 none;color:#000;text-align:left;}img{border:0;vertical-align:middle;}table{border-spacing:0;empty-cells:show;}a:link,a{color:#33c;text-decoration:underline;background-color:transparent;}a:visited{color:#33c;text-decoration:underline;background-color:transparent;}a:hover{color:#03f;text-decoration:underline;background-color:transparent;}hr{background-color:#ccc;height:1px;border:1px solid #ccc;}div.wikitext pre{font-family:monospace;}p{font-size:1em;margin:0;margin-bottom:1em;}ul{position:relative;padding:0;margin:0;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;line-height:120%;list-style:inside;background-color:transparent;}ul ul{position:relative;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;margin-left:2em;}li.rc-major{list-style:none;display:block;background-color:#fff;margin:6px 0;border:1px #666 dashed;padding:.5ex;}li.evenrow{border:0;padding:1ex;}li.oddrow{border:0;padding:1ex;}li strong{font-weight:normal;background-color:transparent;}strong.wiki-summary{display:block;padding:5px 0;background-color:transparent;}li a.wiki-rc-action{display:inline;}li a.wiki-rc-action{border:0;}li.rc-major a.wiki{font-size:1.2em;font-weight:bold;}li>p{display:inline;}p.wiki-rc-action{text-align:center;vertical-align:middle;padding:5px 5px 5px 5px;border:1px #000 solid;background-color:transparent;}p a.wiki-rc-action{display:inline;padding:0 10px;font-weight:bold;background-color:transparent;}#header{background-color:#333;}#logo{color:#ccc;display:inline;margin-top:0;margin-left:0;height:50px;width:auto;background-color:transparent;font:bolder 67px/50px Verdana,Arial,Helvetica,sans-serif;letter-spacing:-0.1em;}#logo img{border:0;}#logo a{color:#ccc;font:bolder 67px/50px Arial,Verdana,Helvetica,sans-serif;text-decoration:none;}div.ie-actionbuttons{position:relative;height:22px;right:0;bottom:0;margin:0;background-color:transparent;background-image:url(images/BG.png);background-repeat:no-repeat;background-position:top right;text-align:right;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none;}#actionbuttons{position:fixed;max-width:30%;height:22px;right:0;bottom:0;margin:0;background-color:transparent;background-image:url(images/BG.png);background-position:top left;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none;}#actionbuttons a,#actionbuttons a:link{position:relative;display:inline;text-align:right;width:100%;margin-bottom:.5em;margin-top:auto;background-color:transparent;border:0;}#content{margin-top:0;margin-left:7%;margin-right:7%;margin-bottom:7%;background-color:#f2f2f2;border:1px #999 solid;padding-left:2em;padding-right:15px;padding-top:15px;padding-bottom:.5ex;}div.wikitext{font-size:1em;line-height:130%;text-align:left;}blockquote.mail-style-quote{border-left:#F93;margin:0;margin-bottom:1em;border:1px solid #F93;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background-color:transparent;border-style:none;border-left:2px solid #F93;padding:0;padding-left:.5em;}blockquote p{margin-top:.5ex;margin-bottom:.5ex;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}div.toolbar{display:block;background-color:#f2f2f2;border:1px #666 solid;margin:2% 7%;}.toolbar{padding:0;margin:0;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}#navbuttons{display:inline;}#navbuttons img{margin:5px 0 5px 10px;}#navbuttons a:link,#navbuttons a{font-weight:bold;padding-left:1ex;padding-right:1ex;color:#333;}#signin{width:auto;text-align:right;padding-right:10px;background-color:transparent;color:#ccc;font-size:12px;}#signin form{text-align:center;padding:1px;margin:0;display:inline;}#signin input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px;}#signin input.wikisignin{padding:0;margin:0;border:0 none;}#signin a.wiki{color:#FFF;background-color:transparent;}#search{font-size:12px;margin:5px 10px 5px 10px;float:right;}#search form{text-align:center;padding:1px;margin:0;display:inline;}#search input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px;}#search input.wikiaction{padding:0;margin:0;border:0 none;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#livesearch{height:13px;width:100px;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar{padding-left:1em;}body.sidebar h2{margin-top:0;}form.wikiadmin div{color:#000;background-color:#f2f2f2;}a.wikiaction,a.wikiadmin{line-height:2.6ex;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}img.linkicon{vertical-align:middle;}img.rssicon{vertical-align:baseline;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe{text-decoration:none;font-family:Verdana,Arial,Helvetica,sans-serif;}.wikiunsafe{color:#000;background-color:#f2f2f2;}input.wikiadmin{color:#000;background-color:#fff;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;background-color:transparent;}.wikiunknown a,.named-wikiunknown a{color:#FFF;background-color:#000;text-decoration:none;font-weight:normal;font-size:1em;padding:1px;padding-top:0;padding-bottom:0;border-top:1px solid #000;border-bottom:1px solid #000;margin-right:2px;}.backlinks{text-decoration:underline;background-color:transparent;color:#006;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{margin-top:10px;background-color:transparent;color:#555;}h1 a.backlinks{color:#777;text-decoration:none;}h1 a.wiki{color:#777;text-decoration:none;}h1 a.pagetitle{color:#555;text-decoration:none;}h1 a:hover{color:#888;text-decoration:underline;}h4,h5,h6{margin-bottom:0;background-color:transparent;color:#111;}div.rss{background-color:#fff;color:#000;border:2px solid #ddd;}div.feed{font-size:1.4em;padding:.5em;}.chandesc{font-size:.9em;}div.rssitem{display:block;background-color:#fff;color:#000;border-top:1px solid #ddd;padding:0 .5em;}div.itemname{display:block;border:0;margin-top:.5em;}div.itemdesc{font-size:1em;margin-bottom:.5em;}table,td{font-family:Verdana,Arial,Helvetica,sans-serif;}caption{font-family:Verdana,Arial,Helvetica,sans-serif;width:auto;}.pagelist{background-color:white;border:1px #333 dashed;}.pagelist tr.evenrow{background-color:white;}.pagelist tr.oddrow{background-color:white;}.pagelist td{padding:3px;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;height:18px;margin:5px 0;float:none;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikilink{display:block;}#revision{font-size:10px;text-align:right;background-color:#f2f2f2;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;clear:both;}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex;}#xhtml-validator{font-size:small;text-align:center;margin-top:1em;}form{margin:0;}input,textarea{margin:.1em;background-color:#FFF;vertical-align:middle;font-size:1em;}input.wikisignin{border:0 none;background-color:#FFF;}input.wikiaction{border:1px solid black;background-color:#D7FA8C;}input.numeric{text-align:center;}textarea.wikiedit{width:90%;margin:.5ex;padding:2px;font-family:Verdana,Arial,Helvetica,sans-serif;}#editarea-size{margin-top:1ex;margin-bottom:-1ex;text-align:right;font-size:smaller;border:1px none;}#editarea-size legend{text-align:right;font-size:smaller;border:1px solid #CCC;background-color:#ccc;}.editarea legend{font-family:Verdana,Helvetica,Arial,sans-serif;font-size:1em;line-height:1em;padding:.2em;border:1px solid #333;background-color:#eee;}fieldset.editarea{margin:1ex;margin-top:1em;text-align:center;padding:10px;border:1px solid #333;background-color:#E8E8E5;}fieldset.toolbar{margin:1ex;margin-top:0;text-align:center;padding:3px;border:1px solid #FFF;background-color:#FFF;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Helvetica,Arial,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{float:right;font-size:10px;border:1px solid #333;background-color:#ccc;margin:10px;padding:1px;empty-cells:hide;}table.cal td{text-align:right;}table.cal-header{font-size:larger;background-color:#333;color:#f2f2f2;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;color:#fff;}a.cal-arrow{color:#fff;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;background-color:#f2f2f2;}a.cal-hide{font-size:9px;text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid #333;color:#000;background-color:#f2f2f2;}table.cal td.cal-day a.cal-day{font-size:9px;text-decoration:underline;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:.5em;top:0;}.diff{color:#000;background-color:transparent;border:1px solid black;}.diff .block{color:#000;background-color:#ccc;padding-left:1em;}.diff .context{color:#000;background-color:transparent;border:none;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;background-color:transparent;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{color:#000;background-color:white;}.diff .original,.diff .deleted{color:#000;background-color:#fcc;border:none;}.diff .final,.diff .added{color:#000;background-color:#cfc;border:none;}.diff del{color:#000;background-color:#f99;}.diff ins{color:#000;background-color:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.hint{color:black;background-color:#eee;font-size:smaller;margin-left:5em;border:thin solid #aaa;}#clear{clear:both;margin:0;margin-top:-7px;padding:2px;text-align:center;color:#000;background-color:#FFF;border:solid 0;}#clear{margin-top:0;}img.inlineimage{border:0;vertical-align:middle;margin:0 5px 0 5px;}em>img.inlineimage{float:left;border:0;vertical-align:middle;margin:5px 15px 15px 0;}strong>img.inlineimage{float:right;border:0;vertical-align:middle;margin:5px 0 15px 15px;}h2.wikiblog-heading{font-size:2em;padding-bottom:.5em;border-bottom:2px solid gray;}.interwiki-map thead td{text-decoration:underline;}.printer{display:none;}.error{color:black;background-color:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.debug{color:black;background-color:transparent;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/crao.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/crao.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/crao.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -34,32 +34,32 @@
   empty-cells: show;
 }
 a:link, a {/* MODIFY-TXT */
-	color: #33c; 
-	text-decoration: underline; 
-	background-color: transparent;
+    color: #33c;
+    text-decoration: underline;
+    background-color: transparent;
 }
 a:visited {/* MODIFY-TXT */
-	color: #33c;
-	text-decoration: underline;
-	background-color: transparent;
+    color: #33c;
+    text-decoration: underline;
+    background-color: transparent;
 }
 a:hover {/* MODIFY-TXT */
-	color: #03f;
-	text-decoration:underline;
-	background-color: transparent;
+    color: #03f;
+    text-decoration:underline;
+    background-color: transparent;
 }
 a.wiki, a.wikiadmin, a.named-wiki {
 }
-hr { 
-	background-color: #ccc;/* MODIFY-color */
-	height: 1px;
-	border: 1px solid #ccc;	/* MODIFY-color */
+hr {
+    background-color: #ccc;/* MODIFY-color */
+    height: 1px;
+    border: 1px solid #ccc;    /* MODIFY-color */
 }
 div.wikitext pre { font-family: monospace; }
-p {	
-	font-size: 1em;
-	margin: 0em;
-	margin-bottom: 1em;
+p {
+    font-size: 1em;
+    margin: 0em;
+    margin-bottom: 1em;
 }
 
 
@@ -69,31 +69,31 @@
  ******************************
  */
 ul{
-	position: relative;
-	padding : 0px;
-	margin: 0em;
-	font-family: Helvetica, Verdana, Arial, sans-serif;
-	font-size: 100%;
-	line-height: 120%;
-	list-style: inside;
-	background-color: transparent;
+    position: relative;
+    padding : 0px;
+    margin: 0em;
+    font-family: Helvetica, Verdana, Arial, sans-serif;
+    font-size: 100%;
+    line-height: 120%;
+    list-style: inside;
+    background-color: transparent;
 }
 ul ul{
-	position:  relative;
-	font-family: Helvetica, Verdana, Arial, sans-serif;
-	font-size: 100%;
-	margin-left: 2em;
+    position:  relative;
+    font-family: Helvetica, Verdana, Arial, sans-serif;
+    font-size: 100%;
+    margin-left: 2em;
 }
 
 li.rc-major {
-	list-style: none;
-	display: block; 
-	background-color: #fff;/* MODIFY-color */
-	margin: 6px 0px;
-	border: 1px #666 dashed;/* MODIFY-color */
-	padding:0.5ex;
+    list-style: none;
+    display: block;
+    background-color: #fff;/* MODIFY-color */
+    margin: 6px 0px;
+    border: 1px #666 dashed;/* MODIFY-color */
+    padding:0.5ex;
 }
-		
+
 li.evenrow{
  border: 0px;
  padding:1ex;
@@ -130,50 +130,47 @@
 }
 p.wiki-rc-action
 {
-	text-align: center;
-	vertical-align: middle;
-	padding: 5px 5px 5px 5px;
-	border: 1px #000 solid;
-	background-color: transparent;
+    text-align: center;
+    vertical-align: middle;
+    padding: 5px 5px 5px 5px;
+    border: 1px #000 solid;
+    background-color: transparent;
 }
 
 p a.wiki-rc-action
 {
-	display: inline;
-	padding:0px 10px;
-	font-weight: bold;
-	background-color: transparent;
+    display: inline;
+    padding:0px 10px;
+    font-weight: bold;
+    background-color: transparent;
 }
 
-
-
 /*
  ******************************
  *****HEADER
  ******************************
  */
 #header {
-	background-color: #333;/* MODIFY-color */
+    background-color: #333;/* MODIFY-color */
 }
 #logo {/* MODIFY-TXT */
-	color:  #ccc;
-	display: inline;
-	margin-top: 0px;
-	margin-left: 0px;
-	height: 50px;
-	width:auto;
-	background-color: transparent;
-	font: bolder 67px/50px  Verdana, Arial, Helvetica, sans-serif;
-        letter-spacing: -0.1em;
-        /* font-variant: condensed; */
+    color:  #ccc;
+    display: inline;
+    margin-top: 0px;
+    margin-left: 0px;
+    height: 50px;
+    width:auto;
+    background-color: transparent;
+    font: bolder 67px/50px  Verdana, Arial, Helvetica, sans-serif;
+    letter-spacing: -0.1em;
 }
 #logo img {
-	border: 0px; 
+    border: 0px;
 }
 #logo a {
-	color:  #ccc;
-	font: bolder 67px/50px  Arial, Verdana, Helvetica, sans-serif;
-  	text-decoration: none;
+    color:  #ccc;
+    font: bolder 67px/50px  Arial, Verdana, Helvetica, sans-serif;
+    text-decoration: none;
 }
 
 /*
@@ -184,45 +181,49 @@
  */
 
 div.ie-actionbuttons {
-        position: relative/*absolute*/;
-  /*max-width: 30%;*/ height: 22px;
-	right: 0; bottom: 0;
-	margin: 0px;
-        background: transparent url(images/BG.png) no-repeat top right;
-	text-align: right;
-	vertical-align: bottom;
-	padding-left: 2em;
-	padding-right: 1em;
-	padding-top: 0.5ex;
-	padding-bottom: 0.5ex;
-	border: 0px none;
+    position: relative;
+    height: 22px;
+    right: 0; bottom: 0;
+    margin: 0px;
+    background-color: transparent;
+    background-image: url(images/BG.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+    text-align: right;
+    vertical-align: bottom;
+    padding-left: 2em;
+    padding-right: 1em;
+    padding-top: 0.5ex;
+    padding-bottom: 0.5ex;
+    border: 0px none;
 }
 
-/* body>div#actionbuttons { position: fixed; } */
 #actionbuttons {
-	position: fixed;
-/*	position: absolute; */
- 	max-width: 30%; height: 22px;
-	right: 0px; bottom: 0px;
-	margin: 0px;
-	background: transparent url(images/BG.png) top left;/* MODIFY-IMG */
-	vertical-align: bottom;
-	padding-left: 2em;
-	padding-right: 1em;
-	padding-top: 0.5ex;
-	padding-bottom: 0.5ex;
-	border: 0px none;
+    position: fixed;
+    max-width: 30%;
+    height: 22px;
+    right: 0px; bottom: 0px;
+    margin: 0px;
+    background-color: transparent;
+    background-image: url(images/BG.png);
+    background-position: top left;
+    vertical-align: bottom;
+    padding-left: 2em;
+    padding-right: 1em;
+    padding-top: 0.5ex;
+    padding-bottom: 0.5ex;
+    border: 0px none;
 }
 #actionbuttons div { }
 #actionbuttons a, #actionbuttons a:link {
-	position: relative;
-	display: inline;
-	text-align: right;
-	width: 100%;
-	margin-bottom: 0.5em;
-	margin-top: auto;
- 	background-color:transparent;
- 	border: 0px;
+    position: relative;
+    display: inline;
+    text-align: right;
+    width: 100%;
+    margin-bottom: 0.5em;
+    margin-top: auto;
+    background-color: transparent;
+    border: 0px;
 }
 
 /*
@@ -230,52 +231,45 @@
  *****CONTENT-ZONE
  ******************************
  */
-#content {	
-	margin-top:    0px;
-	margin-left:7%;
-	margin-right: 7%;
-	margin-bottom:7%;
-	background-color: #f2f2f2;/* MODIFY-color */
-	/* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-	border: 1px #999 solid;/* MODIFY-color */
-	padding-left: 2em; 
-	padding-right: 15px;
-	padding-top:   15px;
-	padding-bottom: 0.5ex;
-	/*This breaks Netscape 4: (display does not go 	full width).
-	 * width: auto;
-	 */
-	
+#content {
+    margin-top:    0px;
+    margin-left:7%;
+    margin-right: 7%;
+    margin-bottom:7%;
+    background-color: #f2f2f2;/* MODIFY-color */
+    border: 1px #999 solid;/* MODIFY-color */
+    padding-left: 2em;
+    padding-right: 15px;
+    padding-top:   15px;
+    padding-bottom: 0.5ex;
 }
 /* titre */
 div.boxtitrehead {}
 div.boxtitrehead a.backlinks {}
 div.wikitext {
-	font-size: 1em;
-	line-height: 130%;
-	text-align: left;
+    font-size: 1em;
+    line-height: 130%;
+    text-align: left;
 }
 blockquote.mail-style-quote {
-	border-left: #FF9933;/* MODIFY-color */
-	margin: 0em;
-	margin-bottom: 1em;
-	border: 1px solid #FF9933;/* MODIFY-color */
-	padding: 0.5em;
+    border-left: #FF9933;/* MODIFY-color */
+    margin: 0em;
+    margin-bottom: 1em;
+    border: 1px solid #FF9933;/* MODIFY-color */
+    padding: 0.5em;
 }
 .mail-style-quote blockquote.mail-style-quote {
-	margin-left: 0.3em;
-	margin-bottom : 0em;
-	background: transparent;
-	border-style: none;
-	border-left: 2px solid #FF9933;/* MODIFY-color */
-	padding: 0em;
-	padding-left: 0.5em;
+    margin-left: 0.3em;
+    margin-bottom : 0em;
+    background-color: transparent;
+    border-style: none;
+    border-left: 2px solid #FF9933;/* MODIFY-color */
+    padding: 0em;
+    padding-left: 0.5em;
 }
 blockquote p {
-	margin-top:  0.5ex;
-	margin-bottom: 0.5ex;
+    margin-top:  0.5ex;
+    margin-bottom: 0.5ex;
 }
 
 /*
@@ -305,16 +299,16 @@
 }
 
 #navbuttons {
-	display: inline;
+    display: inline;
 }
 #navbuttons img{
-	margin:5px 0px 5px 10px;
+    margin:5px 0px 5px 10px;
 }
 #navbuttons a:link, #navbuttons a{/* MODIFY-TXT */
-	font-weight: bold;
-	padding-left: 1ex;
-	padding-right: 1ex;
-	color:#333;
+    font-weight: bold;
+    padding-left: 1ex;
+    padding-right: 1ex;
+    color:#333;
 }
 #navbuttons a:visited{}
 #navbuttons a:hover{}
@@ -325,36 +319,36 @@
  ******************************
  */
 #signin{/* MODIFY-TXT */
-	width:  auto;
-	text-align: right;
-	padding-right: 10px;
-	background-color:transparent;
-	color:#ccc;
-	font-size:12px;
+    width:  auto;
+    text-align: right;
+    padding-right: 10px;
+    background-color: transparent;
+    color:#ccc;
+    font-size:12px;
 }
 #signin form{/* MODIFY-TXT */
-	text-align:  center;
-	padding: 1px;
-	margin: 0px;
-	display: inline;
-}	
+    text-align:  center;
+    padding: 1px;
+    margin: 0px;
+    display: inline;
+}
 #signin input{/* MODIFY-TXT */
-	padding: 0px;
-	padding-left: 3px;
-	margin: 0px;
-	font-family:  Verdana, Arial,  Helvetica, sans-serif ;
-	color:#333;
-	font-size: 12px;
+    padding: 0px;
+    padding-left: 3px;
+    margin: 0px;
+    font-family:  Verdana, Arial,  Helvetica, sans-serif ;
+    color:#333;
+    font-size: 12px;
 }
 #signin input.wikisignin{
-	padding: 0px;
-	margin: 0px;
-	border: 0px none;
+    padding: 0px;
+    margin: 0px;
+    border: 0px none;
 }
 
 #signin a.wiki{/* MODIFY-TXT */
-	color:#FFF;
-	background-color: transparent;
+    color:#FFF;
+    background-color: transparent;
 }
 
 /*
@@ -363,29 +357,29 @@
  ******************************
  */
 #search {
-	font-size: 12px;
-	margin: 5px 10px 5px 10px;
-	/*padding-right: 10px;*/
-	float: right;
+    font-size: 12px;
+    margin: 5px 10px 5px 10px;
+    /*padding-right: 10px;*/
+    float: right;
 }
 #search form{
-	text-align:  center;
-	padding: 1px;
-	margin: 0px;
-	display: inline;
+    text-align:  center;
+    padding: 1px;
+    margin: 0px;
+    display: inline;
 }
 #search input{
-	padding: 0px;
-	padding-left: 3px;
-	margin: 0px;
-	font-family:  Verdana, Arial,  Helvetica, sans-serif;
-	color: #333;
-	font-size: 12px; 
+    padding: 0px;
+    padding-left: 3px;
+    margin: 0px;
+    font-family:  Verdana, Arial,  Helvetica, sans-serif;
+    color: #333;
+    font-size: 12px;
 }
 #search input.wikiaction{
-	padding: 0px;
-	margin: 0px;
-	border: 0px none;
+    padding: 0px;
+    margin: 0px;
+    border: 0px none;
 }
 .search-context { background: white; font-style: oblique; }
 .search-term {
@@ -402,7 +396,7 @@
   display: none;
   z-index: 100;
   background-color: white;
-  border: 1px solid #d0d0d0; 
+  border: 1px solid #d0d0d0;
   font-size: 9px;
   overflow: hidden;
 }
@@ -411,9 +405,9 @@
 }
 #LSResult .evenrow {
   background-color: #f0f0f0;
-} 
+}
 #LSREsult .oddrow {
-} 
+}
 .LSEnd {
   text-align: right;
 }
@@ -422,7 +416,7 @@
 }
 .LSRow {
   padding: 1px;
-} 
+}
 ul.LSRes {
   margin: 0px;
   padding: 0px;
@@ -434,16 +428,6 @@
 
 /*
  ******************************
- *****NEWS
- ******************************
- */
-#news{
-}
-
-
-
-/*
- ******************************
  *****MOZ-SIDEBAR
  ******************************
  */
@@ -457,8 +441,6 @@
 body.sidebar  { padding-left: 1em; }
 body.sidebar h2 { margin-top: 0; }
 
-
-
 /*
  ******************************
  *****WIKI-FORM
@@ -480,8 +462,6 @@
 /* Add space between the input field and following buttons, but not after the last button. */
 div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; }
 
-
-
 /*
  ******************************
  *****LINK-ICON
@@ -492,22 +472,19 @@
 img.linkicon { vertical-align: middle; }
 img.rssicon  { vertical-align: baseline; }
 
-
-
 /*
  ******************************
  *****ADMIN-ACTION
  ******************************
  */
 a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe {
-	text-decoration: none;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
+    text-decoration: none;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 
-
 .wikiunsafe {
-	color: #000; 
-	background-color: #f2f2f2;/* MODIFY-color */
+    color: #000;
+    background-color: #f2f2f2;/* MODIFY-color */
 }
 
 input.wikiadmin  {color: #000; background-color: #fff; }
@@ -520,30 +497,30 @@
 
 /* Unknown links */
 .wikiunknown, .named-wikiunknown {
-	font-weight: normal;
-	font-size: 100%;
-	background-color: transparent;
+    font-weight: normal;
+    font-size: 100%;
+    background-color: transparent;
 }
  /* QuestionMark #600 */
 .wikiunknown a, .named-wikiunknown a {
- 	color: #FFFFFF;
-  	background-color: #000000;/* MODIFY-color */
-  	text-decoration: none;
-  	font-weight: normal;
-  	font-size: 1em;
-  	padding:  1px;
-  	padding-top: 0px;
-  	padding-bottom: 0px;
-  	border-top: 1px solid #000000;
-  	border-bottom: 1px solid #000000;
-  	margin-right: 2px;
+    color: #FFFFFF;
+    background-color: #000000;/* MODIFY-color */
+    text-decoration: none;
+    font-weight: normal;
+    font-size: 1em;
+    padding:  1px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+    border-top: 1px solid #000000;
+    border-bottom: 1px solid #000000;
+    margin-right: 2px;
 }
 
 /* Backlinks */
 .backlinks {
-	text-decoration: underline;
-	background-color: transparent;
-	color: #006;
+    text-decoration: underline;
+    background-color: transparent;
+    color: #006;
 }
 
 
@@ -553,8 +530,6 @@
 .interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
 .interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; }
 
-
-
 /*
  ******************************
  *****HEADING
@@ -563,34 +538,33 @@
 h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; }
 
 h1 { /* MODIFY-TXT */
-	margin-top:   10px;
-	  background-color: transparent;
- 		color: #555; 
- }
+    margin-top:   10px;
+    background-color: transparent;
+    color: #555;
+}
 
 h1 a.backlinks{ /* MODIFY-TXT */
-	color: #777; 
-	text-decoration:none;
+    color: #777;
+    text-decoration:none;
 }
 h1 a.wiki{ /* MODIFY-TXT */
-	color: #777; 
-	text-decoration:none;
+    color: #777;
+    text-decoration:none;
 }
 h1 a.pagetitle{ /* MODIFY-TXT */
-	color: #555; 
-	text-decoration:none;
+    color: #555;
+    text-decoration:none;
 }
 h1 a:hover{ /* MODIFY-TXT */
-	color: #888; 
-	text-decoration:underline;
+    color: #888;
+    text-decoration:underline;
 }
 h4, h5, h6 {  /* MODIFY-TXT */
-	margin-bottom:   0px;
-	  background-color: transparent;
- 		color: #111; 
- }
+    margin-bottom:   0px;
+    background-color: transparent;
+    color: #111;
+}
 
-
 /*
  ******************************
  *****RSS
@@ -600,54 +574,52 @@
 /* rss feed */
 
 div.rss {
-	background-color: #fff;
-	color:#000;
-	border: 2px solid #ddd;
+    background-color: #fff;
+    color:#000;
+    border: 2px solid #ddd;
 }
 
 
 div.feed {
-	font-size: 1.4em;
-	padding: 0.5em;
+    font-size: 1.4em;
+    padding: 0.5em;
 }
 .chandesc {
-	font-size: 0.9em;
+    font-size: 0.9em;
 }
 
 div.rssitem {
-	display: block;
-	background-color: #fff;
-	color:#000;
-	border-top: 1px solid #ddd;
-	padding: 0em 0.5em;
-	
+    display: block;
+    background-color: #fff;
+    color:#000;
+    border-top: 1px solid #ddd;
+    padding: 0em 0.5em;
+
 }
 
 div.itemname {
-	display: block;
-	border: 0px;
-	margin-top: 0.5em;
+    display: block;
+    border: 0px;
+    margin-top: 0.5em;
 }
 div.itemdesc {
-	font-size: 1em;
-	margin-bottom: 0.5em;
+    font-size: 1em;
+    margin-bottom: 0.5em;
 }
 
-
-
 /*
  ******************************
  *****TABLES
  ******************************
  */
 table, td { font-family: Verdana, Arial, Helvetica, sans-serif; }
-caption { 
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	width: auto;
+caption {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    width: auto;
 }
 .pagelist {
-	background-color: white;/* MODIFY-color */
-	border:1px #333 dashed;/* MODIFY-color */
+    background-color: white;/* MODIFY-color */
+    border:1px #333 dashed;/* MODIFY-color */
 
 }
 .pagelist thead, .pagelist thead u {}
@@ -680,35 +652,32 @@
 }
 
 .wikilink{
-	display:block;
+    display:block;
 }
 
 #revision{
-	font-size:10px;
-	text-align:right;
-	background-color: #f2f2f2;/* MODIFY-color */
-	/* "paper" borders */
-	padding-left: 2em; 
-	padding-right: 1em;
-	padding-top:    0.5ex;
-	padding-bottom: 0.5ex;
-	/*This breaks Netscape 4: (display does not go full width).
-	 * width: auto;
-	 */
-	clear: both;
+    font-size:10px;
+    text-align:right;
+    background-color: #f2f2f2;/* MODIFY-color */
+    /* "paper" borders */
+    padding-left: 2em;
+    padding-right: 1em;
+    padding-top:    0.5ex;
+    padding-bottom: 0.5ex;
+    clear: both;
 }
 
 .editdate {
-	font-family: Arial, Helvetica, sans-serif;
-	margin: 0;
-	padding: 0;
-	padding-top: 0.25ex;
+    font-family: Arial, Helvetica, sans-serif;
+    margin: 0;
+    padding: 0;
+    padding-top: 0.25ex;
 }
 #xhtml-validator
 {
-	font-size: small;
-	text-align: center;
-	margin-top: 1em;
+    font-size: small;
+    text-align: center;
+    margin-top: 1em;
 }
 
 
@@ -718,117 +687,112 @@
  ******************************
  */
 form { margin: 0; }
-input, textarea { 
-	margin: 0.1em; 
-	background-color: #FFF;
-	vertical-align: middle;
-	font-size: 1em;
+input, textarea {
+    margin: 0.1em;
+    background-color: #FFF;
+    vertical-align: middle;
+    font-size: 1em;
 }
 input.wikisignin{
-	border: 0px none;
-	background-color:#FFF;
+    border: 0px none;
+    background-color:#FFF;
 }
 input.wikiaction{
-	border: 1px solid black;
-	background-color:#D7FA8C;
+    border: 1px solid black;
+    background-color:#D7FA8C;
 }
 input.numeric { text-align: center; }
 /* Make the textarea the full page width */
 textarea.wikiedit {
-	width: 90%;
-	margin: 0.5ex;
-	padding: 2px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
+    width: 90%;
+    margin: 0.5ex;
+    padding: 2px;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
 }
 
 #editarea-size {
-	margin-top: 1ex;
-	margin-bottom: -1ex;
-	text-align: right;
-	font-size: smaller;
-	border: 1px none;
+    margin-top: 1ex;
+    margin-bottom: -1ex;
+    text-align: right;
+    font-size: smaller;
+    border: 1px none;
 }
 #editarea-size legend{
-	text-align: right;
-	font-size: smaller;
-	border: 1px solid #CCC;
-	background-color: #ccc;
+    text-align: right;
+    font-size: smaller;
+    border: 1px solid #CCC;
+    background-color: #ccc;
 }
 .editarea legend{
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 1em;
-	line-height: 1em;
-	padding: 0.2em;
-	border: 1px solid #333;
-	background-color: #eee;
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-size: 1em;
+    line-height: 1em;
+    padding: 0.2em;
+    border: 1px solid #333;
+    background-color: #eee;
 }
 fieldset.editarea {
-	margin : 1ex;
-	margin-top: 1em;
-	text-align: center;
-	padding : 10px;
-	border: 1px solid #333;
-	background-color: #E8E8E5;
+    margin : 1ex;
+    margin-top: 1em;
+    text-align: center;
+    padding : 10px;
+    border: 1px solid #333;
+    background-color: #E8E8E5;
 }
 fieldset.toolbar {
-	margin : 1ex;
-	margin-top: 0em;
-	text-align: center;
-	padding : 3px;
-	border: 1px solid #FFF;
-	background-color: #FFF;
+    margin : 1ex;
+    margin-top: 0em;
+    text-align: center;
+    padding : 3px;
+    border: 1px solid #FFF;
+    background-color: #FFF;
 }
 
-/*
- ******************************
- *****INCLUDE-PAGE
- ******************************
- */
+/* IncludePage plugin ================================================= */
 
-/* IncludePage plugin */
 .transclusion-title {
-	text-align: right;
-	font-style: oblique;
-	font-size:  smaller;
-	text-decoration: underline;
-	margin-bottom: 0.25ex;
-	margin-right:  0.25em;
-} 
+    text-align: right;
+    font-style: oblique;
+    font-size:  smaller;
+    text-decoration: underline;
+    margin-bottom: 0.25ex;
+    margin-right:  0.25em;
+}
 .transclusion, .wiki-edithelp {
-	font-size: smaller;
+    font-size: smaller;
 }
 .transclusion {
-	border: 1px solid gray;/* MODIFY-color */
-	padding-left:  0.8em; 
-	padding-right: 0.8em; 
-	padding-top:     0px;
-	padding-bottom:  0px;
-	margin-left:   0.25em;
-	margin-right:  0.25em;
-	margin-bottom: 0.1ex;
+    border: 1px solid gray;/* MODIFY-color */
+    padding-left:  0.8em;
+    padding-right: 0.8em;
+    padding-top:     0px;
+    padding-bottom:  0px;
+    margin-left:   0.25em;
+    margin-right:  0.25em;
+    margin-bottom: 0.1ex;
 }
 .wiki-edithelp {
-	background-color: white;
-	border: medium solid #fff8dc; /* MODIFY-color */
-	padding-left:  0.5em;
-	padding-right: 0.5em;
-	padding-top:    0.75ex;
-	padding-bottom: 0.75ex;
-	margin-left:  0;
-	margin-right: 0;
-	margin-top: 1ex;
-	margin-bottom: 1ex;
+    background-color: white;
+    border: medium solid #fff8dc; /* MODIFY-color */
+    padding-left:  0.5em;
+    padding-right: 0.5em;
+    padding-top:    0.75ex;
+    padding-bottom: 0.75ex;
+    margin-left:  0;
+    margin-right: 0;
+    margin-top: 1ex;
+    margin-bottom: 1ex;
 }
 .wiki-edithelp .wiki {
-	/* color: #5454ff;*/
+    /* color: #5454ff;*/
 }
 .wiki-edithelp p {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	padding-left:  0.5em;
-	padding-right: 0.5em;
-	padding-top:    0.5ex;
-	padding-bottom: 0.5ex;
-	margin: 0;
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    padding-left:  0.5em;
+    padding-right: 0.5em;
+    padding-top:    0.5ex;
+    padding-bottom: 0.5ex;
+    margin: 0;
 }
 
 
@@ -840,33 +804,33 @@
  */
 
 table.cal {
-	float:right;
-	font-size:10px;
-	border: 1px solid #333;
-	background-color: #ccc;/* MODIFY-color */
-	margin: 10px;
-	padding: 1px;
-	/* For Mozilla */
-	empty-cells: hide;} 
+    float:right;
+    font-size:10px;
+    border: 1px solid #333;
+    background-color: #ccc;/* MODIFY-color */
+    margin: 10px;
+    padding: 1px;
+    /* For Mozilla */
+    empty-cells: hide;}
 
 /* cells */
 table.cal td {
-	text-align: right;
-} 
+    text-align: right;
+}
 
 /* Month-name header */
 table.cal-header { /* MODIFY-TXT */
-font-size: larger; 
+font-size: larger;
 background-color: #333;/* MODIFY-color */
 color: #f2f2f2;}
 table.cal-header tr, table.cal-header td { text-align: center; }
 .cal-arrow {/* MODIFY-TXT */
-	font-weight: bold;
-	text-decoration: none;
-	color: #fff;
+    font-weight: bold;
+    text-decoration: none;
+    color: #fff;
 }
 a.cal-arrow {/* MODIFY-TXT */
-	color:#fff;
+    color:#fff;
 }
 
 /* Day-names header */
@@ -874,105 +838,93 @@
 
 .cal-dayname td {
  text-align: center;
-	font-size: smaller;
-	text-decoration: none;
-	background-color: #f2f2f2;/* MODIFY-color */
+    font-size: smaller;
+    text-decoration: none;
+    background-color: #f2f2f2;/* MODIFY-color */
 }
 
 /* Individual days */
-a.cal-hide { 
- font-size: 9px; 
+a.cal-hide {
+ font-size: 9px;
 text-decoration: none; }
 
 /* Today */
  /* cell */
 table.cal td.cal-today {
-	margin: 1px;
-	border: 1px solid #333;/* MODIFY-color */
-	color: #000;
-	background-color: #f2f2f2;/* MODIFY-color */
+    margin: 1px;
+    border: 1px solid #333;/* MODIFY-color */
+    color: #000;
+    background-color: #f2f2f2;/* MODIFY-color */
 }
  /* text */
-table.cal td.cal-day a.cal-day {font-size: 9px; 
+table.cal td.cal-day a.cal-day {font-size: 9px;
 text-decoration: underline; }
 
-
-
 /*
  ******************************
  *****DIFF
  ******************************
  */
 
-.diff .block div { position: relative; padding-left: 1.5em; } 
+.diff .block div { position: relative; padding-left: 1.5em; }
 .diff .prefix    { position: absolute; left: 0.5em; top: 0; }
 /* main box */
 .diff {
 color: #000;
-	background-color: transparent;
-	/* for NS4 */
-	border: 1px solid black;
+    background-color: transparent;
+    border: 1px solid black;
 }
 .diff .block {
 color: #000;
-	background-color: #ccc;
-	padding-left: 1em;
-	/* for NS4 */
-	/*border: none;*/
+    background-color: #ccc;
+    padding-left: 1em;
 }
 
 /* individual blocks */
 .diff .context {
 color: #000;
-	background-color: transparent;
-	/* for NS4 */
-	border: none;
+    background-color: transparent;
+    border: none;
 }
 /* + - line prefix */
 .diff .block tt {
-	font-weight: normal;
-	font-family: monospace;
-	color: black;
-	background-color: transparent;
-	/* for NS4 */
-	margin-left: 0;
-	border: none;
+    font-weight: normal;
+    font-family: monospace;
+    color: black;
+    background-color: transparent;
+    margin-left: 0;
+    border: none;
 }
 /* changed words */
 .diff del, .diff ins {
-	font-weight: bold;
-	text-decoration: none;
+    font-weight: bold;
+    text-decoration: none;
 }
 
 /* blocks containing deleted or added words */
 .diff .original, .diff .deleted,
 .diff .final, .diff .added {
 color: #000;
-	background-color: white;
+    background-color: white;
 }
 /* blocks containing deleted words */
 .diff .original, .diff .deleted {
 color: #000;
-	background-color: #fcc;
-	/* for NS4 */
-	border: none;
+    background-color: #fcc;
+    border: none;
 }
 /* blocks containing added words */
 .diff .final, .diff .added {
 color: #000;
-	background-color: #cfc;
-	/* for NS4 */
-	border: none;
+    background-color: #cfc;
+    border: none;
 }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 /* deleted words */
 .diff del {color: #000; background-color: #f99; }
 /* added words */
 .diff ins {color: #000; background-color: #9f9; }
 
-
-
 /*
  ******************************
  *****INFO-HISTORY
@@ -980,28 +932,24 @@
  */
 td.pageinfo { font-weight: bold; }
 .pageinfo-minoredit, .pageinfo-authorid {
-	font-size: smaller;
-	font-style: oblique;
+    font-size: smaller;
+    font-style: oblique;
 }
 
-
-
 /*
  ******************************
  *****HINTS
  ******************************
  */
 .hint {
-	color: black;
-	background-color: #eeeeee;
-	font-size: smaller;
-	margin-left: 5em;
-	/* padding: -0.5em 0 -0.5em; */
-	border: thin solid #aaaaaa;
+    color: black;
+    background-color: #eeeeee;
+    font-size: smaller;
+    margin-left: 5em;
+    /* padding: -0.5em 0 -0.5em; */
+    border: thin solid #aaaaaa;
 }
 
-
-
 /*
  ******************************
  *****CLEAR
@@ -1009,53 +957,48 @@
  */
 
 #clear
-	{
-	clear				: both;
-	margin				: 0px;
-	margin-top			: -7px;
-	padding				: 2px;
-	text-align			: center;
-	color				: #000;
-	background-color	: #FFF;
-	border				: solid 0px;
+    {
+    clear                : both;
+    margin                : 0px;
+    margin-top            : -7px;
+    padding                : 2px;
+    text-align            : center;
+    color                : #000;
+    background-color    : #FFF;
+    border                : solid 0px;
 }
 /* reset post NN4 */
 /*/*/
 #clear
-	{
-	margin-top			: 0px;
+    {
+    margin-top            : 0px;
 }
 
-/* */
 
-
-
 /*
  ******************************
  *****IMG-HACK
  ******************************
  */
 img.inlineimage{
-	border: 0px;
-	vertical-align: middle;
-	margin : 0px 5px 0px 5px;
+    border: 0px;
+    vertical-align: middle;
+    margin : 0px 5px 0px 5px;
 }
 em > img.inlineimage{
-	float: left;
-	border: 0px;
-	vertical-align: middle;
-	margin : 5px 15px 15px 0px;
+    float: left;
+    border: 0px;
+    vertical-align: middle;
+    margin : 5px 15px 15px 0px;
 }
-	
+
 strong > img.inlineimage{
-	float: right;
-	border: 0px;
-	vertical-align: middle;
-	margin : 5px 0px 15px 15px;
+    float: right;
+    border: 0px;
+    vertical-align: middle;
+    margin : 5px 0px 15px 15px;
 }
 
-
-
 /*
  ******************************
  *****WIKI-BLOG
@@ -1063,12 +1006,11 @@
  */
 
 h2.wikiblog-heading {
-	font-size: 2em;
-	padding-bottom: 0.5em;
-	border-bottom: 2px solid gray;/* MODIFY-color */
+    font-size: 2em;
+    padding-bottom: 0.5em;
+    border-bottom: 2px solid gray;/* MODIFY-color */
 }
 
-
 /*
  ******************************
  *****OTHER
@@ -1078,42 +1020,29 @@
 .interwiki-map thead td { text-decoration: underline; }
 .printer { display: none; }
 
-/* PHP Warnings */
-div.errors {
-	color: black;
-	background-color: #eee;
-	margin-top:    1em;
-	margin-bottom: 1em;
-	padding-left:  0.8em; 
-	padding-right: 0.8em; 
-	padding-top:    0.8ex;
-	padding-bottom: 0;
-	border: medium solid red;
-	clear: both;
+.error {
+    color: black;
+    background-color: #eee;
+    margin-top:    1em;
+    margin-bottom: 1em;
+    padding-left:  0.8em;
+    padding-right: 0.8em;
+    padding-top:    0.8ex;
+    padding-bottom: 0;
+    border: medium solid red;
+    clear: both;
 }
-.errors h4 {
-	color: red;
-	margin:  0;
-	padding: 0;
-	text-decoration: underline;
-	background-color: transparent;
-}
-.error { font-family: monospace; }
-.error ul { font-family: monospace; }
 
 /* Debug */
 .debug {
-	color: black;
-	background-color: transparent;
-	font-family: monospace;
-	font-size: smaller;
-	margin: 1ex 0;
-	padding: 0.5ex 0.5em;
+    color: black;
+    background-color: transparent;
+    font-family: monospace;
+    font-size: smaller;
+    margin: 1ex 0;
+    padding: 0.5ex 0.5em;
 }
 
-/* Hide NS4 bugs hack elements. */
-div.br { display: none; }
-
 /*
  * table class="boxed"
  * will put a border around the table (but not around the cells)
@@ -1163,5 +1092,3 @@
  * indent-tabs-mode: nil
  * End:
  */
-
- 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
   if (!$page->get('locked') || $user->isAdmin() and $revision)
       $EditB = Button("edit",
                       $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: body.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <body<?php echo $WikiTheme->getMoreAttr('body') ?>>
 <div id="header"><?php // for top toolbars style sheet ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: bottom.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: bottom.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <!-- Add your Disclaimer here -->

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/browse.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/browse.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/browse.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <?php if ($revision and !$revision->isCurrent()) { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/editpage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/editpage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/editpage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: editpage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?php echo _("Preview only!  Changes not saved.")?></strong>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/head.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/head.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/head.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: head.tmpl 7618 2010-07-16 06:59:16Z vargenau $');
+// $Id: head.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
@@ -18,13 +18,6 @@
 <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" />
 <base href="<?php echo PHPWIKI_BASE_URL?>" />
 <link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" />
-<?php /**
-       * Additional navigation links are provided here in the html header for browsers
-       * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??).
-       *
-       * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK
-       *     http://www.euronet.nl/~tekelenb/WWW/LINK/index.html
-       */ ?>
 <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo 
@@ -110,7 +103,9 @@
       $pagetitle = " - ". AsString($TITLE);
 ?>
 <title><?php echo WIKI_NAME.$pagetitle?></title>
+<?php if (ENABLE_OPEN_GRAPH) { ?>
 <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/>
 <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/>
+<?php } ?>
 <?php echo $WikiTheme->getMoreHeaders() ?>
 </head>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/htmldump.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/htmldump.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/htmldump.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php  // -*-php-*-
-// rcs_id('$Id: htmldump.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: htmldump.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * This template is used only for html file dumps, and is responsible
  * mainly for the outer level <html> stuff and the and <head>.
@@ -11,13 +11,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
-<?php /**
-       * Additional navigation links are provided here in the html header for browsers
-       * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??).
-       *
-       * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK
-       *     http://www.euronet.nl/~tekelenb/WWW/LINK/index.html
-       */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
 <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- The top navigation/search bar -->
 <form action="<?php echo WikiURL(_("TitleSearch"))?>"
@@ -14,8 +14,8 @@
 <?php echo WikiLink(_("RecentChanges"), "button") ?>
 <?php if (!empty($revision)) { ?>
 <?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?>
-<?php echo $SEP?><?php echo Button("LikePages", _("LikePages")) ?>
-<?php echo $SEP?><?php echo Button("BackLinks", _("BackLinks")) ?>
+<?php echo $SEP?><?php echo Button(_("LikePages"), _("LikePages")) ?>
+<?php echo $SEP?><?php echo Button(_("BackLinks"), _("BackLinks")) ?>
 <?php } ?>
 </td>
 <td align="right" width="150">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/signin.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/signin.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/signin.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: signin.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: signin.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 
 if (empty($FORMNAME))
     $FORMNAME = 'signin';

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/top.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/top.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/top.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: top.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: top.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 
 global $HIDE_TOOLBARS;
 if (!$HIDE_TOOLBARS) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/wikiblog.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/templates/wikiblog.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: wikiblog.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: wikiblog.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
 $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Crao/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7690 2010-09-17 08:46:20Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /*
  * This file defines the Crao theme of PhpWiki.
@@ -17,77 +17,63 @@
 class WikiTheme_Crao extends WikiTheme {
 
     function load() {
-	// 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.
+   // 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.
 
-	// This should result in phpwiki-printer.css being used when
-	// printing or print-previewing with style "PhpWiki" selected.
-	$this->setDefaultCSS('Crao',
-				  array(''      => 'crao.css',
-					'print'	=> ''));
+   // This should result in phpwiki-printer.css being used when
+   // printing or print-previewing with style "PhpWiki" selected.
+   $this->setDefaultCSS('Crao', array(''=> 'crao.css', 'print'   => ''));
 
-	// This allows one to manually select "Printer" style (when browsing page)
-	// to see what the printer style looks like.
-	//$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css');
-	//$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
-	//$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+   /**
+    * The Signature image is shown after saving an edited page. If this
+    * is not set, any signature defined in index.php will be used. If it
+    * is not defined by index.php or in here then the "Thank you for
+    * editing..." screen will be omitted.
+    */
 
+   // Comment this next line out to enable signature.
+   $this->addImageAlias('signature', false);
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	//$this->addImageAlias('logo', 'logo.png');
+   /*
+    * Link icons.
+    */
+   $this->setLinkIcon('http');
+   $this->setLinkIcon('https');
+   $this->setLinkIcon('ftp');
+   $this->setLinkIcon('mailto');
+   $this->setLinkIcon('interwiki');
+   $this->setLinkIcon('*', 'url');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is not set, any signature defined in index.php will be used. If it
-	 * is not defined by index.php or in here then the "Thank you for
-	 * editing..." screen will be omitted.
-	 */
+   $this->setButtonSeparator(HTML::raw(" | "));
 
-	// Comment this next line out to enable signature.
-	$this->addImageAlias('signature', false);
+   /**
+    * WikiWords can automatically be split by inserting spaces between
+    * the words. The default is to leave WordsSmashedTogetherLikeSo.
+    */
+   $this->setAutosplitWikiWords(false);
 
-	/*
-	 * Link icons.
-	 */
-	$this->setLinkIcon('http');
-	$this->setLinkIcon('https');
-	$this->setLinkIcon('ftp');
-	$this->setLinkIcon('mailto');
-	$this->setLinkIcon('interwiki');
-	$this->setLinkIcon('*', 'url');
+   /*
+    * You may adjust the formats used for formatting dates and times
+    * below.  (These examples give the default formats.)
+    * Formats are given as format strings to PHP strftime() function See
+    * http://www.php.net/manual/en/function.strftime.php for details.
+    * Do not include the server's zone (%Z), times are converted to the
+    * user's time zone.
+    */
+   //$this->setDateFormat("%B %d, %Y");
+   //$this->setTimeFormat("%I:%M %p");
 
-	$this->setButtonSeparator(HTML::raw(" | "));
+   /*
+    * To suppress times in the "Last edited on" messages, give a
+    * give a second argument of false:
+    */
+   //$this->setDateFormat("%B %d, %Y", false);
+   $this->setDateFormat("%A %e %B %Y"); // must not contain time
+   //$this->setDateFormat("%x"); // must not contain time
+   $this->setTimeFormat("%H:%M:%S");
+   //$this->setTimeFormat("%X");
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	$this->setAutosplitWikiWords(false);
-
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	//$this->setDateFormat("%B %d, %Y");
-	//$this->setTimeFormat("%I:%M %p");
-
-	/*
-	 * To suppress times in the "Last edited on" messages, give a
-	 * give a second argument of false:
-	 */
-	//$this->setDateFormat("%B %d, %Y", false);
-	$this->setDateFormat("%A %e %B %Y"); // must not contain time
-	//$this->setDateFormat("%x"); // must not contain time
-	$this->setTimeFormat("%H:%M:%S");
-	//$this->setTimeFormat("%X");
-
     }
 }
 
@@ -99,5 +85,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/Hawaiian-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/Hawaiian-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/Hawaiian-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-img{border:0;vertical-align:baseline;}form{margin:0;}input{margin:.1em;}input.numeric{text-align:right;}table{border-spacing:1px;empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}body{color:black;background:white url("images/uhhbackground.jpg") repeat;font-family:Arial,Helvetica,sans-serif;margin:1ex .5em;}body p{margin-left:1em;}#logo img{border:1px outset gray;margin-left:1em;margin-bottom:1ex;}img#signature{background:white;border:1px outset gray;padding-left:8px;padding-right:8px;padding-top:8px;padding-bottom:14px;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;padding-left:.8em;padding-right:.8em;padding-top:.5ex;padding-bottom:.5ex;clear:both;}div.wikitext hr{height:1px;}div.wikitext pre{font-family:monospace;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;color:#87785c;}.wiki{text-decoration:none;}.named-wiki{text-decoration:underline;}.wikiaction,.wikiadmin,.wiki-rc-action,.backlinks{text-decoration:none;}.wikiaction,.wikiadmin{font-weight:bold;}.wikiaction,.wikiaction table,span.wikiaction{color:#4d5a6b;}.wikiadmin,.wikiadmin table{color:#ff7e00;}.backlinks{color:#1d4fc0;}h1 .backlinks{text-decoration:underline;}.wikiunknown a,.named-wikiunknown a,.wikiunknown u{color:#a6977a;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{margin:0;}caption{font-family:Arial,Helvetica,sans-serif;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;margin:5px 0;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.toolbar,input.button{font-family:Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}#navbar,#actionbar{line-height:140%;}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex;}.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}input.button{font-family:Arial,Helvetica,sans-serif;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{background:inherit;border:1px dotted #a6977a;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{border:medium solid #d8caae;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp .wiki{color:#87785c;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal table.cal-header td{padding-top:110px;}table.cal thead tr:first-child{background:url("images/pictures/SteamVolcanoDusk.jpg") no-repeat;background-position:center;font-size:larger;}table.cal table.cal-header td{text-align:center;color:white;background:transparent;border:0;}.cal-arrow{text-decoration:none;color:white;font-weight:bold;}table.cal tr .cal-dayname{background:inherit;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;color:black;padding-bottom:.5ex;}table.cal tbody td{border:.5pt solid #ddd;background:white;text-align:right;}a.cal-hide{text-decoration:none;color:black;font-weight:normal;}table.cal td.cal-today{margin:1px;background:white;border:.5pt solid black;}table.cal td.cal-today a{color:blue;}table.cal td.cal-day{margin:1px;background:white;border:.5pt solid black;}table.cal td.cal-day a{color:red;text-decoration:none;}.diff .block{background:#ccc;padding:.5ex .5em;margin:.5ex 0;}.diff .context{background:white;}.diff .block tt{font-weight:bold;font-family:monospace;margin-left:-.6em;color:black;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted{background:#fcc;}.diff .final,.diff .added{background:#cfc;}.diff del{background:#f99;}.diff ins{background:#9f9;}.printer{display:none;}div.errors{color:black;border:medium solid #d8caae;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;font-size:smaller;clear:both;}.errors h4{color:#87785c;margin:0;padding:0;text-decoration:none;font-weight:bold;}.error{font-family:monospace;}.error ul{font-family:monospace;}.debug{color:black;font-family:monospace;margin:1ex 0;padding:.5ex .5em;border:medium solid #d8caae;}.clear-floats{clear:both;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.toolbar,div.toolbar{margin:.5ex 0;}img.linkicon{vertical-align:middle;}div.wikitext{width:auto;background:url("images/tchecker-white.png") repeat;}.wiki-edithelp{background:url("images/tchecker-sand.png") repeat;}.wiki-edithelp p{background:url("images/tchecker-white.png") repeat;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:.5em;top:0;}div.errors{background:url("images/tchecker-sand.png") repeat;}.debug{background:url("images/tchecker-sand.png") repeat;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file
+img{border:0;vertical-align:baseline;}form{margin:0;}input{margin:.1em;}input.numeric{text-align:right;}table{border-spacing:1px;empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}body{color:black;background-color:white;background-image:url("images/uhhbackground.jpg");background-repeat:repeat;font-family:Arial,Helvetica,sans-serif;margin:1ex .5em;}body p{margin-left:1em;}#logo img{border:1px outset gray;margin-left:1em;margin-bottom:1ex;}img#signature{background-color:white;border:1px outset gray;padding-left:8px;padding-right:8px;padding-top:8px;padding-bottom:14px;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;padding-left:.8em;padding-right:.8em;padding-top:.5ex;padding-bottom:.5ex;clear:both;}div.wikitext hr{height:1px;}div.wikitext pre{font-family:monospace;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;color:#87785c;}.wiki{text-decoration:none;}.named-wiki{text-decoration:underline;}.wikiaction,.wikiadmin,.wiki-rc-action,.backlinks{text-decoration:none;}.wikiaction,.wikiadmin{font-weight:bold;}.wikiaction,.wikiaction table,span.wikiaction{color:#4d5a6b;}.wikiadmin,.wikiadmin table{color:#ff7e00;}.backlinks{color:#1d4fc0;}h1 .backlinks{text-decoration:underline;}.wikiunknown a,.named-wikiunknown a,.wikiunknown u{color:#a6977a;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{margin:0;}caption{font-family:Arial,Helvetica,sans-serif;}.pagelist tr.evenrow{background-color:#eee;}.pagelist tr.oddrow{background-color:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;margin:5px 0;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.toolbar,input.button{font-family:Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}#navbar,#actionbar{line-height:140%;}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex;}.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}input.button{font-family:Arial,Helvetica,sans-serif;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{background:inherit;border:1px dotted #a6977a;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{border:medium solid #d8caae;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp .wiki{color:#87785c;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal table.cal-header td{padding-top:110px;}table.cal thead tr:first-child{background-image:url("images/pictures/SteamVolcanoDusk.jpg");background-repeat:no-repeat;background-position:center;font-size:larger;}table.cal table.cal-header td{text-align:center;color:white;background-color:transparent;border:0;}.cal-arrow{text-decoration:none;color:white;font-weight:bold;}table.cal tr .cal-dayname{background:inherit;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;color:black;padding-bottom:.5ex;}table.cal tbody td{border:.5pt solid #ddd;background-color:white;text-align:right;}a.cal-hide{text-decoration:none;color:black;font-weight:normal;}table.cal td.cal-today{margin:1px;background-color:white;border:.5pt solid black;}table.cal td.cal-today a{color:blue;}table.cal td.cal-day{margin:1px;background-color:white;border:.5pt solid black;}table.cal td.cal-day a{color:red;text-decoration:none;}.diff .block{background-color:#ccc;padding:.5ex .5em;margin:.5ex 0;}.diff .context{background-color:white;}.diff .block tt{font-weight:bold;font-family:monospace;margin-left:-.6em;color:black;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted{background-color:#fcc;}.diff .final,.diff .added{background-color:#cfc;}.diff del{background-color:#f99;}.diff ins{background-color:#9f9;}.printer{display:none;}div.error{color:black;border:medium solid #d8caae;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;font-size:smaller;clear:both;}.debug{color:black;font-family:monospace;margin:1ex 0;padding:.5ex .5em;border:medium solid #d8caae;}.clear-floats{clear:both;}.search-context{background-color:white;font-style:oblique;}.search-term{background-color:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.toolbar,div.toolbar{margin:.5ex 0;}img.linkicon{vertical-align:middle;}div.wikitext{width:auto;background-image:url("images/tchecker-white.png");background-repeat:repeat;}.wiki-edithelp{background-image:url("images/tchecker-sand.png");background-repeat:repeat;}.wiki-edithelp p{background-image:url("images/tchecker-white.png");background-repeat:repeat;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:.5em;top:0;}.debug{background-image:url("images/tchecker-sand.png");background-repeat:repeat;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/Hawaiian.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,8 +1,8 @@
 /**
- * $Id: Hawaiian.css 7331 2010-04-15 09:04:51Z vargenau $
+ * $Id: Hawaiian.css 7983 2011-03-10 11:03:10Z vargenau $
  *
  * This incarnation of this stylesheet is a complete rewrite from the
- * ground up. It has not yet been tested against NS4.
+ * ground up.
  *
  * Mozilla's "DOM Inspector" Sidebar was an invaluable troubleshooting
  * tool for mapping the more complex CSS node selectors, such as those
@@ -29,8 +29,7 @@
   caption-side: top;
   text-align: left;
   margin-bottom: .5ex;
-  /* Allow the caption to extend to the full page width
-     Mac ie5.1 ignores this*/
+  /* Allow the caption to extend to the full page width */
   width: 100%;
 }
 
@@ -42,7 +41,9 @@
 /* Main wiki text box */
 body {
   color: black;
-  background: white url("images/uhhbackground.jpg") repeat;
+  background-color: white;
+  background-image: url("images/uhhbackground.jpg");
+  background-repeat: repeat;
   font-family: Arial, Helvetica, sans-serif;
   margin: 1ex 0.5em;
 }
@@ -56,7 +57,7 @@
   margin-bottom: 1ex;
 }
 img#signature {
-  background: white;
+  background-color: white;
   border: 1px outset gray;
   padding-left:  8px; 
   padding-right: 8px;
@@ -70,12 +71,7 @@
   padding-right: 0.8em;
   padding-top:    0.5ex;
   padding-bottom: 0.5ex;
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
   clear: both;
-  /* user's browser settings *
-  font-family: none; */
 }
 div.wikitext hr { height: 1px; }
 
@@ -147,8 +143,8 @@
 }
 .pagelist thead, .pagelist thead u {
 }
-.pagelist tr.evenrow { background: #eee; }
-.pagelist tr.oddrow  { background: white; }
+.pagelist tr.evenrow { background-color: #eee; }
+.pagelist tr.oddrow  { background-color: white; }
 th.gridbutton {
   background-color: ThreeDLightShadow;
   color: black;
@@ -211,7 +207,8 @@
   font-size: smaller;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   text-align: right;
   font-style: oblique;
@@ -275,7 +272,8 @@
   padding-top: 110px;
 }
 table.cal thead tr:first-child {
-  background: url("images/pictures/SteamVolcanoDusk.jpg") no-repeat;
+  background-image: url("images/pictures/SteamVolcanoDusk.jpg");
+  background-repeat: no-repeat;
   background-position: center;
   font-size: larger;
 }
@@ -283,7 +281,7 @@
 table.cal table.cal-header td {
   text-align: center;
   color: white;
-  background: transparent;
+  background-color: transparent;
   border: 0;
 }
  /* arrow text */
@@ -309,7 +307,7 @@
  /* cells */
 table.cal tbody td {
   border: 0.5pt solid #ddd;
-  background: white;
+  background-color: white;
   text-align: right;
 } 
  /* text */
@@ -322,7 +320,7 @@
   /* cell */
 table.cal td.cal-today {
   margin: 1px;
-  background: white;
+  background-color: white;
   border: 0.5pt solid black;
 }
   /* text */
@@ -333,7 +331,7 @@
   /* cell */
 table.cal td.cal-day {
   margin: 1px;
-  background: white;
+  background-color: white;
   border: 0.5pt solid black;
 }
   /* text */
@@ -349,14 +347,13 @@
 
 /* main box */
 .diff .block {
-  background: #ccc;
-  /*border: 1px solid black;*/
+  background-color: #ccc;
   padding: 0.5ex 0.5em;
   margin:  0.5ex 0;
 }
 
 /* individual lines */
-.diff .context { background: white; }
+.diff .context { background-color: white; }
 
 /* + - line prefix */
 .diff .block tt{
@@ -370,21 +367,18 @@
   font-weight: bold;
   text-decoration: none;
 }
-.diff .original, .diff .deleted { background: #fcc; }
-.diff .final, .diff .added { background: #cfc; }
+.diff .original, .diff .deleted { background-color: #fcc; }
+.diff .final, .diff .added { background-color: #cfc; }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
-.diff del { background: #f99; }
-.diff ins { background: #9f9; }
+.diff del { background-color: #f99; }
+.diff ins { background-color: #9f9; }
 
-
 /**
  * Other
  */
 .printer { display: none; }
 
-/* PHP Warnings */
-div.errors {
+div.error {
   color: black;
   border: medium solid #d8caae;
   margin-top:    1em;
@@ -396,15 +390,6 @@
   font-size: smaller;
   clear: both;
 }
-.errors h4 {
-  color: #87785c;
-  margin:  0;
-  padding: 0;
-  text-decoration: none;
-  font-weight: bold;
-}
-.error { font-family: monospace; }
-.error ul { font-family: monospace; }
 
 /* Debug */
 .debug {
@@ -422,9 +407,9 @@
 /**
  * Search Results
  */
-.search-context { background: white; font-style: oblique; }
+.search-context { background-color: white; font-style: oblique; }
 .search-term {
-  background: yellow;
+  background-color: yellow;
   font-weight: normal;
 }
 #LSResult {
@@ -463,46 +448,37 @@
   list-style-image: none;
 }
 
-/* This makes spacings in NS4 too big. */
 .toolbar, div.toolbar { margin: 0.5ex 0ex; }
 
 /* Link icons */
 img.linkicon { vertical-align: middle; }
 
-
-/* This break NS4 (display does not go full width), but is necessary for IE4. */
 div.wikitext {
   width: auto;
-  /* NS4 doesn't know about png with transparency so it renders the whole image solid black */
-  background: url("images/tchecker-white.png") repeat;
+  background-image: url("images/tchecker-white.png");
+  background-repeat: repeat;
 }
 .wiki-edithelp {
-  /* NS4 doesn't know about png with transparency so it renders the whole image solid black */
-  background: url("images/tchecker-sand.png") repeat;
+  background-image: url("images/tchecker-sand.png");
+  background-repeat: repeat;
 }
 .wiki-edithelp p {
-  /* NS4 doesn't know about png with transparency so it renders the whole image solid black */
-  background: url("images/tchecker-white.png") repeat;
+  background-image: url("images/tchecker-white.png");
+  background-repeat: repeat;
 }
 
-
 /**
  * Diff Output
  */
 .diff .block div { position: relative; padding-left: 1.5em; } 
 .diff .prefix    { position: absolute; left: 0.5em; top: 0; }
 
-
 /**
  * Other
  */
-div.errors {
-  /* NS4 doesn't know about png with transparency so it renders the whole image solid black */
-  background: url("images/tchecker-sand.png") repeat;
-}
 .debug {
-  /* NS4 doesn't know about png with transparency so it renders the whole image solid black */
-  background: url("images/tchecker-sand.png") repeat;
+  background-image: url("images/tchecker-sand.png");
+  background-repeat: repeat;
 }
 
 /*

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/lib/random.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/lib/random.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/lib/random.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: random.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: random.php 7956 2011-03-03 17:08:31Z vargenau $
 /**
  */
 class randomImage {

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Hawaiian/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /**
  * WikiWiki Hawaiian theme for PhpWiki.
@@ -26,66 +26,66 @@
     }
 
     function load() {
-	// 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.
+   // 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.
 
-	$this->setDefaultCSS('Hawaiian', 'Hawaiian.css');
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
-	$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
+   $this->setDefaultCSS('Hawaiian', 'Hawaiian.css');
+   $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+   $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+   $this->addAlternateCSS('PhpWiki', 'phpwiki.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	$this->addImageAlias('logo', 'PalmBeach.jpg');
-	$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+   /**
+    * The logo image appears on every page and links to the HomePage.
+    */
+   $this->addImageAlias('logo', 'PalmBeach.jpg');
+   $this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is set to false then the "Thank you for editing..." screen will
-	 * be omitted.
-	 */
-	//$this->addImageAlias('signature', 'SubmersiblePiscesV.jpg');
-	$this->addImageAlias('signature', 'WaterFall.jpg');
-	$this->addImageAlias('signature', WIKI_NAME . "Signature.png");
-	// Uncomment this next line to disable the signature.
-	//$this->addImageAlias('signature', false);
+   /**
+    * The Signature image is shown after saving an edited page. If this
+    * is set to false then the "Thank you for editing..." screen will
+    * be omitted.
+    */
+   //$this->addImageAlias('signature', 'SubmersiblePiscesV.jpg');
+   $this->addImageAlias('signature', 'WaterFall.jpg');
+   $this->addImageAlias('signature', WIKI_NAME . "Signature.png");
+   // Uncomment this next line to disable the signature.
+   //$this->addImageAlias('signature', false);
 
-	// If you want to see more than just the waterfall let a random
-	// picture be chosen for the signature image:
-	//include_once($this->file('lib/random.php'));
-	include_once("themes/$this->_name/lib/random.php");
-	$imgSet = new randomImage($this->file("images/pictures"));
-	$imgFile = "pictures/" . $imgSet->filename;
-	$this->addImageAlias('signature', $imgFile);
+   // If you want to see more than just the waterfall let a random
+   // picture be chosen for the signature image:
+   //include_once($this->file('lib/random.php'));
+   include_once("themes/$this->_name/lib/random.php");
+   $imgSet = new randomImage($this->file("images/pictures"));
+   $imgFile = "pictures/" . $imgSet->filename;
+   $this->addImageAlias('signature', $imgFile);
 
-	//To test out the randomization just use logo instead of signature
-	//$this->addImageAlias('logo', $imgFile);
+   //To test out the randomization just use logo instead of signature
+   //$this->addImageAlias('logo', $imgFile);
 
-	/*
-	 * Link Icons
-	 */
-	$this->setLinkIcon('interwiki');
-	$this->setLinkIcon('*', 'flower.png');
+   /*
+    * Link Icons
+    */
+   $this->setLinkIcon('interwiki');
+   $this->setLinkIcon('*', 'flower.png');
 
-	$this->setButtonSeparator(' ');
+   $this->setButtonSeparator(' ');
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	$this->setAutosplitWikiWords(true);
+   /**
+    * WikiWords can automatically be split by inserting spaces between
+    * the words. The default is to leave WordsSmashedTogetherLikeSo.
+    */
+   $this->setAutosplitWikiWords(true);
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	//$this->setDateFormat("%B %d, %Y");	    // must not contain time
+   /*
+    * You may adjust the formats used for formatting dates and times
+    * below.  (These examples give the default formats.)
+    * Formats are given as format strings to PHP strftime() function See
+    * http://www.php.net/manual/en/function.strftime.php for details.
+    * Do not include the server's zone (%Z), times are converted to the
+    * user's time zone.
+    */
+   //$this->setDateFormat("%B %d, %Y");       // must not contain time
 
     }
 }
@@ -98,5 +98,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-body{background:#fafafa url("images/bgpaper8.png");}body.edit{background:#fafafa url("images/bggranular.png");}input[type=submit],input[type=cancel],input[type=image]{vertical-align:middle;}h1,h2,h3,.toolbar,td{font-family:"Lucida Grande",Helvetica,Arial,sans-serif;}input.button{font-family:"Lucida Grande",Helvetica,Arial,sans-serif;}input.numeric{text-align:right;}.wikitext pre{font-family:Monaco,monospace;}input[type=text]{border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div.wikitext{background:white;border:1px solid black;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:.5em;padding-bottom:.5em;margin:.5ex 0;clear:both;}input.wikitext{margin:0;}input[type=text]{height:2.7ex;padding:.4ex .3ex;}div.toolbar{margin:1ex 0;}.interwiki-map thead td{background:#e8e8e8;font-weight:bold;font-size:smaller;}.interwiki-map thead td:first-child{text-decoration:underline;}.interwiki-moniker{background:#eee;}.interwiki-url{background:#f8f8f8;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}div.errors{background:#eee;border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;margin-top:1em;clear:both;font-size:smaller;}.errors h4{color:black;text-decoration:underline;font-family:"Lucida Grande",Helvetica,Arial,sans-serif;margin-top:0;margin-bottom:.5ex;}.error{font-family:Monaco,monospace;margin:0;font-size:smaller;}.error ul{font-size:smaller;font-family:Monaco,monospace;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:1px solid #eee;}a.wiki{text-decoration:none;}.wiki,.named-wiki{font-weight:bold;color:#1d42be;}.wikiunknown a,.named-wikiunknown a,.wikiunknown U{text-decoration:none;}.wikiunknown,.named-wikiunknown{color:#555;}a.interwiki{text-decoration:none;}.wikipage{font-weight:bold;}.interwiki,i .interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}a.wikiaction,a.wikiadmin{text-decoration:none;}img.linkicon,img.rssicon{border:0;}img.rssicon{vertical-align:middle;}img.wiki-button{vertical-align:middle;}a.wikiaction{border:0;}a.backlinks{color:#006;}textarea.wikiedit{width:100%;margin-top:1ex;}p.editdate{font-size:smaller;margin-bottom:0;font-family:"Lucida Grande",Helvetica,Arial,sans-serif;}a.cal-hide,a.cal-arrow{text-decoration:none;}.cal-arrow{font-weight:bold;}.cal-dayname{font-size:smaller;text-decoration:none;}table.cal td{background:white;border:1px solid black;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;}table.cal-header td{font-size:larger;background:white;border:0;}table.cal td.cal-dayname{background:#e8e8e8;}table.cal td.cal-today{background:#f4f4f4;border:1px solid black;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;}.transclusion-title{font-family:"Lucida Grande",Helvetica,Arial,sans-serif;font-size:smaller;text-decoration:underline;text-align:right;}div.transclusion{background:#fdfdfd;border:1px solid black;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin:.5ex;}div.wiki-edithelp .transclusion{font-size:smaller;background:inherit;padding:.5ex .5em;margin:.2ex 5%;}div.wiki-edithelp .transclusion p{margin:0;}div.wiki-edithelp{background:white;border:1px solid black;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;font-size:smaller;padding:6pt;}div.wiki-message{background:#fff url("images/bggranular.png");border:solid 1px #d8d8d8;padding:6pt;}.printer{display:none;}.diff{background:white;border:1px solid black;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;}.diff .block{background:#d8d8d8;}.diff .context{background:white;border:none;}.diff .block tt.prefix{font-weight:normal;font-family:monospace;margin-left:-1.6em;color:black;border:none;}.diff ins{font-weight:bolder;}.diff ins{text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original:first-child,.diff .deleted:first-child{border-top:2px solid #f99;}.diff .original,.diff .deleted{background:white;border-left:2px solid #f99;border-right:2px solid #f99;}.diff .original:last-child,.diff .deleted:last-child{border-bottom:2px solid #f99;}.diff .final:first-child,.diff .added:first-child{border-top:2px solid #9f9;}.diff .final,.diff .added{background:white;border-left:2px solid #9f9;border-right:2px solid #9f9;}.diff .final:last-child,.diff .added:last-child{border-bottom:2px solid #9f9;}.diff del{background:#fcc;}.diff ins{background:#cfc;}.pagelist{font-size:smaller;}.pagelist tr.evenrow{background:#f8f8f8;}.pagelist tr.oddrow{background:#eee;}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tbody tr:hover>td{border:solid #ff9 2px;}.pagelist tbody tr>td{border:solid transparent 2px;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;height:18px;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;margin:5px 0;float:none;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}#searchholder{display:inline;}.search-context{background:white;font-style:oblique;}.search-term{background:#9bdaff;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.clear-floats{clear:both;}dl{display:table;}dt{display:table;font-weight:bold;vertical-align:baseline;margin-top:1.25ex;margin-bottom:.25ex;padding-left:.25ex;padding-right:.25ex;border-bottom-style:dotted;border-bottom-width:2pt;border-bottom-color:#99c;}dt a.wiki,dt a.named-wiki{text-decoration:none;}dl>dt:first-child{margin-top:0;}dd{position:relative;margin-left:3.5em;margin-bottom:.5ex;padding-left:.125em;padding-bottom:.5ex;padding-right:.125em;border-bottom-style:solid;border-bottom-width:thin;border-bottom-color:#99c;}pre,div.plugin code{color:black;display:block;background-color:#fcfcfc;font-size:90%;line-height:1.25em;margin-top:.25em;margin-left:0;margin-bottom:2ex;margin-right:0;padding-top:.25em;padding-left:.5em;padding-bottom:.25em;padding-right:.5em;border-style:solid;border-width:1px;border-color:#ccc;}pre{background:#fafafa url("images/bgpaper8.png");}ul li.rc-major,ul li.rc-minor{margin-left:0;padding-left:3em;text-indent:-3em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.printer,.no-css{display:none;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid silver;}.box-title{font-family:Tahoma,sans-serif;font-weight:normal;background-color:#ccc;color:black;text-align:center;border:none;padding:2px 0 2px 0;}.box-data{width:160px;font-size:9pt;font-weight:normal;border:none;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}.wikiwyg_toolbar{background:#D3D3D3;border:1px outset;letter-spacing:0;padding:2px;}span.wikiwyg_control_link a{padding-right:8px;}.wikiwyg_button{background:#D3D3D3;border:1px solid #D3D3D3;cursor:pointer;width:20px;height:20px;vertical-align:bottom;}.wikiwyg_button:hover{border:1px outset;}.wikiwyg_button:active{border:1px inset;}.wikiwyg_separator{background:#D3D3D3;border:1px solid #D3D3D3;width:9px;height:20px;vertical-align:bottom;}.wikiwyg_selector{width:70px;}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em;}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top;}textarea.wikiedit,input.wikitext,textarea.summary{background:white;border:1px solid black;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:.5em;padding-bottom:.5em;margin:.5ex 0;clear:both;}.toolbar,div.toolbar{margin:.5ex 0;}div.wikitext{width:auto;}img.linkicon{vertical-align:middle;}.interwiki-map thead td,.interwiki-moniker,.interwiki-url{padding-left:1em;padding-right:1em;}.diff{margin:.5ex 0;padding:1px;}.diff .block{padding:.5ex .5em;}.diff .original,.diff .deleted,.diff .final,.diff .added{padding:1px;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:0;top:0;}.diff del,.diff ins{padding-left:.5ex;padding-right:.5ex;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file
+body{background:#fafafa url("images/bgpaper8.png");}body.edit{background:#fafafa url("images/bggranular.png");}input[type=submit],input[type=cancel],input[type=image]{vertical-align:middle;}h1,h2,h3,.toolbar,td{font-family:"Lucida Grande",Helvetica,Arial,sans-serif;}input.button{font-family:"Lucida Grande",Helvetica,Arial,sans-serif;}input.numeric{text-align:right;}.wikitext pre{font-family:Monaco,monospace;}input[type=text]{border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div.wikitext{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:.5em;padding-bottom:.5em;margin:.5ex 0;clear:both;}input.wikitext{margin:0;}input[type=text]{height:2.7ex;padding:.4ex .3ex;}div.toolbar{margin:1ex 0;}.interwiki-map thead td{background:#e8e8e8;font-weight:bold;font-size:smaller;}.interwiki-map thead td:first-child{text-decoration:underline;}.interwiki-moniker{background:#eee;}.interwiki-url{background:#f8f8f8;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}div.error{background:#eee;border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;margin-top:1em;clear:both;font-size:smaller;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:1px solid #eee;}a.wiki{text-decoration:none;}.wiki,.named-wiki{font-weight:bold;color:#1d42be;}.wikiunknown a,.named-wikiunknown a,.wikiunknown U{text-decoration:none;}.wikiunknown,.named-wikiunknown{color:#555;}a.interwiki{text-decoration:none;}.wikipage{font-weight:bold;}.interwiki,i .interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}a.wikiaction,a.wikiadmin{text-decoration:none;}img{border:0;}img.rssicon{vertical-align:middle;}img.wiki-button{vertical-align:middle;}.wiki-button{border:0;}a.wikiaction{border:0;}a.backlinks{color:#006;}textarea.wikiedit{width:100%;margin-top:1ex;}p.editdate{font-size:smaller;margin-bottom:0;font-family:"Lucida Grande",Helvetica,Arial,sans-serif;}a.cal-hide,a.cal-arrow{text-decoration:none;}.cal-arrow{font-weight:bold;}.cal-dayname{font-size:smaller;text-decoration:none;}table.cal td{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;}table.cal-header td{font-size:larger;background:white;border:0;}table.cal td.cal-dayname{background:#e8e8e8;}table.cal td.cal-today{background:#f4f4f4;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;}.transclusion-title{font-family:"Lucida Grande",Helvetica,Arial,sans-serif;font-size:smaller;text-decoration:underline;text-align:right;font-style:oblique;margin-bottom:.25ex;margin-right:.25em;}.transclusion{background:#fdfdfd;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin:.5ex;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;font-size:smaller;}.wiki-edithelp .transclusion{font-size:smaller;background:inherit;padding:.5ex .5em;margin:.2ex 5%;}.wiki-edithelp .transclusion p{margin:0;}.wiki-edithelp{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;font-size:smaller;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}div.wiki-message{background:#fff url("images/bggranular.png");border:solid 1px #d8d8d8;padding:6pt;}.printer{display:none;}.diff{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;}.diff .block{background:#d8d8d8;}.diff .context{background:white;border:none;}.diff .block tt.prefix{font-weight:normal;font-family:monospace;margin-left:-1.6em;color:black;border:none;}.diff ins{font-weight:bolder;}.diff ins{text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original:first-child,.diff .deleted:first-child{border-top:2px solid #f99;}.diff .original,.diff .deleted{background:white;border-left:2px solid #f99;border-right:2px solid #f99;}.diff .original:last-child,.diff .deleted:last-child{border-bottom:2px solid #f99;}.diff .final:first-child,.diff .added:first-child{border-top:2px solid #9f9;}.diff .final,.diff .added{background:white;border-left:2px solid #9f9;border-right:2px solid #9f9;}.diff .final:last-child,.diff .added:last-child{border-bottom:2px solid #9f9;}.diff del{background:#fcc;}.diff ins{background:#cfc;}.pagelist{font-size:smaller;}.pagelist tr.evenrow{background:#f8f8f8;}.pagelist tr.oddrow{background:#eee;}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tbody tr:hover>td{border:solid #ff9 2px;}.pagelist tbody tr>td{border:solid transparent 2px;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;height:18px;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;margin:5px 0;float:none;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}#searchholder{display:inline;}.search-context{background:white;font-style:oblique;}.search-term{background:#9bdaff;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.clear-floats{clear:both;}dl{display:table;}dt{display:table;font-weight:bold;vertical-align:baseline;margin-top:1.25ex;margin-bottom:.25ex;padding-left:.25ex;padding-right:.25ex;border-bottom-style:dotted;border-bottom-width:2pt;border-bottom-color:#99c;}dt a.wiki,dt a.named-wiki{text-decoration:none;}dl>dt:first-child{margin-top:0;}dd{position:relative;margin-left:3.5em;margin-bottom:.5ex;padding-left:.125em;padding-bottom:.5ex;padding-right:.125em;border-bottom-style:solid;border-bottom-width:thin;border-bottom-color:#99c;}pre,div.plugin code{color:black;display:block;background-color:#fcfcfc;font-size:90%;line-height:1.25em;margin-top:.25em;margin-left:0;margin-bottom:2ex;margin-right:0;padding-top:.25em;padding-left:.5em;padding-bottom:.25em;padding-right:.5em;border-style:solid;border-width:1px;border-color:#ccc;}pre{background:#fafafa url("images/bgpaper8.png");}ul li.rc-major,ul li.rc-minor{margin-left:0;padding-left:3em;text-indent:-3em;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.printer,.no-css{display:none;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid silver;}.box-title{font-family:Tahoma,sans-serif;font-weight:normal;background-color:#ccc;color:black;text-align:center;border:none;padding:2px 0 2px 0;}.box-data{width:160px;font-size:9pt;font-weight:normal;border:none;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}.wikiwyg_toolbar{background:#D3D3D3;border:1px outset;letter-spacing:0;padding:2px;}span.wikiwyg_control_link a{padding-right:8px;}.wikiwyg_button{background:#D3D3D3;border:1px solid #D3D3D3;cursor:pointer;width:20px;height:20px;vertical-align:bottom;}.wikiwyg_button:hover{border:1px outset;}.wikiwyg_button:active{border:1px inset;}.wikiwyg_separator{background:#D3D3D3;border:1px solid #D3D3D3;width:9px;height:20px;vertical-align:bottom;}.wikiwyg_selector{width:70px;}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em;}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top;}textarea.wikiedit,input.wikitext,textarea.summary{background:white;border-top:1px solid #7c7c7c;border-left:1px solid #c3c3c3;border-bottom:1px solid #ddd;border-right:1px solid #c3c3c3;padding-left:.8em;padding-right:.8em;padding-top:.5em;padding-bottom:.5em;margin:.5ex 0;clear:both;}.toolbar,div.toolbar{margin:.5ex 0;}img.linkicon{vertical-align:middle;}.interwiki-map thead td,.interwiki-moniker,.interwiki-url{padding-left:1em;padding-right:1em;}.diff{margin:.5ex 0;padding:1px;}.diff .block{padding:.5ex .5em;}.diff .original,.diff .deleted,.diff .final,.diff .added{padding:1px;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:0;top:0;}.diff del,.diff ins{padding-left:.5ex;padding-right:.5ex;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-topbottombars-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-topbottombars-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-topbottombars-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
- at import url("MacOSX.css");body{padding-top:16ex;padding-bottom:9ex;}div#header,div#footer{background:white url("images/bgpaper8.png");margin:0;padding:0;position:fixed;left:0;right:0;padding-top:.5ex;padding-bottom:.5ex;padding-left:1em;padding-right:1em;}hr.toolbar{display:none;}div#header{top:0;border-bottom:1px solid #b2b2b2;}div#navbuttons{padding-bottom:.25ex;}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0;}div#actionbuttons{padding-bottom:1ex;padding-top:.25ex;}p.editdate{margin-top:.75ex;margin-bottom:.5ex;}
\ No newline at end of file
+ at import url("MacOSX.css");body{padding-top:16ex;padding-bottom:9ex;}div#header,div#footer{background:white url("images/bgpaper8.png");margin:0;padding:0;position:fixed;left:0;right:0;padding-top:.5ex;padding-bottom:.5ex;padding-left:1em;padding-right:1em;}hr.toolbar{display:none;}div#header{top:0;border-bottom:1px solid #b2b2b2;}div#navbuttons{padding-bottom:.25ex;}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0;}p.editdate{margin-top:.75ex;margin-bottom:.5ex;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-topbottombars.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-topbottombars.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX-topbottombars.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: MacOSX-topbottombars.css 7002 2009-07-06 19:52:11Z vargenau $
+ * $Id: MacOSX-topbottombars.css 7833 2011-01-13 15:06:45Z vargenau $
  */
 @import url("MacOSX.css");
 
@@ -46,7 +46,6 @@
   padding-bottom: 0.25ex;
 }
 
-
 /**
  * Actionbar
  */
@@ -56,11 +55,6 @@
   bottom: -1ex;
   padding-bottom: 0ex;
 }
-div#actionbuttons {
-  /* For IE5.1Mac, workaround the Mozilla kludge */
-  padding-bottom: 1ex;
-  padding-top:    0.25ex;
-}
 p.editdate {
   margin-top: 0.75ex;
   margin-bottom: 0.5ex;

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/MacOSX.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /*
- $Id: MacOSX.css 7331 2010-04-15 09:04:51Z vargenau $
+ $Id: MacOSX.css 7851 2011-01-21 13:17:59Z vargenau $
 
  Classes:
 
@@ -36,10 +36,6 @@
 input[type=cancel],
 input[type=image] { vertical-align: middle }
 
-/*
- * NS4, defaults from body don't always propagate correctly.
- * So we need this:
- */
 h1, h2, h3, .toolbar, td { font-family: "Lucida Grande", Helvetica, Arial, sans-serif; }
 
 input.button { font-family: "Lucida Grande", Helvetica, Arial, sans-serif; }
@@ -49,9 +45,6 @@
 }
 .wikitext pre { font-family: Monaco, monospace; }
 
-
-
-
 input[type=text] {
   border-top:    1px solid #7c7c7c;
   border-left:   1px solid #c3c3c3;
@@ -66,16 +59,11 @@
   margin-right: 0.5em;
 }
 
-
-
 /**
  * Wiki
  */
 div.wikitext {
   background: white;
-  /* for NS4 */
-  border: 1px solid black;
-
   border-top:    1px solid #7c7c7c;
   border-left:   1px solid #c3c3c3;
   border-bottom: 1px solid #dddddd;
@@ -85,10 +73,7 @@
   padding-top: 0.5em;
   padding-bottom: 0.5em;
   margin: 0.5ex 0px;
-  /* This breaks Netscape 4: (display does not go full width).
-  width: auto;
-  */
-clear: both;
+  clear: both;
 }
 
 input.wikitext { margin:0px; }
@@ -99,7 +84,6 @@
 
 div.toolbar { margin: 1ex 0ex; }
 
-
 /**
  * PageTypes
  */
@@ -112,7 +96,6 @@
 .interwiki-moniker { background: #eee; }
 .interwiki-url { background: #f8f8f8; }
 
-
 /* Mozilla RecentChanges Sidebar */
 body.sidebar {
   font-size: smaller;
@@ -124,8 +107,7 @@
 body.sidebar div.wikitext ul { padding-left: 1em; }
 body.sidebar h2 { margin-top: 0; }
 
-
-div.errors {
+div.error {
   background: #eee;
   border: 1px solid gray;
   padding-left: 0.8em;
@@ -137,23 +119,6 @@
   font-size: smaller;
 }
 
-.errors h4 {
-  color: black;
-  text-decoration: underline;
-  font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
-  margin-top: 0;
-  margin-bottom: 0.5ex;
-}
-
-.error {
-  font-family: Monaco, monospace;
-  margin: 0;
-  font-size: smaller;
-}
-.error ul {
-  font-size: smaller;
-  font-family: Monaco, monospace;
-}
 /* Debug */
 .debug {
   color: black;
@@ -165,22 +130,12 @@
   border: 1px solid #eee;
 }
 
-
 /*
- * Style for <hr>s in wiki markup.
- */
-.wikitext hr {}
-
-
-/*
  * Link styles
  */
 /* Wiki Links */
 a.wiki { text-decoration: none; }
 .wiki, .named-wiki { font-weight: bold; color:#1d42be; } /*blue*/
-/* This is obscene in NS4
-  b .wiki, STRONG .wiki { font-size: larger; }
- */
 
 /* Unknown links */
 .wikiunknown a, .named-wikiunknown a, .wikiunknown U { text-decoration: none; }
@@ -202,15 +157,10 @@
  */
 a.wikiaction, a.wikiadmin { text-decoration: none; }
 
-/*
- * No border on external link icons.
- */
-img.linkicon, img.rssicon { border: 0px; }
+img { border: 0; }
 img.rssicon { vertical-align: middle; }
-/* This screws up NS4, moved to phpwiki-heavy.css
-img.linkicon { vertical-align: middle; }
-*/
 img.wiki-button { vertical-align: middle; }
+.wiki-button { border:0; }
 
 a.wikiaction { border: 0; }
 
@@ -230,21 +180,8 @@
   font-size: smaller;
   text-decoration: none;
 }
-table.cal {
-  /* for NS4 */
-  /*border: 1px solid black;
-
-  border-top:    1px solid #7c7c7c;
-  border-left:   1px solid #c3c3c3;
-  border-bottom: 1px solid #dddddd;
-  border-right:  1px solid #c3c3c3;
-  background: #bebebe;*/
-}
 table.cal td {
   background: white;
-  /* for NS4 */
-  border: 1px solid black;
-
   border-top:    1px solid #7c7c7c;
   border-left:   1px solid #c3c3c3;
   border-bottom: 1px solid #dddddd;
@@ -258,82 +195,87 @@
 table.cal td.cal-dayname { background: #e8e8e8; }
 table.cal td.cal-today {
   background:    #f4f4f4;
-  /* for NS4 */
-  border: 1px solid black;
-
   border-top:    1px solid #7c7c7c;
   border-left:   1px solid #c3c3c3;
   border-bottom: 1px solid #dddddd;
   border-right:  1px solid #c3c3c3;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
-  /* font-style: oblique; */
-  font-size: smaller; /* 0.75em; */
+  font-size: smaller;
   text-decoration: underline;
   text-align: right;
+  font-style: oblique;
+  margin-bottom: 0.25ex;
+  margin-right:  0.25em;
 }
 
-div.transclusion {
-  /* background: #fff url("images/bgpaper8.png"); */
-  /* background: white; */
+.transclusion {
   background: #fdfdfd;
-  /* for NS4 */
-  border: 1px solid black;
-
   border-top:    1px solid #7c7c7c;
   border-left:   1px solid #c3c3c3;
   border-bottom: 1px solid #dddddd;
   border-right:  1px solid #c3c3c3;
-
   padding-left:  0.8em;
   padding-right: 0.8em;
   padding-top:    0px;
   padding-bottom: 0px;
   margin: 0.5ex ;
+  margin-left:   0.25em;
+  margin-right:  0.25em;
+  margin-bottom: 0.1ex;
+  font-size: smaller;
 }
 
 /* The transclusion of the TextEditingRules Synopsis on templates/editpage.html */
-div.wiki-edithelp .transclusion {
+.wiki-edithelp .transclusion {
   font-size: smaller;
   background: inherit;
   padding: 0.5ex 0.5em;
   margin: 0.2ex 5%;
 }
-div.wiki-edithelp .transclusion p { margin: 0; }
-div.wiki-edithelp {
-  /* background: #fff url("images/bgpaper8.png"); */
+.wiki-edithelp .transclusion p { margin: 0; }
+.wiki-edithelp {
   background: white;
-  /* for NS4 */
-  border: 1px solid black;
-
   border-top:    1px solid #7c7c7c;
   border-left:   1px solid #c3c3c3;
   border-bottom: 1px solid #dddddd;
   border-right:  1px solid #c3c3c3;
-
+  padding-left:  0.5em;
+  padding-right: 0.5em;
+  padding-top:    0.75ex;
+  padding-bottom: 0.75ex;
+  margin-left:  0;
+  margin-right: 0;
+  margin-top: 1ex;
+  margin-bottom: 1ex;
   font-size: smaller;
-  padding: 6pt;
 }
+.wiki-edithelp p {
+  font-family: Arial, Helvetica, sans-serif;
+  padding-left:  0.5em;
+  padding-right: 0.5em;
+  padding-top:    0.5ex;
+  padding-bottom: 0.5ex;
+  margin: 0;
+}
 div.wiki-message {
   background: #fff url("images/bggranular.png");
   border: solid 1px #d8d8d8;
   padding: 6pt;
 }
+
 .printer { display: none; }
 
-
 /**
  * Diff Output
  */
 /* main box */
 .diff {
   background: white;
-  /* for NS4 */
-  border: 1px solid black;
-
   border-top:    1px solid #7c7c7c;
   border-left:   1px solid #c3c3c3;
   border-bottom: 1px solid #dddddd;
@@ -341,14 +283,11 @@
 }
 .diff .block {
   background: #d8d8d8;
-  /* for NS4 */
-  /*  border: none;*/
 }
 
 /* individual blocks */
 .diff .context {
   background: white;
-  /* for NS4 */
   border: none;
 }
 /* + - line prefix */
@@ -357,7 +296,6 @@
   font-family: monospace;
   margin-left: -1.6em;
   color: black;
-  /* for NS4 */
   border: none;
 }
 /* changed words */
@@ -401,7 +339,6 @@
 .diff .added:last-child {
   border-bottom: 2px solid #9f9; /* cfc */
 }
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 /* deleted words */
 .diff del { background: #fcc; } /* f99 */
 /* added words */
@@ -424,7 +361,6 @@
 .pagelist thead td u { text-decoration: none; }
 /* Yellow highlight for every td of mouseover'd tr in pagelist tbody
    ie mac ignores all these */
-/*.pagelist tbody tr:hover>td { background: #ffff99; }*/
 .pagelist tbody tr:hover>td {
   border: solid #ffff99 2px;
 }
@@ -581,51 +517,6 @@
   text-indent: -3em;
 }
 
-/* IncludePage plugin */
-.transclusion-title {
-  text-align: right;
-  font-style: oblique;
-  font-size:  smaller;
-  text-decoration: underline;
-  margin-bottom: 0.25ex;
-  margin-right:  0.25em;
-} 
-.transclusion, .wiki-edithelp {
-  font-size: smaller;
-}
-.transclusion {
-  border: 1px solid gray;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
-  padding-top:     0px;
-  padding-bottom:  0px;
-  margin-left:   0.25em;
-  margin-right:  0.25em;
-  margin-bottom: 0.1ex;
-}
-.wiki-edithelp {
-  background: white;
-  border: medium solid #fff8dc; /* darker ivory */
-  padding-left:  0.5em;
-  padding-right: 0.5em;
-  padding-top:    0.75ex;
-  padding-bottom: 0.75ex;
-  margin-left:  0;
-  margin-right: 0;
-  margin-top: 1ex;
-  margin-bottom: 1ex;
-}
-.wiki-edithelp .wiki {
-  /* color: #5454ff;*/
-}
-.wiki-edithelp p {
-  font-family: Arial, Helvetica, sans-serif;
-  padding-left:  0.5em;
-  padding-right: 0.5em;
-  padding-top:    0.5ex;
-  padding-bottom: 0.5ex;
-  margin: 0;
-}
 /**
  * PageHistory, Info
  */
@@ -635,7 +526,6 @@
   font-style: oblique;
 }
 
-
 /**
  * Other
  */
@@ -683,7 +573,6 @@
   margin-left: -0.6em;
 }
 
-
 /*
  * wikiblog
  */
@@ -699,11 +588,7 @@
   margin: 0 0;
   padding: 0.5ex 0.5em;
 }
-div.wikiblog-header {
-  /* background-color: #ccf; */
-}
 div.wikiblog > div.wikiblog-footer {
-  /* background-color: #eee; */
   padding: 0.2ex 0.5em;
 }
 h3.wikiblog-summary {
@@ -712,17 +597,12 @@
   margin: 0 0 1ex 0;
 }
 
-div.wikiblog.wikiblog-form {
-  /* background-color: #eee; */
-}
-
 table.wikiblog-form {
   width: auto;
   border-collapse: collapse;
   margin: 0.25em 0;
 }
 .wikiblog-form caption {
-  /* background-color: #ccf; */
   caption-side: top;
   font-weight: bold;
   text-align: left;
@@ -790,8 +670,6 @@
   margin: 1em 0 0.5em 0;
 }
 
-
-
 /* postnuke css:*/
 .gensmall{font-size:10px}
 .genmed{font-size:11px}
@@ -847,7 +725,6 @@
  * TeX2png plugin
  */
 img.tex { 
-  border: 0ex;
   vertical-align: middle; 
 }
 
@@ -859,7 +736,6 @@
   font-size: 11px;
 }
 
-
 .wikiwyg_toolbar {
     background: #D3D3D3;
     border: 1px outset;
@@ -915,12 +791,8 @@
 /**
  * Wiki
  */
-/* this completely prevents NS4 from editing pages. */
 textarea.wikiedit, input.wikitext, textarea.summary {
   background: white;
-  /* for older browsers */
-  border: 1px solid black;
-
   border-top:    1px solid #7c7c7c;
   border-left:   1px solid #c3c3c3;
   border-bottom: 1px solid #dddddd;
@@ -930,28 +802,18 @@
   padding-top: 0.5em;
   padding-bottom: 0.5em;
   margin: 0.5ex 0px;
- /* This breaks Netscape 4: (display does not go full width).
-    width: auto;
- */
- clear: both;
+  clear: both;
 }
 
-
-
-/* This makes spacings in NS4 too big. */
 .toolbar , div.toolbar  {
   margin : 0.5ex 0;
 }
-/* This break NS4, but is necessary for IE4. */
-div.wikitext  {
-  width : auto;
-}
+
 /* Link icons */
 img.linkicon  {
   vertical-align : middle;
 }
 
-
 /**
  * PageTypes
  */
@@ -962,7 +824,6 @@
   padding-right: 1em;
 }
 
-
 /**
  * Diff Output
  */
@@ -990,7 +851,6 @@
   top:  0;
 }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 /* deleted & added words */
 .diff del, .diff ins {
   padding-left: 0.5ex;

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/lib/RecentChanges.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/lib/RecentChanges.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/lib/RecentChanges.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: RecentChanges.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: RecentChanges.php 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * Extensions/modifications to the stock RecentChanges (and PageHistory) format.
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MacOSX/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /**
  * A PhpWiki theme inspired by the Aqua appearance of Mac OS X.
@@ -71,7 +71,7 @@
         else {
             $default_text = $wikiword;
         }
-      
+
         $url = WikiURL($wikiword, array('action' => 'create'));
         //$link = HTML::span(HTML::a(array('href' => $url), '?'));
         $button = $this->makeButton('?', $url);
@@ -92,70 +92,68 @@
     }
 
     function load() {
-	// 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.
+   // 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.
 
-	// This should result in phpwiki-printer.css being used when
-	// printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
-	$this->setDefaultCSS('MacOSX',
-				  array(''      => 'MacOSX.css',
-					'print' => 'phpwiki-printer.css'));
+   // This should result in phpwiki-printer.css being used when
+   // printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
+   $this->setDefaultCSS('MacOSX', array('' => 'MacOSX.css', 'print' => 'phpwiki-printer.css'));
 
-	// This allows one to manually select "Printer" style (when browsing page)
-	// to see what the printer style looks like.
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css');
+   // This allows one to manually select "Printer" style (when browsing page)
+   // to see what the printer style looks like.
+   $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+   $this->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+   /**
+    * The logo image appears on every page and links to the HomePage.
+    */
+   $this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is set to false then the "Thank you for editing..." screen will
-	 * be omitted.
-	 */
-	$this->addImageAlias('signature', WIKI_NAME . "Signature.png");
-	// Uncomment this next line to disable the signature.
-	//$this->addImageAlias('signature', false);
+   /**
+    * The Signature image is shown after saving an edited page. If this
+    * is set to false then the "Thank you for editing..." screen will
+    * be omitted.
+    */
+   $this->addImageAlias('signature', WIKI_NAME . "Signature.png");
+   // Uncomment this next line to disable the signature.
+   //$this->addImageAlias('signature', false);
 
-	/*
-	 * Link icons.
-	 */
-	$this->setLinkIcon('http');
-	$this->setLinkIcon('https');
-	$this->setLinkIcon('ftp');
-	$this->setLinkIcon('mailto');
-	$this->setLinkIcon('interwiki');
-	$this->setLinkIcon('wikiuser');
-	$this->setLinkIcon('*', 'url');
+   /*
+    * Link icons.
+    */
+   $this->setLinkIcon('http');
+   $this->setLinkIcon('https');
+   $this->setLinkIcon('ftp');
+   $this->setLinkIcon('mailto');
+   $this->setLinkIcon('interwiki');
+   $this->setLinkIcon('wikiuser');
+   $this->setLinkIcon('*', 'url');
 
-	$this->setButtonSeparator(""); //use no separator instead of default
+   $this->setButtonSeparator(""); //use no separator instead of default
 
-	$this->addButtonAlias('?', 'uww');
-	$this->addButtonAlias(_("Lock Page"), "Lock Page");
-	$this->addButtonAlias(_("Unlock Page"), "Unlock Page");
-	$this->addButtonAlias(_("Page Locked"), "Page Locked");
-	$this->addButtonAlias("...", "alltime");
+   $this->addButtonAlias('?', 'uww');
+   $this->addButtonAlias(_("Lock Page"), "Lock Page");
+   $this->addButtonAlias(_("Unlock Page"), "Unlock Page");
+   $this->addButtonAlias(_("Page Locked"), "Page Locked");
+   $this->addButtonAlias("...", "alltime");
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	//$this->setAutosplitWikiWords(false);
+   /**
+    * WikiWords can automatically be split by inserting spaces between
+    * the words. The default is to leave WordsSmashedTogetherLikeSo.
+    */
+   //$this->setAutosplitWikiWords(false);
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	$this->setDateFormat("%A, %B %d, %Y"); // must not contain time
-	$this->setTimeFormat("%I:%M:%S %p");
+   /*
+    * You may adjust the formats used for formatting dates and times
+    * below.  (These examples give the default formats.)
+    * Formats are given as format strings to PHP strftime() function See
+    * http://www.php.net/manual/en/function.strftime.php for details.
+    * Do not include the server's zone (%Z), times are converted to the
+    * user's time zone.
+    */
+   $this->setDateFormat("%A, %B %d, %Y"); // must not contain time
+   $this->setTimeFormat("%I:%M:%S %p");
     }
 }
 
@@ -167,5 +165,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IE60Fixes.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IE60Fixes.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IE60Fixes.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,95 +1,93 @@
 /**
- *  $Id: IE60Fixes.css 6413 2009-01-19 10:33:24Z vargenau $
- */ 
+ *  $Id: IE60Fixes.css 7965 2011-03-07 09:47:31Z vargenau $
+ */
 
 /* 6.0 - only fixes */
-/* content area */ 
+/* content area */
 /* workaround for various ie float bugs */
-#column-content { 
-	float: none; 
-	margin-left: 0;
-	height: 1%;
+#column-content {
+    float: none;
+    margin-left: 0;
+    height: 1%;
 }
 #column-content #content {
-	margin-left: 12.2em;
-	margin-top: 3em;
-	height: 1%;
+    margin-left: 12.2em;
+    margin-top: 3em;
+    height: 1%;
 }
 #column-one {
-	position: absolute;
-	z-index: 4;
-	top: 0;
-	left: 0;
+    position: absolute;
+    z-index: 4;
+    top: 0;
+    left: 0;
 }
 #footer {
-	margin-left: 13.6em;
-	border-left: 1px solid #fabd23;
+    margin-left: 13.6em;
+    border-left: 1px solid #fabd23;
 }
 
 body { font-size: 80%;}
-tt {
-	font-size: 110%;
-}
+tt { font-size: 110%; }
 
 /* the tabs */
 
 #p-cactions {
-	z-index: 3;
+    z-index: 3;
 }
 
 #p-cactions li {
-	padding-bottom: 0 !important;
-	border: none;
-	background-color: transparent;
-	cursor: default;
-	float: none !important;
+    padding-bottom: 0 !important;
+    border: none;
+    background-color: transparent;
+    cursor: default;
+    float: none !important;
 }
 #p-cactions li a {
-	display: inline-block !important;
-	vertical-align: top;
-	padding-bottom: 0;
-	border: solid #aaa;
-	border-width: 1px 1px 0;
+    display: inline-block !important;
+    vertical-align: top;
+    padding-bottom: 0;
+    border: solid #aaa;
+    border-width: 1px 1px 0;
 }
 #p-cactions li.selected a {
-	border-color: #fabd23;
-	padding-bottom: 0.17em !important;
+    border-color: #fabd23;
+    padding-bottom: 0.17em !important;
 }
 #p-cactions li a:hover {
-	padding-bottom: 0.17em;
+    padding-bottom: 0.17em;
 }
 #p-navigation a {
-	display: inline-block;
-	width: 100%;
+    display: inline-block;
+    width: 100%;
 }
 #portal-personaltools {
-	padding-bottom: 0.1em;
+    padding-bottom: 0.1em;
 }
 #bodyContent a.external {
-	background: url(images/external.png) center right no-repeat;
-	padding-right: 13px;
+    background: url(images/external.png) center right no-repeat;
+    padding-right: 13px;
 }
 
 /* show the hand */
 #p-logo a,
 #p-logo a:hover {
-	cursor: pointer;
+    cursor: pointer;
 }
 div.visualClear {
-	width:100%;
-	line-height: 0;
+    width:100%;
+    line-height: 0;
 }
 textarea {
-	width: 96%;
+    width: 96%;
 }
 
 div.editsection,
 #catlinks,
 div.tright,
 div.tleft {
-	position: relative;
+    position: relative;
 }
-/*{ border:1px solid Red !important;}*/
+
 span.rateit {
   text-decoration: none;
   font-family: Arial, Helvetica, sans-serif;
@@ -98,9 +96,3 @@
 div#rateit-widget-top {
   top:   38px;
 }
-/*
-div#rateit-widget-top {
-  top:   15px;
-  right: 90px;
-}
-*/

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IE70Fixes.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IE70Fixes.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IE70Fixes.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,81 +1,71 @@
 /**
- *  $Id: IE70Fixes.css 6413 2009-01-19 10:33:24Z vargenau $
- */ 
+ *  $Id: IE70Fixes.css 7965 2011-03-07 09:47:31Z vargenau $
+ */
 
 /* 7.0 - only fixes */
-/* content area */ 
+/* content area */
 /* workaround for various ie float bugs */
 
 /* This bit is needed to make links clickable... WTF */
 #column-content #content {
-	margin-left: 12.2em;
-	margin-top: 3em;
-	height: 1%;
+    margin-left: 12.2em;
+    margin-top: 3em;
+    height: 1%;
 }
 
 .rtl #column-one {
-	/* For some reason it tries to inherit the padding-top into every div,
-	 * and I can't figure out how to get it back off.
-	 */
-	padding-top: 0;
+    /* For some reason it tries to inherit the padding-top into every div,
+     * and I can't figure out how to get it back off.
+     */
+    padding-top: 0;
 }
 .rtl #column-one #p-navigation {
-	margin-top: 160px;
+    margin-top: 160px;
 }
 
 /* the tabs */
 
 #p-cactions {
-	z-index: 3;
+    z-index: 3;
 }
 
 #p-cactions li {
-	padding-bottom: 0 !important;
-	border: none;
-	background-color: transparent;
-	cursor: default;
-	float: none !important;
+    padding-bottom: 0 !important;
+    border: none;
+    background-color: transparent;
+    cursor: default;
+    float: none !important;
 }
 
 #p-cactions li a {
-	display: inline-block !important;
-	vertical-align: top;
-	padding-bottom: 0;
-	border: solid #aaa;
-	border-width: 1px 1px 0;
+    display: inline-block !important;
+    vertical-align: top;
+    padding-bottom: 0;
+    border: solid #aaa;
+    border-width: 1px 1px 0;
 }
 #p-cactions li.selected a {
-	border-color: #fabd23;
-	padding-bottom: 0.17em !important;
+    border-color: #fabd23;
+    padding-bottom: 0.17em !important;
 }
 #p-cactions li a:hover {
-	padding-bottom: 0.17em !important;
+    padding-bottom: 0.17em !important;
 }
 #p-navigation a {
-	display: inline-block;
-	width: 100%;
+    display: inline-block;
+    width: 100%;
 }
 #portal-personaltools {
-	padding-bottom: 0.1em;
+    padding-bottom: 0.1em;
 }
 textarea {
-	width: 96%;
+    width: 96%;
 }
 tt {
-	font-size: 110%;
+    font-size: 110%;
 }
 
-/*
-div.editsection,
-#catlinks,
-div.tright,
-div.tleft {
-	position: relative;
-}
-*/
-
-
 #footer li {
-	/* Work around bug with inline <li> tags with right margins and nowrap */
-	margin-right: 0;
+    /* Work around bug with inline <li> tags with right margins and nowrap */
+    margin-right: 0;
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IEFixes-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IEFixes-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IEFixes-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
- at import "null?\"\{";@import "IE60Fixes.css";voice-family:"\"}\"";voice-family:inherit;@media tty{i{content:"\";}}@media tty{i{content:"\";}}@m;@import 'IE55Fixes.css';
\ No newline at end of file
+ at import "null?\"\{";@import "IE60Fixes.css";voice-family:"\"}\"";voice-family:inherit;
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IEFixes.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IEFixes.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/IEFixes.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- *  $Id: IEFixes.css 6413 2009-01-19 10:33:24Z vargenau $
+ *  $Id: IEFixes.css 7833 2011-01-13 15:06:45Z vargenau $
  */ 
 
 /*
@@ -13,16 +13,3 @@
 
 voice-family: "\"}\"";
 voice-family:inherit; 
-
-/* IE5.0 */
- at media tty { 
-    i{content:"\";/*" "*/}}; @import 'IE50Fixes.css'; {;}/*";} 
-}
-
-/* IE5.5 */
- at media tty {
-    i{content:"\";/*" "*/}}@m; @import 'IE55Fixes.css'; /*";}
-}
-
-
-

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/Makefile
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/Makefile	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/Makefile	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,13 +1,13 @@
-# $Id: Makefile 7436 2010-05-21 09:19:15Z vargenau $
+# $Id: Makefile 7833 2011-01-13 15:06:45Z vargenau $
 #
 # themes/MonoBook/Makefile
 #
 # minify CSS and JS
 #
 
-CSS_SRC = IE50Fixes.css  IE70Fixes.css   KHTMLFixes.css   commonPrint.css  rtl.css \
-	  IE55Fixes.css  IEFixes.css     Opera6Fixes.css  main.css         wikiprintable.css \
-	  IE60Fixes.css  IEMacFixes.css  Opera7Fixes.css  monobook.css     wikistandard.css
+CSS_SRC = IE70Fixes.css   commonPrint.css  rtl.css \
+	  IEFixes.css     main.css         wikiprintable.css \
+	  IE60Fixes.css  monobook.css     wikistandard.css
 MAIN    = wikibits
 JS_MAIN = wikibits.js
 # JS_REST = IEFixes.js

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/commonPrint-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/commonPrint-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/commonPrint-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
- at page{size:A4 portrait;margin:17mm 10mm 17mm 10mm;}h1{string-set:header content();}@page :left{@top-left{content:"Phpwiki";}@top-right{content:string(header);}@bottom-left{content:"Page " counter(page) " of " counter(pages);}}@page :right{@top-left{content:string(header);}@top-right{content:"Phpwiki";}@bottom-right{content:"Page " counter(page) " of " counter(pages);}}@page :first{@top-right{content:normal;}@top-left{content:normal;}}h1,h2,h3,h4,h5,h6{page-break-after:avoid;}table.nobreak{page-break-inside:avoid!important;}a.stub,a.new{color:#ba0000;text-decoration:none;}.toc,#toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}.tocindent{margin-left:2em;}.tocline{margin-bottom:0;}.toctoggle,.editsection{font-size:smaller;}div.toclist a::after{content:leader('.') target-counter(attr(href),page);}div.floatright{float:right;margin:0;position:relative;border:.5em solid White;border-width:.5em 0 .8em 1.4em;}div.floatright p{font-style:italic;}div.floatleft{float:left;margin:.3em .5em .5em 0;position:relative;border:.5em solid White;border-width:.5em 1.4em .8em 0;}div.floatleft p{font-style:italic;}div.thumb{margin-bottom:.5em;border-style:solid;border-color:White;width:auto;}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;}div.thumb div a img{border:1px solid #ccc;}div.thumb div div.thumbcaption{border:none;text-align:left;padding:.3em 0 .1em 0;}div.magnify{display:none;}div.tright{float:right;border-width:.5em 0 .8em 1.4em;}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0;}table.rimage{float:right;width:1pt;position:relative;margin-left:1em;margin-bottom:1em;text-align:center;}body{background:White;color:Black;margin:0;padding:0;}div#p-personal,div.top,div#column-one,#colophon,.editsection,.toctoggle,div#f-poweredbyico,div#f-copyrightico,li#f-viewcount,li#f-about,li#f-disclaimer,div#xhtml-validator,li#pt-logout,li#pt-login,div#p-logo,div.hint,fieldset.wiki-rc-action,span.debug{display:none;}ul{list-style-type:square;}#content{background:none;border:none!important;font-size:11pt;padding:0!important;margin:0!important;text-align:left;}#footer{border:1px solid black;}h1,h2,h3,h4,h5,h6{font-weight:bold;}p,.documentDescription{margin:1em 0!important;line-height:1.2em;}pre{border:1pt dashed black;white-space:pre;font-size:8pt;overflow:auto;padding:0;}table.listing,table.listing td{border:1pt solid black;border-collapse:collapse;}a{color:Black!important;padding:0!important;}a:link,a:visited{color:#520;background:transparent;text-decoration:underline;}#globalWrapper{width:100%!important;min-width:0!important;}#column-content{margin:0!important;}#column-content #content{padding:1em;margin:0!important;}a,a.external,a.new,a.stub{color:black!important;text-decoration:none!important;}a,a.external,a.new,a.stub{color:inherit!important;text-decoration:inherit!important;}.urlexpansion{display:inline!important;}div.townBox{position:relative;float:right;background:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right;}div.townBox dl{padding:0;margin:0 0 .3em 0;font-size:96%;}div.townBox dl dt{background:none;margin:.4em 0 0 0;}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3;}
\ No newline at end of file
+ at page{size:A4 portrait;margin:17mm 10mm 17mm 10mm;}h1{string-set:header content();}@page :left{@top-left{content:"Phpwiki";}@top-right{content:string(header);}@bottom-left{content:"Page " counter(page) " of " counter(pages);}}@page :right{@top-left{content:string(header);}@top-right{content:"Phpwiki";}@bottom-right{content:"Page " counter(page) " of " counter(pages);}}@page :first{@top-right{content:normal;}@top-left{content:normal;}}h1,h2,h3,h4,h5,h6{page-break-after:avoid;}table.nobreak{page-break-inside:avoid!important;}a.stub,a.new{color:#ba0000;text-decoration:none;}.toc,#toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}.tocindent{margin-left:2em;}.tocline{margin-bottom:0;}.toctoggle,.editsection{font-size:smaller;}div.toclist a::after{content:leader('.') target-counter(attr(href),page);}div.floatright{float:right;margin:0;position:relative;border:.5em solid White;border-width:.5em 0 .8em 1.4em;}div.floatright p{font-style:italic;}div.floatleft{float:left;margin:.3em .5em .5em 0;position:relative;border:.5em solid White;border-width:.5em 1.4em .8em 0;}div.floatleft p{font-style:italic;}div.thumb{margin-bottom:.5em;border-style:solid;border-color:White;width:auto;}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;}div.thumb div a img{border:1px solid #ccc;}div.thumb div div.thumbcaption{border:none;text-align:left;padding:.3em 0 .1em 0;}div.magnify{display:none;}div.tright{float:right;border-width:.5em 0 .8em 1.4em;}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0;}table.rimage{float:right;width:1pt;position:relative;margin-left:1em;margin-bottom:1em;text-align:center;}body{background:White;color:Black;margin:0;padding:0;}div#p-personal,div.top,div#column-one,#colophon,.editsection,.toctoggle,div#f-poweredbyico,div#f-copyrightico,li#f-viewcount,li#f-about,li#f-disclaimer,div#xhtml-validator,li#pt-logout,li#pt-login,div#p-logo,div.hint,fieldset.wiki-rc-action,span.debug{display:none;}ul{list-style-type:square;}#content{background:none;border-style:none!important;font-size:11pt;padding:0!important;margin:0!important;text-align:left;}#footer{border:1px solid black;}h1,h2,h3,h4,h5,h6{font-weight:bold;}p,.documentDescription{margin:1em 0!important;line-height:1.2em;}pre{border:1pt dashed black;white-space:pre;font-size:8pt;overflow:auto;padding:0;}table.listing,table.listing td{border:1pt solid black;border-collapse:collapse;}a{color:Black!important;padding:0!important;}a:link,a:visited{color:#520;background-color:transparent;text-decoration:underline;}#globalWrapper{width:100%!important;min-width:0!important;}#column-content{margin:0!important;}#column-content #content{padding:1em;margin:0!important;}a,a.external,a.new,a.stub{color:black!important;text-decoration:none!important;}a,a.external,a.new,a.stub{color:inherit!important;text-decoration:inherit!important;}.urlexpansion{display:inline!important;}div.townBox{position:relative;float:right;background:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right;}div.townBox dl{padding:0;margin:0 0 .3em 0;font-size:96%;}div.townBox dl dt{background:none;margin:.4em 0 0 0;}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/commonPrint.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/commonPrint.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/commonPrint.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
 /**
- *  $Id: commonPrint.css 7183 2009-10-05 16:59:27Z vargenau $
- */ 
+ *  $Id: commonPrint.css 7991 2011-03-10 13:09:42Z vargenau $
+ */
 
 /*
 ** Mediawiki Print style sheet for CSS2-capable browsers.
@@ -10,10 +10,10 @@
 ** Copyright Alexander Limi
 */
 
- at page { 
-  size: A4 portrait; 
+ at page {
+  size: A4 portrait;
   margin: 17mm 10mm 17mm 10mm;
-} 
+}
 
 h1 {
   string-set: header content();
@@ -24,7 +24,7 @@
     content: "Phpwiki";
   }
   @top-right {
-    content: string(header); 
+    content: string(header);
   }
   @bottom-left {
     content: "Page " counter(page) " of " counter(pages);
@@ -33,7 +33,7 @@
 
 @page :right {
   @top-left {
-    content: string(header); 
+    content: string(header);
   }
   @top-right {
     content: "Phpwiki";
@@ -52,7 +52,7 @@
   }
 }
 
-h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } 
+h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
 
 /* Do not cut tables with class "nobreak" */
 
@@ -65,20 +65,19 @@
 a.new{ color:#ba0000; text-decoration:none; }
 
 .toc,
-#toc { 
-    /*border:1px solid #2f6fab;*/
+#toc {
     border:1px solid #aaaaaa;
     background-color:#f9f9f9;
     padding:5px;
 }
 .tocindent {
-	margin-left: 2em;
+    margin-left: 2em;
 }
 .tocline {
-	margin-bottom: 0px;
+    margin-bottom: 0px;
 }
 .toctoggle, .editsection {
-	font-size: smaller;
+    font-size: smaller;
 }
 
 div.toclist a::after {
@@ -86,22 +85,22 @@
 }
 
 /* images */
-div.floatright { 
-    float: right; 
+div.floatright {
+    float: right;
     margin: 0;
     position:relative;
     border: 0.5em solid White;
     border-width: 0.5em 0 0.8em 1.4em;
 }
-div.floatright p { font-style: italic;} 
-div.floatleft { 
-    float: left; 
+div.floatright p { font-style: italic;}
+div.floatleft {
+    float: left;
     margin: 0.3em 0.5em 0.5em 0;
     position:relative;
     border: 0.5em solid White;
     border-width: 0.5em 1.4em 0.8em 0;
 }
-div.floatleft p { font-style: italic; } 
+div.floatleft p { font-style: italic; }
 /* thumbnails */
 div.thumb {
     margin-bottom: 0.5em;
@@ -136,10 +135,10 @@
 
 /* table standards */
 table.rimage {
-    float:right; 
-    width:1pt; 
+    float:right;
+    width:1pt;
     position:relative;
-    margin-left:1em; 
+    margin-left:1em;
     margin-bottom:1em;
     text-align:center;
 }
@@ -174,13 +173,13 @@
     display: none;
 }
 
-ul { 
+ul {
     list-style-type: square;
 }
 
 #content {
     background: none;
-    border: none ! important;
+    border-style: none ! important;
     font-size: 11pt;
     padding: 0 ! important;
     margin: 0 ! important;
@@ -197,7 +196,7 @@
 
 p, .documentDescription {
     margin: 1em 0 ! important;
-    line-height: 1.2em;    
+    line-height: 1.2em;
 }
 
 pre {
@@ -221,11 +220,11 @@
 
 a:link, a:visited {
     color: #520;
-    background: transparent;
+    background-color: transparent;
     text-decoration: underline;
 }
 /*
-#content a:link:after, 
+#content a:link:after,
 #content a:visited:after {
    content: " ( " attr(href) " ) ";
 }*/
@@ -245,20 +244,20 @@
 }
 /* MSIE/Win doesn't understand 'inherit' */
 a, a.external, a.new, a.stub {
-	color: black ! important;
-	text-decoration: none ! important;
+    color: black ! important;
+    text-decoration: none ! important;
 }
 
 /* Continue ... */
 a, a.external, a.new, a.stub {
-	color: inherit ! important;
-	text-decoration: inherit ! important;
+    color: inherit ! important;
+    text-decoration: inherit ! important;
 }
 
 
 /* Show some stuff */
 .urlexpansion {
-	display: inline ! important;
+    display: inline ! important;
 }
 
 div.townBox {
@@ -274,7 +273,7 @@
 }
 div.townBox dl {
     padding: 0;
-    margin: 0 0 0.3em 0; 
+    margin: 0 0 0.3em 0;
     font-size: 96%;
 }
 div.townBox dl dt {

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/main-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/main-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/main-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0;height:1%;}#content{position:relative;z-index:2;margin:2.8em 0 0 12.2em;padding:0 1em 1.5em 1em;background:white;color:black;border:1px solid #aaa;border-right:none;line-height:1.5em;}#column-one{position:absolute;padding-top:160px;top:0;left:0;}body{font:small sans-serif;background:#f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;color:black;margin:0;padding:0;}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0;}.visualClear{clear:both;}table{font-size:100%;color:black;}a{text-decoration:none;color:#002bb8;background:none;}a:visited{color:#5a3696;}a:active{color:#faa700;}a:hover{text-decoration:underline;}a.stub{color:#723;}img{border:none;vertical-align:middle;}p{margin:.4em 0 .5em 0;line-height:1.5em;}p img{margin:0;}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0;}h1,h2,h3,h4,h5,h6{color:black;background:none;font-weight:bold;font-family:Tahoma,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1{font-size:188%;}h2{font-size:150%;}h3{font-size:132%;}h4{font-size:116%;}h5{font-size:100%;}h6{font-size:80%;}h4,h5,h6{border-bottom:none;font-weight:normal;}li p{margin:0;}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png");}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none;}li{margin-bottom:.1em;}dt{font-weight:bold;margin-bottom:.1em;}dl{margin-top:.2em;margin-bottom:.5em;}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em;}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em;}legend{padding:.5em;font-size:95%;}form{border:none;margin:0;}textarea{width:100%;padding:.1em;}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em;}select{vertical-align:top;}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background:none;cursor:help;}q{font-family:Times,"Times New Roman",serif;font-style:italic;}code{background-color:#f9f9f9;}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em;}#siteSub{display:none;}#jump-to-nav{display:none;}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto;}span.subpages{display:block;}#bodyContent h1,#bodyContent h2{margin-bottom:.6em;}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em;}.firstHeading{margin-bottom:.1em;}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle;}#siteNotice{text-align:center;font-size:95%;padding:0 .9em;}#siteNotice p{margin:0;padding:0;}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000;}.errorbox{border-color:red;background-color:#fff2f2;}.successbox{border-color:green;background-color:#dfd;}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:none;}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both;}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em;}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c;}.center{width:100%;text-align:center;}*.center *{margin-left:auto;margin-right:auto;}.small,.small *{font-size:94%;}table.small{font-size:100%;}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right;}#toc #toctitle,.toc .toctitle,.toc #toctitle{display:inline;border:none;padding:0;font-size:110%;font-weight:bold;}.toc .toclist,.toc #toclist{width:auto;border:none;}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center;}#toc p,.toc p{margin:0;}#toc ul,.toc ul{width:auto;border:none;line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;margin-left:5px;padding-left:5px;}#toc ul ul,.toc ul ul{margin:0 0 0 2em;}#toc .toctoggle,.toc .toctoggle{font-size:94%;}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}.mw-warning{margin-left:50px;margin-right:50px;text-align:center;}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0;}div.floatright p{font-style:italic;}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0;}div.floatleft p{font-style:italic;}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto;}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden;}div.thumb div a img{border:1px solid #ccc;}div.thumb div div.thumbcaption{border:none;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0;}div.magnify{float:right;border:none!important;background:none!important;}div.magnify a,div.magnify img{display:block;border:none!important;background:none!important;}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em;}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0;}.hiddenStructure{display:none;speak:none;}img.tex{vertical-align:middle;}span.texhtml{font-family:serif;}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center;}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}div.townBox{position:relative;float:right;background:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right;}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%;}div.townBox dl dt{background:none;margin:.4em 0 0;}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3;}.special li{line-height:1.4em;margin:0;padding:0;}.pageinfo-majoredit{font-weight:normal;}.wiki-summary{font-size:94%;font-style:italic;}.autocomment{color:gray;}#pagehistory span.user{margin-left:1.4em;margin-right:.4em;}#pagehistory span.minor{font-weight:bold;}#pagehistory li{border:1px solid white;}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white;}td.diff-addedline{background:#cfc;font-size:smaller;}td.diff-deletedline{background:#ffa;font-size:smaller;}td.diff-context{background:#eee;font-size:smaller;}span.diffchange{color:red;font-weight:bold;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background:url("images/url.png") center right no-repeat;padding-right:13px;}#bodyContent a[href ^="https://"],.link-https{background:url("images/lock_icon.png") center right no-repeat;padding-right:16px;}#bodyContent a[href ^="mailto:"],.link-mailto{background:url("images/mail_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="news://"]{background:url("images/news_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="ftp://"],.link-ftp{background:url("images/file_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="irc://"],.link-irc{background:url("images/discussionitem_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a.extiw,#bodyContent a.extiw:active{color:#36b;background:none;padding:0;}#bodyContent a.external{color:#36b;}#bodyContent .plainlinks a{background:none!important;padding:0!important;}.portlet{border:none;margin:0 0 .5em;padding:0;float:none;width:11.6em;overflow:hidden;}.portlet h4{font-size:95%;font-weight:normal;white-space:nowrap;}.portlet h5{background:transparent;padding:0 1em 0 .5em;text-transform:lowercase;display:inline;font-size:91%;height:1em;font-weight:normal;white-space:nowrap;}.portlet h6{background:#ffae2e;border:1px solid #2f6fab;border-style:solid solid none solid;padding:0 1em 0 1em;text-transform:lowercase;display:block;font-size:1em;height:1.2em;font-weight:normal;white-space:nowrap;}.pBody{font-size:95%;background-color:white;color:black;border-collapse:collapse;border:1px solid #aaa;padding:0 .8em .3em .5em;}.portlet h1,.portlet h2,.portlet h3,.portlet h4{margin:0;padding:0;}.portlet ul{line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;}.portlet li{padding:0;margin:0;margin-bottom:0;}#p-logo{position:absolute;z-index:3;top:0;left:0;height:155px;width:12em;overflow:visible;}#p-logo h5{display:none;}#p-logo a,#p-logo a:hover{display:block;height:155px;width:12.2em;background-repeat:no-repeat;background-position:35% 50%!important;text-decoration:none;}#img-logo-right{position:absolute;z-index:4;top:0;right:0;height:86px;width:86px;background:url("images/wiki_stamp.png") left no-repeat;background-repeat:no-repeat;overflow:visible;}#p-navigation{position:relative;z-index:3;}#p-navigation .pBody{padding-right:0;}#p-navigation a{display:block;}#p-navigation li.active a,#p-navigation li.active a:hover{text-decoration:none;display:inline;font-weight:bold;}#p-search{position:relative;z-index:3;}input.searchButton{margin-top:1px;padding:0 .4em!important;font-size:95%;cursor:pointer;background-color:White;border:1px solid #2f6fab;}#searchGoButton{padding-left:.5em;padding-right:.5em;font-weight:bold;}#livesearch,#p-search input.dropdown{text-align:left;width:9.9em;font-size:95%;}#p-search .pBody{padding:.5em .4em .4em .4em;text-align:center;}#p-personal{position:absolute;z-index:4;width:40em;white-space:nowrap;padding:0;margin:0;right:90px;top:.1em;border:none;overflow:visible;color:black;line-height:1.2em;}#p-personal h5{display:none;}#p-personal .portlet,#p-personal .pBody{z-index:0;padding:0;margin:0;border:none;overflow:visible;background:none;}#p-personal ul{z-index:0;border:none;line-height:1.5em;color:#2f6fab;padding:0 2em 0 3em;margin:0;text-align:right;list-style:none;background:none;cursor:default;}#p-personal li{z-index:0;border:none;padding:0;display:inline;color:#2f6fab;margin-left:1em;line-height:1.2em;background:none;}#p-personal li.active{font-weight:bold;}#p-personal li a{text-decoration:none;color:#005896;padding-bottom:.2em;background:none;}#p-personal li a:hover{background-color:white;padding-bottom:.2em;text-decoration:none;}#p-personal li.active a:hover{background-color:transparent;}li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:url('images/wikiuser.png') left no-repeat;background-repeat:no-repeat;padding-left:20px;text-transform:none;}#p-personal a.new{color:#ba0000;}#p-cactions{position:absolute;top:1.3em;left:11.5em;margin:0;white-space:nowrap;width:76%;line-height:1.1em;overflow:visible;background:none;border-collapse:collapse;padding-left:1em;list-style:none;font-size:95%;}#p-cactions .hiddenStructure{display:none;}#p-cactions ul{list-style:none;}#p-cactions li{display:inline;border:1px solid #aaa;border-bottom:none;padding:0 0 .1em 0;margin:0 .3em 0 0;overflow:visible;background:white;}#p-cactions li.selected{border-color:#fabd23;padding:0 0 .2em 0!important;}#p-cactions li a{position:relative;z-index:0;background-color:#fbfbfb;color:#002bb8;border:none;padding:0 .8em .3em;text-decoration:none;margin:0;}#p-cactions li.selected a{z-index:3;background-color:#fff;padding:0 1em .2em;}#p-cactions .new a{color:#ba0000;}#p-cactions li a:hover{z-index:3;text-decoration:none;background-color:#dedede;}#p-cactions li a#btn-edit{background:url('images/UEB16.png') top left no-repeat;background-repeat:no-repeat;padding-left:20px!important;text-transform:none;}#p-cactions li a#btn-edit:hover{z-index:3;text-decoration:none;background-color:#fff;}#p-cactions h5{display:none;}#p-cactions li.istalk{margin-right:0;}#p-cactions li.istalk a{padding-right:.5em;}#p-cactions #ca-addsection a{padding-left:.4em;padding-right:.4em;}li#ca-talk{margin-right:1.6em;}li#ca-watch,li#ca-unwatch,li#ca-varlang-0,li#ca-print{margin-left:1.6em;}#p-tbx,#p-lang{position:relative;z-index:3;}#footer{background-color:white;border-top:1px solid #fabd23;border-bottom:1px solid #fabd23;margin:.6em 0 1em 0;border-left:1px solid #fabd23;margin-left:13.6em;padding:.4em 0 1.2em 0;text-align:center;font-size:90%;}#footer li{display:inline;margin:0 1.3em;}head:first-child+body #footer li{white-space:nowrap;}#f-poweredbyico,#f-copyrightico{margin:0 8px;height:31px;position:relative;top:-31px;}#f-poweredbyico{float:right;}#f-copyrightico{float:left;}#preftoc{float:left;margin:1em 1em 1em 1em;width:13em;}#preftoc li{border:1px solid White;}#preftoc li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}#preftoc a,#preftoc a:active{display:block;color:#0014a6;}#prefcontrol{clear:both;float:left;margin-top:1em;}div.prefsectiontip{font-size:95%;margin-top:1em;}fieldset.operaprefsection{margin-left:15em;}*>html #p-cactions li{border:none;}*>html #p-cactions li a{border:1px solid #aaa;border-bottom:none;}*>html #p-cactions li.selected a{border-color:#fabd23;}*>html #f-poweredbyico,*>html #f-copyrightico{width:88px;}*>html #bodyContent,*>html #bodyContent pre{width:100%;padding-bottom:25px;}* html #footer{margin-top:0;}* html #column-content{display:inline;margin-bottom:0;}* html div.editsection{font-size:smaller;}#pagehistory li.selected{position:relative;}*>html #column-content{float:none;}*>html #column-one{position:absolute;left:0;top:0;}*>html #footer{margin-left:13.2em;}.redirectText{font-size:150%;margin:5px;}.printfooter{display:none;}.not-patrolled{background-color:#ffa;}div.patrollink{font-size:75%;text-align:right;}span.newpage,span.minor,span.searchmatch,span.bot{font-weight:bold;}span.unpatrolled{font-weight:bold;color:red;}span.searchmatch{color:red;}.sharedUploadNotice{font-style:italic;}span.updatedmarker{color:black;background-color:#0f0;}span.newpageletter{font-weight:bold;color:black;background-color:yellow;}span.minoreditletter{color:black;background-color:#c5ffe6;}table.gallery{border:1px solid #ccc;margin:2px;padding:2px;background-color:white;}table.gallery tr{vertical-align:top;}table.gallery td{vertical-align:top;background-color:#f9f9f9;border:solid 2px white;}table.gallery td.galleryheader{text-align:center;font-weight:bold;}div.gallerybox{margin:2px;width:150px;}div.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px;}div.gallerytext{font-size:94%;padding:2px 4px;}span.comment{font-style:italic;}span.changedby{font-size:95%;}.previewnote{text-indent:3em;color:#c00;border-bottom:1px solid #aaa;padding-bottom:1em;margin-bottom:1em;}.previewnote p{margin:0;padding:0;}.editExternally{border:1px solid gray;background-color:#fff;padding:3px;margin-top:.5em;float:left;font-size:small;text-align:center;}.editExternallyHelp{font-style:italic;color:gray;}li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic;}.toggle{margin-left:2em;text-indent:-2em;}table.mw_metadata{font-size:.8em;margin-left:.5em;margin-bottom:.5em;width:300px;}table.mw_metadata caption{font-weight:bold;}table.mw_metadata th{font-weight:normal;}table.mw_metadata td{padding:.1em;}table.mw_metadata{border:none;border-collapse:collapse;}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaa;padding-left:.1em;padding-right:.1em;}table.mw_metadata th{background-color:#f9f9f9;}table.mw_metadata td{background-color:#fcfcfc;}table.collapsed tr.collapsable{display:none;}ul#filetoc{text-align:center;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:.5em;margin-left:0;margin-right:0;}#filetoc li{display:inline;list-style-type:none;padding-right:2em;}input#wpSave,input#wpDiff{margin-right:.33em;}#editform .editOptions{display:inline;}#wpSave{font-weight:bold;}table.revisionform_default{border:1px solid #000;}table.revisionform_focus{border:1px solid #000;background-color:#0BF;}tr.revision_tr_default{background-color:#EEE;}tr.revision_tr_first{background-color:#DDD;}p.revision_saved{color:green;font-weight:bold;}#mw_trackbacks{border:solid 1px #bbf;background-color:#eef;padding:.2em;}#allmessagestable th{background-color:#b2b2ff;}#allmessagestable tr.orig{background-color:#ffe2e2;}#allmessagestable tr.new{background-color:#e2ffe2;}#allmessagestable tr.def{background-color:#f0f0ff;}div.noarticletext{border:1px solid #ccc;background:#fff;padding:.2em 1em;color:#000;}div#searchTargetContainer{left:10px;top:10px;width:90%;background:white;}div#searchTarget{padding:3px;margin:5px;background:#F0F0F0;border:solid 1px blue;}div#searchTarget ul li{list-style:none;}div#searchTarget ul li:before{color:orange;content:"\00BB \0020";}div.multipageimagenavbox{border:solid 1px silver;padding:4px;margin:1em;background:#f0f0f0;}div.multipageimagenavbox div.thumb{border:none;margin-left:2em;margin-right:2em;}div.multipageimagenavbox hr{margin:6px;}table.multipageimage td{text-align:center;}.TablePager_nav a{text-decoration:none;}.TablePager{border-collapse:collapse;}.TablePager,.TablePager td,.TablePager th{border:.15em solid #777;padding:0 .15em 0 .15em;}.TablePager th{background-color:#eef;}.TablePager td{background-color:#fff;}.TablePager tr:hover td{background-color:#eef;}.imagelist td,.imagelist th{white-space:nowrap;}.imagelist .TablePager_col_links{background-color:#eef;}.imagelist .TablePager_col_img_description{white-space:normal;}.imagelist th.TablePager_sort{background-color:#ccf;}.pagelist{font-size:smaller;}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikipaging{font-size:80%;}.wikipaging-disabled{color:#999;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div#bottom{margin-left:12.2em;}div.errors{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}h4.errors{color:red;margin:0;padding:0;text-decoration:underline;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}a.spell-wrong{color:#ba0000;background:yellow;}span.spell-wrong{color:#ba0000;}form.wikiformrich{background-color:#eee;}.wiki,.named-wiki{text-decoration:none;font-weight:normal;}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold;}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Arial,Helvetica,sans-serif;white-space:nowrap;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;color:#006;}h1 .backlinks{text-decoration:underline;}.wikipage{font-weight:normal;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.feedback{font-weight:bold;border-width:2px;border-style:solid;background-color:#DFD;border-color:green;padding:.5em;}.error{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}
\ No newline at end of file
+#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0;height:1%;}#content{position:relative;z-index:2;margin:2.8em 0 0 12.2em;padding:0 1em 1.5em 1em;background-color:white;color:black;border:1px solid #aaa;border-right:none;line-height:1.5em;}#column-one{position:absolute;padding-top:160px;top:0;left:0;}body{font:small sans-serif;background:#f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;color:black;margin:0;padding:0;}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0;}.visualClear{clear:both;}table{font-size:100%;color:black;}a{text-decoration:none;color:#002bb8;background-image:none;}a:visited{color:#5a3696;}a:active{color:#faa700;}a:hover{text-decoration:underline;}a.stub{color:#723;}img{border:0;vertical-align:middle;}p{margin:.4em 0 .5em 0;line-height:1.5em;}p img{margin:0;}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0;}h1,h2,h3,h4,h5,h6{color:black;background-image:none;font-weight:bold;font-family:Tahoma,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1{font-size:188%;}h2{font-size:150%;}h3{font-size:132%;}h4{font-size:116%;}h5{font-size:100%;}h6{font-size:80%;}h4,h5,h6{border-bottom:none;font-weight:normal;}li p{margin:0;}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png");}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none;}li{margin-bottom:.1em;}dt{font-weight:bold;margin-bottom:.1em;}dl{margin-top:.2em;margin-bottom:.5em;}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em;}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em;}legend{padding:.5em;font-size:95%;}form{border:none;margin:0;}textarea{width:100%;padding:.1em;}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em;}select{vertical-align:top;}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background-image:none;cursor:help;}q{font-family:Times,"Times New Roman",serif;font-style:italic;}code{background-color:#f9f9f9;}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em;}#siteSub{display:none;}#jump-to-nav{display:none;}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto;}span.subpages{display:block;}#bodyContent h1,#bodyContent h2{margin-bottom:.6em;}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em;}.firstHeading{margin-bottom:.1em;}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle;}#siteNotice{text-align:center;font-size:95%;padding:0 .9em;}#siteNotice p{margin:0;padding:0;}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000;}.errorbox{border-color:red;background-color:#fff2f2;}.successbox{border-color:green;background-color:#dfd;}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:none;}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both;}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em;}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c;}.center{width:100%;text-align:center;}*.center *{margin-left:auto;margin-right:auto;}.small,.small *{font-size:94%;}table.small{font-size:100%;}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right;}#toc #toctitle,.toc .toctitle,.toc #toctitle{display:inline;border:none;padding:0;font-size:110%;font-weight:bold;}.toc .toclist,.toc #toclist{width:auto;border:none;}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center;}#toc p,.toc p{margin:0;}#toc ul,.toc ul{width:auto;border:none;line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;margin-left:5px;padding-left:5px;}#toc ul ul,.toc ul ul{margin:0 0 0 2em;}#toc .toctoggle,.toc .toctoggle{font-size:94%;}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}.mw-warning{margin-left:50px;margin-right:50px;text-align:center;}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0;}div.floatright p{font-style:italic;}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0;}div.floatleft p{font-style:italic;}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto;}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden;}div.thumb div a img{border:1px solid #ccc;}div.thumb div div.thumbcaption{border:none;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0;}div.magnify{float:right;border-style:none!important;background:none!important;}div.magnify a,div.magnify img{display:block;border-style:none!important;background:none!important;}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em;}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0;}.hiddenStructure{display:none;speak:none;}img.tex{vertical-align:middle;}span.texhtml{font-family:serif;}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center;}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}div.townBox{position:relative;float:right;background-color:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right;}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%;}div.townBox dl dt{background-image:none;margin:.4em 0 0;}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3;}.special li{line-height:1.4em;margin:0;padding:0;}.pageinfo-majoredit{font-weight:normal;}.wiki-summary{font-size:94%;font-style:italic;}.autocomment{color:gray;}#pagehistory span.user{margin-left:1.4em;margin-right:.4em;}#pagehistory span.minor{font-weight:bold;}#pagehistory li{border:1px solid white;}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white;}td.diff-addedline{background-color:#cfc;font-size:smaller;}td.diff-deletedline{background-color:#ffa;font-size:smaller;}td.diff-context{background-color:#eee;font-size:smaller;}span.diffchange{color:red;font-weight:bold;}.diff{margin-top:1ex;margin-bottom:.5ex;background-color:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background-color:#ddd;padding-left:1em;}.diff .context{background-color:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background-color:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background-color:white;}.diff .original,.diff .deleted{background-color:#fcc;border:none;}.diff .final,.diff .added{background-color:#cfc;border:none;}.diff del{background-color:#f99;}.diff ins{background-color:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.cal{border:1px outset gray;background-color:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background-color:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background:url("images/url.png") center right no-repeat;padding-right:13px;}#bodyContent a[href ^="https://"],.link-https{background:url("images/lock_icon.png") center right no-repeat;padding-right:16px;}#bodyContent a[href ^="mailto:"],.link-mailto{background:url("images/mail_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="news://"]{background:url("images/news_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="ftp://"],.link-ftp{background:url("images/file_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="irc://"],.link-irc{background:url("images/discussionitem_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a.extiw,#bodyContent a.extiw:active{color:#36b;background-image:none;padding:0;}#bodyContent a.external{color:#36b;}#bodyContent .plainlinks a{background:none!important;padding:0!important;}.portlet{border:none;margin:0 0 .5em;padding:0;float:none;width:11.6em;overflow:hidden;}.portlet h4{font-size:95%;font-weight:normal;white-space:nowrap;}.portlet h5{background-color:transparent;padding:0 1em 0 .5em;text-transform:lowercase;display:inline;font-size:91%;height:1em;font-weight:normal;white-space:nowrap;}.portlet h6{background-color:#ffae2e;border:1px solid #2f6fab;border-style:solid solid none solid;padding:0 1em 0 1em;text-transform:lowercase;display:block;font-size:1em;height:1.2em;font-weight:normal;white-space:nowrap;}.pBody{font-size:95%;background-color:white;color:black;border-collapse:collapse;border:1px solid #aaa;padding:0 .8em .3em .5em;}.portlet h1,.portlet h2,.portlet h3,.portlet h4{margin:0;padding:0;}.portlet ul{line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;}.portlet li{padding:0;margin:0;margin-bottom:0;}#p-logo{position:absolute;z-index:3;top:0;left:0;height:155px;width:12em;overflow:visible;}#p-logo h5{display:none;}#p-logo a,#p-logo a:hover{display:block;height:155px;width:12.2em;background-repeat:no-repeat;background-position:35% 50%!important;text-decoration:none;}#img-logo-right{position:absolute;z-index:4;top:0;right:0;height:86px;width:86px;background:url("images/wiki_stamp.png") left no-repeat;background-repeat:no-repeat;overflow:visible;}#p-navigation{position:relative;z-index:3;}#p-navigation .pBody{padding-right:0;}#p-navigation a{display:block;}#p-navigation li.active a,#p-navigation li.active a:hover{text-decoration:none;display:inline;font-weight:bold;}#p-search{position:relative;z-index:3;}input.searchButton{margin-top:1px;padding:0 .4em!important;font-size:95%;cursor:pointer;background-color:White;border:1px solid #2f6fab;}#searchGoButton{padding-left:.5em;padding-right:.5em;font-weight:bold;}#livesearch,#p-search input.dropdown{text-align:left;width:9.9em;font-size:95%;}#p-search .pBody{padding:.5em .4em .4em .4em;text-align:center;}#p-personal{position:absolute;z-index:4;width:40em;white-space:nowrap;padding:0;margin:0;right:90px;top:.1em;border:none;overflow:visible;color:black;line-height:1.2em;}#p-personal h5{display:none;}#p-personal .portlet,#p-personal .pBody{z-index:0;padding:0;margin:0;border:none;overflow:visible;background-image:none;}#p-personal ul{z-index:0;border:none;line-height:1.5em;color:#2f6fab;padding:0 2em 0 3em;margin:0;text-align:right;list-style:none;background-image:none;cursor:default;}#p-personal li{z-index:0;border:none;padding:0;display:inline;color:#2f6fab;margin-left:1em;line-height:1.2em;background-image:none;}#p-personal li.active{font-weight:bold;}#p-personal li a{text-decoration:none;color:#005896;padding-bottom:.2em;background-image:none;}#p-personal li a:hover{background-color:white;padding-bottom:.2em;text-decoration:none;}#p-personal li.active a:hover{background-color:transparent;}li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:url('images/wikiuser.png') left no-repeat;background-repeat:no-repeat;padding-left:20px;text-transform:none;}#p-personal a.new{color:#ba0000;}#p-cactions{position:absolute;top:1.3em;left:11.5em;margin:0;white-space:nowrap;width:76%;line-height:1.1em;overflow:visible;background-image:none;border-collapse:collapse;padding-left:1em;list-style:none;font-size:95%;}#p-cactions .hiddenStructure{display:none;}#p-cactions ul{list-style:none;}#p-cactions li{display:inline;border:1px solid #aaa;border-bottom:none;padding:0 0 .1em 0;margin:0 .3em 0 0;overflow:visible;background-color:white;}#p-cactions li.selected{border-color:#fabd23;padding:0 0 .2em 0!important;}#p-cactions li a{position:relative;z-index:0;background-color:#fbfbfb;color:#002bb8;border:none;padding:0 .8em .3em;text-decoration:none;margin:0;}#p-cactions li.selected a{z-index:3;background-color:#fff;padding:0 1em .2em;}#p-cactions .new a{color:#ba0000;}#p-cactions li a:hover{z-index:3;text-decoration:none;background-color:#dedede;}#p-cactions li a#btn-edit{background:url('images/UEB16.png') top left no-repeat;background-repeat:no-repeat;padding-left:20px!important;text-transform:none;}#p-cactions li a#btn-edit:hover{z-index:3;text-decoration:none;background-color:#fff;}#p-cactions h5{display:none;}#p-cactions li.istalk{margin-right:0;}#p-cactions li.istalk a{padding-right:.5em;}#p-cactions #ca-addsection a{padding-left:.4em;padding-right:.4em;}li#ca-talk{margin-right:1.6em;}li#ca-watch,li#ca-unwatch,li#ca-varlang-0,li#ca-print{margin-left:1.6em;}#p-tbx,#p-lang{position:relative;z-index:3;}#footer{background-color:white;border-top:1px solid #fabd23;border-bottom:1px solid #fabd23;margin:.6em 0 1em 0;border-left:1px solid #fabd23;margin-left:13.6em;padding:.4em 0 1.2em 0;text-align:center;font-size:90%;}#footer li{display:inline;margin:0 1.3em;}head:first-child+body #footer li{white-space:nowrap;}#f-poweredbyico,#f-copyrightico{margin:0 8px;height:31px;position:relative;top:-31px;}#f-poweredbyico{float:right;}#f-copyrightico{float:left;}#preftoc{float:left;margin:1em 1em 1em 1em;width:13em;}#preftoc li{border:1px solid White;}#preftoc li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}#preftoc a,#preftoc a:active{display:block;color:#0014a6;}#prefcontrol{clear:both;float:left;margin-top:1em;}div.prefsectiontip{font-size:95%;margin-top:1em;}fieldset.operaprefsection{margin-left:15em;}* html #footer{margin-top:0;}* html #column-content{display:inline;margin-bottom:0;}* html div.editsection{font-size:smaller;}#pagehistory li.selected{position:relative;}*>html #column-one{position:absolute;left:0;top:0;}*>html #footer{margin-left:13.2em;}.redirectText{font-size:150%;margin:5px;}.printfooter{display:none;}.not-patrolled{background-color:#ffa;}div.patrollink{font-size:75%;text-align:right;}span.newpage,span.minor,span.searchmatch,span.bot{font-weight:bold;}span.unpatrolled{font-weight:bold;color:red;}span.searchmatch{color:red;}.sharedUploadNotice{font-style:italic;}span.updatedmarker{color:black;background-color:#0f0;}span.newpageletter{font-weight:bold;color:black;background-color:yellow;}span.minoreditletter{color:black;background-color:#c5ffe6;}table.gallery{border:1px solid #ccc;margin:2px;padding:2px;background-color:white;}table.gallery tr{vertical-align:top;}table.gallery td{vertical-align:top;background-color:#f9f9f9;border:solid 2px white;}table.gallery td.galleryheader{text-align:center;font-weight:bold;}div.gallerybox{margin:2px;width:150px;}div.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px;}div.gallerytext{font-size:94%;padding:2px 4px;}span.comment{font-style:italic;}span.changedby{font-size:95%;}.previewnote{text-indent:3em;color:#c00;border-bottom:1px solid #aaa;padding-bottom:1em;margin-bottom:1em;}.previewnote p{margin:0;padding:0;}.editExternally{border:1px solid gray;background-color:#fff;padding:3px;margin-top:.5em;float:left;font-size:small;text-align:center;}.editExternallyHelp{font-style:italic;color:gray;}li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic;}.toggle{margin-left:2em;text-indent:-2em;}table.mw_metadata{font-size:.8em;margin-left:.5em;margin-bottom:.5em;width:300px;}table.mw_metadata caption{font-weight:bold;}table.mw_metadata th{font-weight:normal;}table.mw_metadata td{padding:.1em;}table.mw_metadata{border:none;border-collapse:collapse;}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaa;padding-left:.1em;padding-right:.1em;}table.mw_metadata th{background-color:#f9f9f9;}table.mw_metadata td{background-color:#fcfcfc;}table.collapsed tr.collapsable{display:none;}ul#filetoc{text-align:center;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:.5em;margin-left:0;margin-right:0;}#filetoc li{display:inline;list-style-type:none;padding-right:2em;}input#wpSave,input#wpDiff{margin-right:.33em;}#editform .editOptions{display:inline;}#wpSave{font-weight:bold;}table.revisionform_default{border:1px solid #000;}table.revisionform_focus{border:1px solid #000;background-color:#0BF;}tr.revision_tr_default{background-color:#EEE;}tr.revision_tr_first{background-color:#DDD;}p.revision_saved{color:green;font-weight:bold;}#mw_trackbacks{border:solid 1px #bbf;background-color:#eef;padding:.2em;}#allmessagestable th{background-color:#b2b2ff;}#allmessagestable tr.orig{background-color:#ffe2e2;}#allmessagestable tr.new{background-color:#e2ffe2;}#allmessagestable tr.def{background-color:#f0f0ff;}div.noarticletext{border:1px solid #ccc;background-color:#fff;padding:.2em 1em;color:#000;}div#searchTargetContainer{left:10px;top:10px;width:90%;background-color:white;}div#searchTarget{padding:3px;margin:5px;background-color:#F0F0F0;border:solid 1px blue;}div#searchTarget ul li{list-style:none;}div#searchTarget ul li:before{color:orange;content:"\00BB \0020";}div.multipageimagenavbox{border:solid 1px silver;padding:4px;margin:1em;background-color:#f0f0f0;}div.multipageimagenavbox div.thumb{border:none;margin-left:2em;margin-right:2em;}div.multipageimagenavbox hr{margin:6px;}table.multipageimage td{text-align:center;}.TablePager_nav a{text-decoration:none;}.TablePager{border-collapse:collapse;}.TablePager,.TablePager td,.TablePager th{border:.15em solid #777;padding:0 .15em 0 .15em;}.TablePager th{background-color:#eef;}.TablePager td{background-color:#fff;}.TablePager tr:hover td{background-color:#eef;}.imagelist td,.imagelist th{white-space:nowrap;}.imagelist .TablePager_col_links{background-color:#eef;}.imagelist .TablePager_col_img_description{white-space:normal;}.imagelist th.TablePager_sort{background-color:#ccf;}.pagelist{font-size:smaller;}.pagelist thead td{background-color:#e8e8e8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background-color:#eee;}.pagelist tr.oddrow{background-color:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikipaging{font-size:80%;}.wikipaging-disabled{color:#999;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div#bottom{margin-left:12.2em;}.error{color:black;background-color:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.warning{color:black;background-color:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background-color:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background-color:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background-color:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.search-context{background-color:white;font-style:oblique;}.search-term{background-color:yellow;font-weight:normal;}a.spell-wrong{color:#ba0000;background-color:yellow;}span.spell-wrong{color:#ba0000;}form.wikiformrich{background-color:#eee;}.wiki,.named-wiki{text-decoration:none;font-weight:normal;}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold;}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Arial,Helvetica,sans-serif;white-space:nowrap;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;color:#006;}h1 .backlinks{text-decoration:underline;}.wikipage{font-weight:normal;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.feedback{font-weight:bold;border-width:2px;border-style:solid;background-color:#DFD;border-color:green;padding:.5em;}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/main.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/main.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/main.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
 /**
- *  $Id: main.css 7331 2010-04-15 09:04:51Z vargenau $
- */ 
+ *  $Id: main.css 7989 2011-03-10 13:04:24Z vargenau $
+ */
 
 /*
 ** MediaWiki 'monobook' style sheet for CSS2-capable browsers.
@@ -11,34 +11,34 @@
 ** and the Plone 2.0 styles, see http://plone.org/ (Alexander Limi, Joe Geldart & Tom Croucher,
 ** Michael Zeltner and Geir Bækholt)
 ** All you guys rock :)
-** Added phpwiki integration: Reini Urban, based on the phpwiki.css 
+** Added phpwiki integration: Reini Urban, based on the phpwiki.css
 ** by Jeff Dairiki
 */
 
 #column-content {
-	width: 100%;
-	float: right;
-	margin: 0 0 .6em -12.2em;
-	padding: 0;
-	height: 1%;
+    width: 100%;
+    float: right;
+    margin: 0 0 .6em -12.2em;
+    padding: 0;
+    height: 1%;
 }
 #content {
-	position: relative;
-	z-index: 2;
-	margin: 2.8em 0 0 12.2em;
-	padding: 0 1em 1.5em 1em;
-	background: white;
-	color: black;
-	border: 1px solid #aaa;
-	border-right: none;
-	line-height: 1.5em;
+    position: relative;
+    z-index: 2;
+    margin: 2.8em 0 0 12.2em;
+    padding: 0 1em 1.5em 1em;
+    background-color: white;
+    color: black;
+    border: 1px solid #aaa;
+    border-right: none;
+    line-height: 1.5em;
 }
 #column-one {
-	position: absolute;
-	/*z-index: 3;*/
-	padding-top: 160px;
-	top: 0;
-	left: 0;
+    position: absolute;
+    /*z-index: 3;*/
+    padding-top: 160px;
+    top: 0;
+    left: 0;
 }
 /* the left column width is specified in class .portlet */
 
@@ -49,76 +49,76 @@
 */
 
 body {
-	font: small sans-serif;
-	background: #f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;
-	color: black;
-	margin: 0;
-	padding: 0;
+    font: small sans-serif;
+    background: #f9f9f9 url("images/headbg.jpg") 0 0 no-repeat;
+    color: black;
+    margin: 0;
+    padding: 0;
 }
 
 /* scale back up to a sane default */
 #globalWrapper {
-	font-size: 127%;
-	width: 100%;
-	margin: 0;
-	padding: 0;
+    font-size: 127%;
+    width: 100%;
+    margin: 0;
+    padding: 0;
 }
 .visualClear {
-	clear: both;
+    clear: both;
 }
 
 /* general styles */
 
 table {
-  	font-size: 100%;
-	color: black;
+      font-size: 100%;
+    color: black;
 }
 a {
-	text-decoration: none;
-	color: #002bb8;
-	background: none;
+    text-decoration: none;
+    color: #002bb8;
+    background-image: none;
 }
 a:visited {
-	color: #5a3696;
+    color: #5a3696;
 }
 a:active {
-	color: #faa700;
+    color: #faa700;
 }
 a:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 a.stub {
-	color: #772233;
+    color: #772233;
 }
 img {
-	border: none;
-	vertical-align: middle;
+    border: 0;
+    vertical-align: middle;
 }
 p {
-	margin: .4em 0 .5em 0;
-	line-height: 1.5em;
+    margin: .4em 0 .5em 0;
+    line-height: 1.5em;
 }
 p img {
-	margin: 0;
+    margin: 0;
 }
 
 hr {
-	height: 1px;
-	color: #aaa;
-	background-color: #aaa;
-	border: 0;
-	margin: .2em 0 .2em 0;
+    height: 1px;
+    color: #aaa;
+    background-color: #aaa;
+    border: 0;
+    margin: .2em 0 .2em 0;
 }
 
 h1, h2, h3, h4, h5, h6 {
-	color: black;
-	background: none;
-	font-weight: bold;
-	font-family: Tahoma, sans-serif;
-	margin: 0;
-	padding-top: 0.5em;
-	padding-bottom: 0.17em;
-	border-bottom: 1px solid #aaa;
+    color: black;
+    background-image: none;
+    font-weight: bold;
+    font-family: Tahoma, sans-serif;
+    margin: 0;
+    padding-top: 0.5em;
+    padding-bottom: 0.17em;
+    border-bottom: 1px solid #aaa;
 }
 h1 { font-size: 188%; }
 h2 { font-size: 150%; }
@@ -126,97 +126,97 @@
 h4 { font-size: 116%; }
 h5 { font-size: 100%; }
 h6 { font-size: 80%;  }
-h4, h5, h6 { 
-	border-bottom: none;
-	font-weight: normal;
+h4, h5, h6 {
+    border-bottom: none;
+    font-weight: normal;
 }
 
 /* Because in some cases there is a <p> in nested lists */
 li p { margin:0; }
 
-ul { 
-	line-height: 1.5em;
-	list-style-type: square;
-	margin: 0.3em 0 0 1.5em;
-	padding:0;
-	list-style-image: url("images/bullet.png");
+ul {
+    line-height: 1.5em;
+    list-style-type: square;
+    margin: 0.3em 0 0 1.5em;
+    padding:0;
+    list-style-image: url("images/bullet.png");
 }
 ol {
-	line-height: 1.5em;
-	margin: 0.3em 0 0 3.2em;
-	padding:0;
-	list-style-image: none;
+    line-height: 1.5em;
+    margin: 0.3em 0 0 3.2em;
+    padding:0;
+    list-style-image: none;
 }
-li {	margin-bottom: 0.1em; }
-dt { 
-  	font-weight: bold; 
-	margin-bottom: .1em;
+li {    margin-bottom: 0.1em; }
+dt {
+      font-weight: bold;
+    margin-bottom: .1em;
 }
 dl {
-	margin-top: .2em;
-	margin-bottom: .5em;
+    margin-top: .2em;
+    margin-bottom: .5em;
 }
 dd {
-	line-height: 1.5em;
-	margin-left: 2em;
-	margin-bottom: .1em;
+    line-height: 1.5em;
+    margin-left: 2em;
+    margin-bottom: .1em;
 }
 
 fieldset {
-	border: 1px solid #2f6fab;
-	margin: 1em 0 1em 0;
-	padding: 0 1em 1em 1em;
-	line-height: 1.5em;
+    border: 1px solid #2f6fab;
+    margin: 1em 0 1em 0;
+    padding: 0 1em 1em 1em;
+    line-height: 1.5em;
 }
 legend {
-	/*background: white;*/
-	padding: 0.5em;
-	font-size: 95%;
+    /*background: white;*/
+    padding: 0.5em;
+    font-size: 95%;
 }
 form {
-	border: none;
-	margin: 0;
+    border: none;
+    margin: 0;
 }
 
 textarea {
-	width: 100%;
-	padding: .1em;
+    width: 100%;
+    padding: .1em;
 }
 
 input.historysubmit {
-	padding: 0 0.3em 0.3em 0.3em !important;
-	font-size: 94%;
-	cursor: pointer;
-	height: 1.7em !important;
-	margin-left: 1.6em;
+    padding: 0 0.3em 0.3em 0.3em !important;
+    font-size: 94%;
+    cursor: pointer;
+    height: 1.7em !important;
+    margin-left: 1.6em;
 }
 select {
-	vertical-align: top;
+    vertical-align: top;
 }
 abbr, acronym, .explain {
-	border-bottom: 1px dotted black;
-	color: black;
-	background: none;
-	cursor: help;
+    border-bottom: 1px dotted black;
+    color: black;
+    background-image: none;
+    cursor: help;
 }
 q {
-	font-family: Times, "Times New Roman", serif;
-	font-style: italic;
+    font-family: Times, "Times New Roman", serif;
+    font-style: italic;
 }
 /* disabled for now
 blockquote {
-	font-family: Times, "Times New Roman", serif;
-	font-style: italic;
+    font-family: Times, "Times New Roman", serif;
+    font-style: italic;
 }*/
 code {
-	background-color: #f9f9f9;
+    background-color: #f9f9f9;
 }
 pre {
-	padding: 1em;
-	border: 1px dashed #2f6fab;
-	color: black;
-	background-color: #f9f9f9;
-	line-height: 1.1em;
+    padding: 1em;
+    border: 1px dashed #2f6fab;
+    color: black;
+    background-color: #f9f9f9;
+    line-height: 1.1em;
 }
 
 /*
@@ -225,108 +225,108 @@
 
 #siteSub { display: none; }
 #jump-to-nav {
-	display: none;
+    display: none;
 }
 #contentSub {
-	font-size: 84%;
-	line-height: 1.2em;
-	margin: 0 0 1.4em 1em;
-	color: #7d7d7d;
-	width: auto;
+    font-size: 84%;
+    line-height: 1.2em;
+    margin: 0 0 1.4em 1em;
+    color: #7d7d7d;
+    width: auto;
 }
 span.subpages { display: block; }
 
 /* Some space under the headers in the content area */
 #bodyContent h1, #bodyContent h2 {
-	margin-bottom: .6em;
+    margin-bottom: .6em;
 }
 #bodyContent h3, #bodyContent h4, #bodyContent h5 {
-	margin-bottom: .3em;
+    margin-bottom: .3em;
 }
 .firstHeading { margin-bottom:0.1em; }
 
 /* user notification thing */
 .usermessage {
-	background-color: #ffce7b;
-	border: 1px solid #ffa500;
-	color: black;
-	font-weight: bold;
-	margin: 2em 0 1em;
-	padding: .5em 1em;
-	vertical-align: middle;
+    background-color: #ffce7b;
+    border: 1px solid #ffa500;
+    color: black;
+    font-weight: bold;
+    margin: 2em 0 1em;
+    padding: .5em 1em;
+    vertical-align: middle;
 }
 #siteNotice {
-	text-align: center;
-	font-size: 95%;
-	padding: 0 .9em;
+    text-align: center;
+    font-size: 95%;
+    padding: 0 .9em;
 }
 #siteNotice p {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 .errorbox, .successbox {
-	font-size: larger;
-	border: 2px solid;
-	padding: .5em 1em;
-	float: left;
-	margin-bottom: 2em;
-	color: #000;
+    font-size: larger;
+    border: 2px solid;
+    padding: .5em 1em;
+    float: left;
+    margin-bottom: 2em;
+    color: #000;
 }
 .errorbox {
-	border-color: red;
-	background-color: #fff2f2;
+    border-color: red;
+    background-color: #fff2f2;
 }
 .successbox {
-	border-color: green;
-	background-color: #dfd;
+    border-color: green;
+    background-color: #dfd;
 }
 .errorbox h2, .successbox h2 {
-	font-size: 1em;
-	font-weight: bold;
-	display: inline;
-	margin: 0 .5em 0 0;
-	border: none;
+    font-size: 1em;
+    font-weight: bold;
+    display: inline;
+    margin: 0 .5em 0 0;
+    border: none;
 }
 
 #catlinks {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	margin-top: 1em;
-	clear: both;
+    border: 1px solid #aaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    margin-top: 1em;
+    clear: both;
 }
 /* currently unused, intended to be used by a metadata box
 in the bottom-right corner of the content area */
 .documentDescription {
-	/* The summary text describing the document */
-	font-weight: bold;
-	display: block;
-	margin: 1em 0;
-	line-height: 1.5em;
+    /* The summary text describing the document */
+    font-weight: bold;
+    display: block;
+    margin: 1em 0;
+    line-height: 1.5em;
 }
 .documentByLine {
-	text-align: right;
-	font-size: 90%;
-	clear: both;
-	font-weight: normal;
-	color: #76797c;
+    text-align: right;
+    font-size: 90%;
+    clear: both;
+    font-weight: normal;
+    color: #76797c;
 }
 
 /* emulate center */
 .center {
-	width: 100%;
-	text-align: center;
+    width: 100%;
+    text-align: center;
 }
 *.center * {
-	margin-left: auto;
-	margin-right: auto;
+    margin-left: auto;
+    margin-right: auto;
 }
 /* small for tables and similar */
 .small, .small * {
-	font-size: 94%;
+    font-size: 94%;
 }
 table.small {
-	font-size: 100%;
+    font-size: 100%;
 }
 
 /*
@@ -334,149 +334,140 @@
 */
 #toc,
 .toc {
-  	width: 200px;
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
-  	float: right;
-  	clear: right;
+      width: 200px;
+    border: 1px solid #aaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    font-size: 95%;
+      float: right;
+      clear: right;
 }
 #toc #toctitle,
 .toc .toctitle,
 .toc #toctitle {
-	display: inline;
-	border: none;
-	padding: 0;
-	font-size: 110%;
-	font-weight: bold;
+    display: inline;
+    border: none;
+    padding: 0;
+    font-size: 110%;
+    font-weight: bold;
 }
 .toc .toclist,
 .toc #toclist {
-	width: auto;
-	border: none;
+    width: auto;
+    border: none;
 }
 #toc #toctitle,
 .toc #toctitle,
 #toc .toctitle,
 .toc .toctitle {
-	text-align: center;
+    text-align: center;
 }
-#toc p, 
-.toc p { 
+#toc p,
+.toc p {
         margin: 0;
 }
 #toc ul,
 .toc ul {
-	width: auto;
-	border: none;
-	line-height: 1.5em;
-	list-style-type: square;
-	list-style-image: url("images/bullet.png");
-	font-size: 95%;
-	margin-left: 5px;
-	padding-left: 5px;
+    width: auto;
+    border: none;
+    line-height: 1.5em;
+    list-style-type: square;
+    list-style-image: url("images/bullet.png");
+    font-size: 95%;
+    margin-left: 5px;
+    padding-left: 5px;
 }
 #toc ul ul,
 .toc ul ul {
-	margin: 0 0 0 2em;
+    margin: 0 0 0 2em;
 }
 #toc .toctoggle,
 .toc .toctoggle {
-	font-size: 94%;
+    font-size: 94%;
 }
 
 .mw-warning {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
+    border: 1px solid #aaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    font-size: 95%;
 }
 .mw-warning {
-	margin-left: 50px;
-	margin-right: 50px;
-	text-align: center;
+    margin-left: 50px;
+    margin-right: 50px;
+    text-align: center;
 }
 
 /* images */
 div.floatright, table.floatright {
-	clear: right;
-	float: right;
-	position: relative;
-	margin: 0 0 .5em .5em;
-	border: 0;
-/*
-	border: .5em solid white;
-	border-width: .5em 0 .8em 1.4em;
-*/
+    clear: right;
+    float: right;
+    position: relative;
+    margin: 0 0 .5em .5em;
+    border: 0;
 }
 div.floatright p { font-style: italic; }
 div.floatleft, table.floatleft {
-	float: left;
-	position: relative;
-	margin: 0 .5em .5em 0;
-	border: 0;
-/*
-	margin: .3em .5em .5em 0;
-	border: .5em solid white;
-	border-width: .5em 1.4em .8em 0;
-*/
+    float: left;
+    position: relative;
+    margin: 0 .5em .5em 0;
+    border: 0;
 }
 div.floatleft p { font-style: italic; }
 /* thumbnails */
 div.thumb {
-	margin-bottom: .5em;
-	border-style: solid;
-	border-color: white;
-	width: auto;
+    margin-bottom: .5em;
+    border-style: solid;
+    border-color: white;
+    width: auto;
 }
 div.thumb div {
-	border: 1px solid #ccc;
-	padding: 3px !important;
-	background-color: #f9f9f9;
-	font-size: 94%;
-	text-align: center;
-	overflow: hidden;
+    border: 1px solid #ccc;
+    padding: 3px !important;
+    background-color: #f9f9f9;
+    font-size: 94%;
+    text-align: center;
+    overflow: hidden;
 }
 div.thumb div a img {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
 }
 div.thumb div div.thumbcaption {
-	border: none;
-	text-align: left;
-	line-height: 1.4em;
-	padding: .3em 0 .1em 0;
+    border: none;
+    text-align: left;
+    line-height: 1.4em;
+    padding: .3em 0 .1em 0;
 }
 div.magnify {
-	float: right;
-	border: none !important;
-	background: none !important;
+    float: right;
+    border-style: none !important;
+    background: none !important;
 }
 div.magnify a, div.magnify img {
-	display: block;
-	border: none !important;
-	background: none !important;
+    display: block;
+    border-style: none !important;
+    background: none !important;
 }
 div.tright {
-	clear: right;
-	float: right;
-	border-width: .5em 0 .8em 1.4em;
+    clear: right;
+    float: right;
+    border-width: .5em 0 .8em 1.4em;
 }
 div.tleft {
-	float: left;
-	margin-right: .5em;
-	border-width: .5em 1.4em .8em 0;
+    float: left;
+    margin-right: .5em;
+    border-width: .5em 1.4em .8em 0;
 }
 
 .hiddenStructure {
-	display: none;
-	speak: none;
+    display: none;
+    speak: none;
 }
 img.tex {
-	vertical-align: middle;
+    vertical-align: middle;
 }
 span.texhtml {
-	font-family: serif;
+    font-family: serif;
 }
 
 /*
@@ -489,104 +480,104 @@
 */
 /* table standards */
 table.rimage {
-	float: right;
-	position: relative;
-	margin-left: 1em;
-	margin-bottom: 1em;
-	text-align: center;
+    float: right;
+    position: relative;
+    margin-left: 1em;
+    margin-bottom: 1em;
+    text-align: center;
 }
 .toccolours {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
+    border: 1px solid #aaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    font-size: 95%;
 }
 div.townBox {
-	position: relative;
-	float: right;
-	background: white;
-	margin-left: 1em;
-	border: 1px solid gray;
-	padding: .3em;
-	width: 200px;
-	overflow: hidden;
-	clear: right;
+    position: relative;
+    float: right;
+    background-color: white;
+    margin-left: 1em;
+    border: 1px solid gray;
+    padding: .3em;
+    width: 200px;
+    overflow: hidden;
+    clear: right;
 }
 div.townBox dl {
-	padding: 0;
-	margin: 0 0 .3em;
-	font-size: 96%;
+    padding: 0;
+    margin: 0 0 .3em;
+    font-size: 96%;
 }
 div.townBox dl dt {
-	background: none;
-	margin: .4em 0 0;
+    background-image: none;
+    margin: .4em 0 0;
 }
 div.townBox dl dd {
-	margin: .1em 0 0 1.1em;
-	background-color: #f3f3f3;
+    margin: .1em 0 0 1.1em;
+    background-color: #f3f3f3;
 }
 
 /*
 ** edit views etc
 */
 .special li {
-	line-height: 1.4em;
-	margin: 0;
-	padding: 0;
+    line-height: 1.4em;
+    margin: 0;
+    padding: 0;
 }
 
 /*
 ** RecentChanges
 */
-.pageinfo-majoredit { 
-	font-weight: normal; /*bold;*/
+.pageinfo-majoredit {
+    font-weight: normal; /*bold;*/
 }
 .wiki-summary {
-		font-size: 94%;
-		font-style: italic;
+        font-size: 94%;
+        font-style: italic;
 }
 
 /* Page history styling */
 /* the auto-generated edit comments */
 .autocomment {
-	color: gray;
+    color: gray;
 }
 #pagehistory span.user {
-	margin-left: 1.4em;
-	margin-right: .4em;
+    margin-left: 1.4em;
+    margin-right: .4em;
 }
 #pagehistory span.minor {
-	font-weight: bold;
+    font-weight: bold;
 }
 #pagehistory li {
-	border: 1px solid white;
+    border: 1px solid white;
 }
 #pagehistory li.selected {
-	background-color: #f9f9f9;
-	border: 1px dashed #aaa;
+    background-color: #f9f9f9;
+    border: 1px dashed #aaa;
 }
 
 /*
 ** Diff rendering (unused)
 */
 table.diff, td.diff-otitle, td.diff-ntitle {
-	background-color: white;
+    background-color: white;
 }
 td.diff-addedline {
-	background: #cfc;
-	font-size: smaller;
+    background-color: #cfc;
+    font-size: smaller;
 }
 td.diff-deletedline {
-	background: #ffa;
-	font-size: smaller;
+    background-color: #ffa;
+    font-size: smaller;
 }
 td.diff-context {
-	background: #eee;
-	font-size: smaller;
+    background-color: #eee;
+    font-size: smaller;
 }
 span.diffchange {
-	color: red;
-	font-weight: bold;
+    color: red;
+    font-weight: bold;
 }
 
 /**
@@ -594,119 +585,88 @@
  */
 /* main box */
 .diff {
-	margin-top:    1ex;
-	margin-bottom: 0.5ex;
-	background: white;
-	/* Netscape 4 requires this 1px border.
-	 Without it, the paper borders below cause
-	 the white background to disappear. */
-	border: 1px #ccc solid;
-	color: black;
-	border-top: 1px solid #494f5d;
-	border-left:  1px solid #494f5d;
-	border-bottom:  1px solid #c6d2de;
-	border-right: 1px solid #c6d2de;
-	padding-top:    1px;
-	padding-bottom: 1px;
-	padding-left:  .125em;
-	padding-right: .125em;
-	padding: 0;
-	/* "paper" borders */
-	/*border-top: 2px #d2d2d2 solid;
-	border-left:  2px #b2b2b2 solid;
-	border-bottom:  2px #e8e6df solid;
-	border-right: 2px #e8e6df solid;*/
-/*  border-style: inset;*/
-	/*This breaks Netscape 4: (display does not go full width).
-	 * width: auto;
-	 */
-	/* I'm not sure what the intent of this was, but it's
-	 *  not valid CSS: */
-	/* display: editarea; */
-	clear: both;
+    margin-top:    1ex;
+    margin-bottom: 0.5ex;
+    background-color: white;
+    color: black;
+    border-top: 1px solid #494f5d;
+    border-left:  1px solid #494f5d;
+    border-bottom:  1px solid #c6d2de;
+    border-right: 1px solid #c6d2de;
+    padding-top:    1px;
+    padding-bottom: 1px;
+    padding-left:  .125em;
+    padding-right: .125em;
+    padding: 0;
+    clear: both;
 }
 .diff .block {
-	background: #ddd;
-	padding-left: 1em;
-	/* for NS4 */
-	/*border: none;*/
+    background-color: #ddd;
+    padding-left: 1em;
 }
 
 /* individual blocks */
 .diff .context {
-	background: white;
-	/* for NS4 */
-	border: none;
+    background-color: white;
+    border: none;
 }
 /* entire difftextblock */
 .difftext {
-	margin-top:    0;
-	margin-bottom: 0;
-	background: white;
-	/* Netscape 4 requires this 1px border.
-	 Without it, the paper borders below cause
-	 the white background to disappear. */
-	border: 1px black solid;
-	/* "paper" borders */
-	border-top:  1px #e8e6df solid;
-	border-left: 1px #e8e6df solid;
-	border-bottom: 1px #d2d2d2 solid;
-	border-right:  1px #b2b2b2 solid;
-	padding-left:  0em; 
-	padding-right: 0em;
-	padding-top:    0ex;
-	padding-bottom: 0ex;
-	/*This breaks Netscape 4: (display does not go full width).
-	 * width: auto;
-	 */
-	clear: both;
+    margin-top:    0;
+    margin-bottom: 0;
+    background-color: white;
+    border-top:  1px #e8e6df solid;
+    border-left: 1px #e8e6df solid;
+    border-bottom: 1px #d2d2d2 solid;
+    border-right:  1px #b2b2b2 solid;
+    padding-left:  0em;
+    padding-right: 0em;
+    padding-top:    0ex;
+    padding-bottom: 0ex;
+    clear: both;
 }
 /* + - line prefix */
 .diff .block tt {
-	font-weight: normal;
-	font-family: monospace;
-	color: black;
-	/* for NS4 */
-	margin-left: 0;
-	border: none;
+    font-weight: normal;
+    font-family: monospace;
+    color: black;
+    margin-left: 0;
+    border: none;
 }
 /* changed words */
 .diff del, .diff ins {
-	font-weight: bold;
-	text-decoration: none;
+    font-weight: bold;
+    text-decoration: none;
 }
 
 /* blocks containing deleted or added words */
 .diff .original, .diff .deleted,
 .diff .final, .diff .added {
-	background: white;
+    background-color: white;
 }
 /* blocks containing deleted words */
 .diff .original, .diff .deleted {
-	background: #fcc;
-	/* for NS4 */
-	border: none;
+    background-color: #fcc;
+    border: none;
 }
 /* blocks containing added words */
 .diff .final, .diff .added {
-	background: #cfc;
-	/* for NS4 */
-	border: none;
+    background-color: #cfc;
+    border: none;
 }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 /* deleted words */
-.diff del { background: #f99; }
+.diff del { background-color: #f99; }
 /* added words */
-.diff ins { background: #9f9; }
+.diff ins { background-color: #9f9; }
 
 /**
  * PageHistory, Info
  */
 td.pageinfo { font-weight: bold; }
 .pageinfo-minoredit, .pageinfo-authorid {
-	font-size: smaller;
-	font-style: oblique;
+    font-size: smaller;
+    font-style: oblique;
 }
 
 /* RssFeed */
@@ -720,34 +680,34 @@
  * Calendar plugin
  */
 table.cal {
-	border: 1px outset gray;
-	background: white;
-	margin: 0.5ex 0.5em;
-	padding: 1px;
-	/* For Mozilla */
-	empty-cells: hide;
-} 
+    border: 1px outset gray;
+    background-color: white;
+    margin: 0.5ex 0.5em;
+    padding: 1px;
+    /* For Mozilla */
+    empty-cells: hide;
+}
 
 /* cells */
 table.cal td {
-	background: white;
-	text-align: right;
-} 
+    background-color: white;
+    text-align: right;
+}
 
 /* Month-name header */
 table.cal-header { font-size: larger; }
 table.cal-header tr, table.cal-header td { text-align: center; }
 .cal-arrow {
-	font-weight: bold;
-	text-decoration: none;
+    font-weight: bold;
+    text-decoration: none;
 }
 
 /* Day-names header */
 table.cal tbody tr .cal-dayname {  }
 .cal-dayname td {
-	text-align: center;
-	font-size: smaller;
-	text-decoration: underline;
+    text-align: center;
+    font-size: smaller;
+    text-decoration: underline;
 }
 
 /* Individual days */
@@ -756,60 +716,60 @@
 /* Today */
  /* cell */
 table.cal td.cal-today {
-	margin: 1px;
-	border: 1px solid gray;
+    margin: 1px;
+    border: 1px solid gray;
 }
  /* text */
 table.cal td.cal-today a.cal-hide {  }
 
-/* 
+/*
 ** keep the whitespace in front of the ^=, hides rule from konqueror
-** this is css3, the validator doesn't like it when validating as css2 
+** this is css3, the validator doesn't like it when validating as css2
 */
 #bodyContent a.external,
 #bodyContent a[href ^="gopher://"] {
-	background: url("images/url.png") center right no-repeat;
-	padding-right: 13px;
+    background: url("images/url.png") center right no-repeat;
+    padding-right: 13px;
 }
 #bodyContent a[href ^="https://"],
 .link-https {
-	background: url("images/lock_icon.png") center right no-repeat;
-	padding-right: 16px;
+    background: url("images/lock_icon.png") center right no-repeat;
+    padding-right: 16px;
 }
 #bodyContent a[href ^="mailto:"],
 .link-mailto {
-	background: url("images/mail_icon.png") center right no-repeat;
-	padding-right: 18px;
+    background: url("images/mail_icon.png") center right no-repeat;
+    padding-right: 18px;
 }
 #bodyContent a[href ^="news://"] {
-	background: url("images/news_icon.png") center right no-repeat;
-	padding-right: 18px;
+    background: url("images/news_icon.png") center right no-repeat;
+    padding-right: 18px;
 }
 #bodyContent a[href ^="ftp://"],
 .link-ftp {
-	background: url("images/file_icon.png") center right no-repeat;
-	padding-right: 18px;
+    background: url("images/file_icon.png") center right no-repeat;
+    padding-right: 18px;
 }
 #bodyContent a[href ^="irc://"],
 .link-irc {
-	background: url("images/discussionitem_icon.png")  center right no-repeat;
-	padding-right: 18px;
+    background: url("images/discussionitem_icon.png")  center right no-repeat;
+    padding-right: 18px;
 }
 /* disable interwiki styling */
 #bodyContent a.extiw,
 #bodyContent a.extiw:active {
-	color: #36b;
-	background: none;
-	padding: 0;
+    color: #36b;
+    background-image: none;
+    padding: 0;
 }
 #bodyContent a.external {
-	color: #36b;
+    color: #36b;
 }
 /* this can be used in the content area to switch off
 special external link styling */
 #bodyContent .plainlinks a {
-	background: none !important;
-	padding: 0 !important;
+    background: none !important;
+    padding: 0 !important;
 }
 /*
 ** Structural Elements
@@ -819,104 +779,104 @@
 ** general portlet styles (elements in the quickbar)
 */
 .portlet {
-	border: none;
-	margin: 0 0 .5em;
-	padding: 0;
-	float: none;
-	width: 11.6em;
-	overflow: hidden;
+    border: none;
+    margin: 0 0 .5em;
+    padding: 0;
+    float: none;
+    width: 11.6em;
+    overflow: hidden;
 }
 .portlet h4 {
-	font-size: 95%;
-	font-weight: normal;
-	white-space: nowrap;
+    font-size: 95%;
+    font-weight: normal;
+    white-space: nowrap;
 }
-.portlet h5 { 
-	background: transparent;
-	padding: 0em 1em 0em 0.5em;
-	text-transform: lowercase;
-	display: inline;
-	font-size: 91%;
-	height: 1em;
-	font-weight: normal;
-	white-space: nowrap;
+.portlet h5 {
+    background-color: transparent;
+    padding: 0em 1em 0em 0.5em;
+    text-transform: lowercase;
+    display: inline;
+    font-size: 91%;
+    height: 1em;
+    font-weight: normal;
+    white-space: nowrap;
 }
-.portlet h6 { 
-	background: #ffae2e;
-	border: 1px solid #2f6fab;
-	border-style: solid solid none solid;
-	padding: 0em 1em 0em 1em;
-	text-transform: lowercase;
-	display: block;
-	font-size: 1em;
-	height: 1.2em;
-	font-weight: normal;
-	white-space: nowrap;
+.portlet h6 {
+    background-color: #ffae2e;
+    border: 1px solid #2f6fab;
+    border-style: solid solid none solid;
+    padding: 0em 1em 0em 1em;
+    text-transform: lowercase;
+    display: block;
+    font-size: 1em;
+    height: 1.2em;
+    font-weight: normal;
+    white-space: nowrap;
 }
 .pBody {
-	font-size: 95%;
-	background-color: white;
-	color: black;
-	border-collapse: collapse;
-	border: 1px solid #aaa;
-	padding: 0 .8em .3em .5em;
+    font-size: 95%;
+    background-color: white;
+    color: black;
+    border-collapse: collapse;
+    border: 1px solid #aaa;
+    padding: 0 .8em .3em .5em;
 }
 .portlet h1,
 .portlet h2,
 .portlet h3,
 .portlet h4 {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 .portlet ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	list-style-image: url("images/bullet.png");
-	font-size:95%;
+    line-height: 1.5em;
+    list-style-type: square;
+    list-style-image: url("images/bullet.png");
+    font-size:95%;
 }
 .portlet li {
-	padding:0;
-	margin: 0 0 0 0;
-	margin-bottom: 0;
+    padding:0;
+    margin: 0 0 0 0;
+    margin-bottom: 0;
 }
 
-/* 
-** Logo properties 
+/*
+** Logo properties
  * Optionally at the right also an image
 */
 
 #p-logo {
-	position: absolute; /*needed to use z-index */
-	z-index: 3;
-	top: 0;
-	left: 0;
-	height: 155px;
-	width: 12em;
-	overflow: visible;
+    position: absolute; /*needed to use z-index */
+    z-index: 3;
+    top: 0;
+    left: 0;
+    height: 155px;
+    width: 12em;
+    overflow: visible;
 }
 #p-logo h5 {
-	display: none;
+    display: none;
 }
 #p-logo a,
 #p-logo a:hover {
-	display: block;
-	height: 155px;
-	width: 12.2em;
-	background-repeat: no-repeat;
-	background-position: 35% 50% !important;
-	text-decoration: none;
+    display: block;
+    height: 155px;
+    width: 12.2em;
+    background-repeat: no-repeat;
+    background-position: 35% 50% !important;
+    text-decoration: none;
 }
 /* At the right we put a small "wiki star" */
 #img-logo-right {
-	position: absolute;
-	z-index: 4;
-	top:  0;
-	right: 0;
-	height: 86px;
-	width: 86px;
-	background: url("images/wiki_stamp.png") left no-repeat;
-	background-repeat: no-repeat;
-	overflow: visible;
+    position: absolute;
+    z-index: 4;
+    top:  0;
+    right: 0;
+    height: 86px;
+    width: 86px;
+    background: url("images/wiki_stamp.png") left no-repeat;
+    background-repeat: no-repeat;
+    overflow: visible;
 }
 
 /*
@@ -924,21 +884,21 @@
 */
 
 #p-navigation {
-	position: relative;
-	z-index: 3;
+    position: relative;
+    z-index: 3;
 }
 #p-navigation .pBody {
-	padding-right: 0;
+    padding-right: 0;
 }
 
 #p-navigation a {
-	display: block;
+    display: block;
 }
 
 #p-navigation li.active a, #p-navigation li.active a:hover {
-	text-decoration: none;
-	display: inline;
-	font-weight: bold;
+    text-decoration: none;
+    display: inline;
+    font-weight: bold;
 }
 
 
@@ -946,32 +906,32 @@
 ** Search portlet
 */
 #p-search {
-	position:relative;
-	z-index: 3;
+    position:relative;
+    z-index: 3;
 }
 input.searchButton {
-	margin-top:1px;
-	padding: 0 0.4em !important;
-	font-size: 95%;
-	cursor: pointer;
-	background-color: White;
-	border: 1px solid #2f6fab;
+    margin-top:1px;
+    padding: 0 0.4em !important;
+    font-size: 95%;
+    cursor: pointer;
+    background-color: White;
+    border: 1px solid #2f6fab;
 }
 #searchGoButton {
-	padding-left: .5em;
-	padding-right: .5em;
-	font-weight: bold;
+    padding-left: .5em;
+    padding-right: .5em;
+    font-weight: bold;
 }
 /*#searchInput, */
 #livesearch, #p-search input.dropdown {
-	text-align: left;
-	width: 9.9em;
-	/*margin: 0;*/
-	font-size: 95%;
+    text-align: left;
+    width: 9.9em;
+    /*margin: 0;*/
+    font-size: 95%;
 }
 #p-search .pBody {
-	padding: .5em .4em .4em .4em;
-	text-align: center;
+    padding: .5em .4em .4em .4em;
+    text-align: center;
 }
 
 /*
@@ -979,83 +939,83 @@
 */
 
 #p-personal {
-	position:absolute;
-	z-index: 4;
-	width:40em;
-	white-space:nowrap;
-	padding:0 0 0 0;
-	margin:0;
-	right: 90px;
-	top:0.1em;
-	border: none;
-	overflow: visible;
-	color: black;
-	line-height: 1.2em;
+    position:absolute;
+    z-index: 4;
+    width:40em;
+    white-space:nowrap;
+    padding:0 0 0 0;
+    margin:0;
+    right: 90px;
+    top:0.1em;
+    border: none;
+    overflow: visible;
+    color: black;
+    line-height: 1.2em;
 }
 
 #p-personal h5 {
-	display:none;
+    display:none;
 }
 #p-personal .portlet,
 #p-personal .pBody {
-	z-index: 0;
-	padding:0;
-	margin:0;
-	border: none;
-	overflow: visible;
-	background: none;
+    z-index: 0;
+    padding:0;
+    margin:0;
+    border: none;
+    overflow: visible;
+    background-image: none;
 }
 /* this is the ul contained in the portlet */
 #p-personal ul {
-	z-index: 0;
-	border: none;
-	line-height: 1.5em;
-	color: #2f6fab;
-	padding: 0em 2em 0 3em;
-	margin: 0;
-	text-align: right;
-	/*text-transform: lowercase;*/
-	list-style: none;
-	background: none;
-	cursor: default;
+    z-index: 0;
+    border: none;
+    line-height: 1.5em;
+    color: #2f6fab;
+    padding: 0em 2em 0 3em;
+    margin: 0;
+    text-align: right;
+    /*text-transform: lowercase;*/
+    list-style: none;
+    background-image: none;
+    cursor: default;
 }
 #p-personal li {
-	z-index: 0;
-	border:none;
-	padding:0;
-	display: inline;
-	color: #2f6fab;
-	margin-left: 1em;
-	line-height: 1.2em;
-	background: none;
+    z-index: 0;
+    border:none;
+    padding:0;
+    display: inline;
+    color: #2f6fab;
+    margin-left: 1em;
+    line-height: 1.2em;
+    background-image: none;
 }
 #p-personal li.active {
-	font-weight: bold;
+    font-weight: bold;
 }
 #p-personal li a {
-	text-decoration: none;
-	color: #005896;
-	padding-bottom: 0.2em;
-	background: none;
+    text-decoration: none;
+    color: #005896;
+    padding-bottom: 0.2em;
+    background-image: none;
 }
 #p-personal li a:hover {
-	background-color: white;
-	padding-bottom: .2em;
-	text-decoration: none;
+    background-color: white;
+    padding-bottom: .2em;
+    text-decoration: none;
 }
 #p-personal li.active a:hover {
-	background-color: transparent;
+    background-color: transparent;
 }
 /* the icon in front of the user name, single quotes
 in bg url to hide it from iemac */
 li#pt-userpage,
 li#pt-anonuserpage,
 li#pt-login {
-	/*background:  url('images/wikiuser.png') top left bottom no-repeat;*/
-	background:  url('images/wikiuser.png') left no-repeat;
-	background-repeat: no-repeat;
-	padding-left: 20px;
-	text-transform: none;
+    /*background:  url('images/wikiuser.png') top left bottom no-repeat;*/
+    background:  url('images/wikiuser.png') left no-repeat;
+    background-repeat: no-repeat;
+    padding-left: 20px;
+    text-transform: none;
 }
 #p-personal a.new { color:#ba0000; }
 
@@ -1063,96 +1023,96 @@
 ** the page-related actions- page/talk, edit etc
 */
 #p-cactions {
-	position: absolute;
-	/*z-index: 1;*/ /* important! */
-	top: 1.3em;
-	left: 11.5em;
-	margin: 0;
-	white-space: nowrap;
-	width: 76%;
-	line-height: 1.1em;
-	overflow: visible;
-	background: none;
-	border-collapse: collapse;
-	padding-left: 1em;
-	list-style: none;
-	font-size: 95%;
+    position: absolute;
+    /*z-index: 1;*/ /* important! */
+    top: 1.3em;
+    left: 11.5em;
+    margin: 0;
+    white-space: nowrap;
+    width: 76%;
+    line-height: 1.1em;
+    overflow: visible;
+    background-image: none;
+    border-collapse: collapse;
+    padding-left: 1em;
+    list-style: none;
+    font-size: 95%;
 }
 #p-cactions .hiddenStructure {
-	display: none;
+    display: none;
 }
 #p-cactions ul {
-	list-style: none;
+    list-style: none;
 }
 #p-cactions li {
-	display: inline;
-	border: 1px solid #aaa;
-	border-bottom: none;
-	padding: 0 0 .1em 0;
-	margin: 0 .3em 0 0;
-	overflow: visible;
-	background: white;
+    display: inline;
+    border: 1px solid #aaa;
+    border-bottom: none;
+    padding: 0 0 .1em 0;
+    margin: 0 .3em 0 0;
+    overflow: visible;
+    background-color: white;
 }
 #p-cactions li.selected {
-	border-color: #fabd23;
-	padding: 0 0 0.2em 0 !important;
+    border-color: #fabd23;
+    padding: 0 0 0.2em 0 !important;
 }
 #p-cactions li a {
-	position: relative;
-	z-index: 0;
-	background-color: #fbfbfb;
-	color: #002bb8;
-	border: none;
-	padding: 0 .8em .3em;
-	text-decoration: none;
-	/*text-transform: lowercase;*/
-	margin: 0;
+    position: relative;
+    z-index: 0;
+    background-color: #fbfbfb;
+    color: #002bb8;
+    border: none;
+    padding: 0 .8em .3em;
+    text-decoration: none;
+    /*text-transform: lowercase;*/
+    margin: 0;
 }
 #p-cactions li.selected a {
-	z-index: 3;
-	background-color: #fff;
-	padding: 0 1em 0.2em;
+    z-index: 3;
+    background-color: #fff;
+    padding: 0 1em 0.2em;
 }
 #p-cactions .new a {
-	color: #ba0000;
+    color: #ba0000;
 }
 #p-cactions li a:hover {
-	z-index: 3;
-	text-decoration: none;
-	background-color: #dedede;
+    z-index: 3;
+    text-decoration: none;
+    background-color: #dedede;
 }
 /* http://universaleditbutton.org */
 #p-cactions li a#btn-edit {
-	background:  url('images/UEB16.png') top left no-repeat;
-	background-repeat: no-repeat;
-	padding-left: 20px !important;
-	text-transform: none;
+    background:  url('images/UEB16.png') top left no-repeat;
+    background-repeat: no-repeat;
+    padding-left: 20px !important;
+    text-transform: none;
 }
 #p-cactions li a#btn-edit:hover {
-	z-index: 3;
-	text-decoration: none;
-	background-color: #fff;
-	/*padding-bottom: 0.3em !important;*/
+    z-index: 3;
+    text-decoration: none;
+    background-color: #fff;
+    /*padding-bottom: 0.3em !important;*/
 }
 #p-cactions h5 {
-	display: none;
+    display: none;
 }
 #p-cactions li.istalk {
-	margin-right: 0;
+    margin-right: 0;
 }
 #p-cactions li.istalk a {
-	padding-right: .5em;
+    padding-right: .5em;
 }
 #p-cactions #ca-addsection a {
-	padding-left: .4em;
-	padding-right: .4em;
+    padding-left: .4em;
+    padding-right: .4em;
 }
 /* offsets to distinguish the tab groups */
 li#ca-talk {
-	margin-right: 1.6em;
+    margin-right: 1.6em;
 }
 li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
-	margin-left: 1.6em;
+    margin-left: 1.6em;
 }
 
 /*
@@ -1160,435 +1120,409 @@
 */
 #p-tbx,
 #p-lang {
-	position: relative;
-	z-index: 3;
+    position: relative;
+    z-index: 3;
 }
 
 /*
 ** footer
 */
 #footer {
-	background-color: white;
-	border-top: 1px solid #fabd23;
-	border-bottom: 1px solid #fabd23;
-	margin: .6em 0 1em 0;
-	border-left: 1px solid #fabd23;
-	margin-left: 13.6em;
-	padding: .4em 0 1.2em 0;
-	text-align: center;
-	font-size: 90%;
+    background-color: white;
+    border-top: 1px solid #fabd23;
+    border-bottom: 1px solid #fabd23;
+    margin: .6em 0 1em 0;
+    border-left: 1px solid #fabd23;
+    margin-left: 13.6em;
+    padding: .4em 0 1.2em 0;
+    text-align: center;
+    font-size: 90%;
 }
 #footer li {
-	display: inline;
-	margin: 0 1.3em;
+    display: inline;
+    margin: 0 1.3em;
 }
 /* hide from incapable browsers */
 head:first-child+body #footer li { white-space: nowrap; }
 #f-poweredbyico, #f-copyrightico {
-	margin: 0 8px;
-	/*vertical-align: middle;*/
-	height: 31px;
-	position: relative;
-	top: -31px; /* Bump it up just a tad */
+    margin: 0 8px;
+    /*vertical-align: middle;*/
+    height: 31px;
+    position: relative;
+    top: -31px; /* Bump it up just a tad */
 }
 #f-poweredbyico {
-	float: right;
+    float: right;
 }
 #f-copyrightico {
-	float: left;
+    float: left;
 }
 
 /* js pref toc */
-#preftoc { 
-	float: left;
-	margin: 1em 1em 1em 1em;
-	width: 13em;
+#preftoc {
+    float: left;
+    margin: 1em 1em 1em 1em;
+    width: 13em;
 }
 #preftoc li { border: 1px solid White; }
-#preftoc li.selected { 
-	background-color:#f9f9f9;
-	border:1px dashed #aaaaaa;
+#preftoc li.selected {
+    background-color:#f9f9f9;
+    border:1px dashed #aaaaaa;
 }
 #preftoc a,
 #preftoc a:active {
-	display: block;
-	color: #0014a6;
+    display: block;
+    color: #0014a6;
 }
-#prefcontrol { 
-	clear: both;
-	float: left;
-	margin-top: 1em;
+#prefcontrol {
+    clear: both;
+    float: left;
+    margin-top: 1em;
 }
-div.prefsectiontip { 
-	font-size: 95%;
-	margin-top: 1em;
+div.prefsectiontip {
+    font-size: 95%;
+    margin-top: 1em;
 }
 fieldset.operaprefsection { margin-left: 15em }
 
-/* 
-** IE/Mac fixes, hope to find a validating way to move this
-** to a separate stylesheet. This would work but doesn't validate: 
-** @import("IEMacFixes.css");
-*/
-
-/* tabs: border on the a, not the div */
-* > html #p-cactions li { border:none; }
-* > html #p-cactions li a {
-	border: 1px solid #aaa;
-	border-bottom: none;
-}
-* > html #p-cactions li.selected a { border-color: #fabd23; }
-/* footer icons need a fixed width */
-* > html #f-poweredbyico,
-* > html #f-copyrightico { width: 88px; }
-* > html #bodyContent,
-* > html #bodyContent pre {
-	width: 100%;
-	padding-bottom: 25px;
-}
-
 /* more IE fixes */
 /* float/negative margin brokenness */
 * html #footer {margin-top: 0;}
 * html #column-content {
-	display: inline;
-	margin-bottom: 0;
+    display: inline;
+    margin-bottom: 0;
 }
 * html div.editsection { font-size: smaller; }
 #pagehistory li.selected { position: relative; }
 
-/* Mac IE 5.0 fix; floated content turns invisible */
-* > html #column-content {
-	float: none;
-}
 * > html #column-one {
-	position: absolute;
-	left: 0;
-	top: 0;
+    position: absolute;
+    left: 0;
+    top: 0;
 }
 * > html #footer {
-	margin-left: 13.2em;
+    margin-left: 13.2em;
 }
 .redirectText {
-	font-size: 150%;
-	margin: 5px;
+    font-size: 150%;
+    margin: 5px;
 }
 
 .printfooter {
-	display: none;
+    display: none;
 }
 
 .not-patrolled {
-	background-color: #ffa;
+    background-color: #ffa;
 }
 div.patrollink {
-	font-size: 75%;
-	text-align: right;
+    font-size: 75%;
+    text-align: right;
 }
 span.newpage, span.minor, span.searchmatch, span.bot {
-	font-weight: bold;
+    font-weight: bold;
 }
 span.unpatrolled {
-	font-weight: bold;
-	color: red;
+    font-weight: bold;
+    color: red;
 }
 
 span.searchmatch {
-	color: red;
+    color: red;
 }
 .sharedUploadNotice {
-	font-style: italic;
+    font-style: italic;
 }
 
 span.updatedmarker {
-	color: black;
-	background-color: #0f0;
+    color: black;
+    background-color: #0f0;
 }
 span.newpageletter {
-	font-weight: bold;
-	color: black;
-	background-color: yellow;
+    font-weight: bold;
+    color: black;
+    background-color: yellow;
 }
 span.minoreditletter {
-	color: black;
-	background-color: #c5ffe6;
+    color: black;
+    background-color: #c5ffe6;
 }
 
 table.gallery {
-	border: 1px solid #ccc;
-	margin: 2px;
-	padding: 2px;
-	background-color: white;
+    border: 1px solid #ccc;
+    margin: 2px;
+    padding: 2px;
+    background-color: white;
 }
 
 table.gallery tr {
-	vertical-align: top;
+    vertical-align: top;
 }
 
 table.gallery td {
-	vertical-align: top;
-	background-color: #f9f9f9;
-	border: solid 2px white;
+    vertical-align: top;
+    background-color: #f9f9f9;
+    border: solid 2px white;
 }
 
 table.gallery td.galleryheader {
-	text-align: center;
-	font-weight: bold;
+    text-align: center;
+    font-weight: bold;
 }
 
 div.gallerybox {
-	margin: 2px;
-	width:  150px;
+    margin: 2px;
+    width:  150px;
 }
 
 div.gallerybox div.thumb {
-	text-align: center;
-	border: 1px solid #ccc;
-	margin: 2px;
+    text-align: center;
+    border: 1px solid #ccc;
+    margin: 2px;
 }
 
 div.gallerytext {
-	font-size: 94%;
-	padding: 2px 4px;
+    font-size: 94%;
+    padding: 2px 4px;
 }
 
 span.comment {
-	font-style: italic;
+    font-style: italic;
 }
 
 span.changedby {
-	font-size: 95%;
+    font-size: 95%;
 }
 
 .previewnote {
-	text-indent: 3em;
-	color: #c00;
-	border-bottom: 1px solid #aaa;
-	padding-bottom: 1em;
-	margin-bottom: 1em;
+    text-indent: 3em;
+    color: #c00;
+    border-bottom: 1px solid #aaa;
+    padding-bottom: 1em;
+    margin-bottom: 1em;
 }
 
 .previewnote p {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 .editExternally {
-	border: 1px solid gray;
-	background-color: #ffffff;
-	padding: 3px;
-	margin-top: 0.5em;
-	float: left;
-	font-size: small;
-	text-align: center;
+    border: 1px solid gray;
+    background-color: #ffffff;
+    padding: 3px;
+    margin-top: 0.5em;
+    float: left;
+    font-size: small;
+    text-align: center;
 }
 .editExternallyHelp {
-	font-style: italic;
-	color: gray;
+    font-style: italic;
+    color: gray;
 }
 
 li span.deleted, span.history-deleted {
-	text-decoration: line-through;
-	color: #888;
-	font-style: italic;
+    text-decoration: line-through;
+    color: #888;
+    font-style: italic;
 }
 
 .toggle {
-	margin-left: 2em;
-	text-indent: -2em;
+    margin-left: 2em;
+    text-indent: -2em;
 }
 
 /* Classes for EXIF data display */
 table.mw_metadata {
-	font-size: 0.8em;
-	margin-left: 0.5em;
-	margin-bottom: 0.5em;
-	width: 300px;
+    font-size: 0.8em;
+    margin-left: 0.5em;
+    margin-bottom: 0.5em;
+    width: 300px;
 }
 
 table.mw_metadata caption {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 table.mw_metadata th {
-	font-weight: normal;
+    font-weight: normal;
 }
 
 table.mw_metadata td {
-	padding: 0.1em;
+    padding: 0.1em;
 }
 
 table.mw_metadata {
-	border: none;
-	border-collapse: collapse;
+    border: none;
+    border-collapse: collapse;
 }
 
 table.mw_metadata td, table.mw_metadata th {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	padding-left: 0.1em;
-	padding-right: 0.1em;
+    text-align: center;
+    border: 1px solid #aaaaaa;
+    padding-left: 0.1em;
+    padding-right: 0.1em;
 }
 
 table.mw_metadata th {
-	background-color: #f9f9f9;
+    background-color: #f9f9f9;
 }
 
 table.mw_metadata td {
-	background-color: #fcfcfc;
+    background-color: #fcfcfc;
 }
 
 table.collapsed tr.collapsable {
-	display: none;
+    display: none;
 }
 
 
 /* filetoc */
 ul#filetoc {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
-	margin-bottom: 0.5em;
-	margin-left: 0;
-	margin-right: 0;
+    text-align: center;
+    border: 1px solid #aaaaaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    font-size: 95%;
+    margin-bottom: 0.5em;
+    margin-left: 0;
+    margin-right: 0;
 }
 
 #filetoc li {
-	display: inline;
-	list-style-type: none;
-	padding-right: 2em;
+    display: inline;
+    list-style-type: none;
+    padding-right: 2em;
 }
 
 /* @bug 1714 */
 input#wpSave, input#wpDiff {
-	margin-right: 0.33em;
+    margin-right: 0.33em;
 }
 
 #editform .editOptions {
-	display: inline;
+    display: inline;
 }
 
 #wpSave {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 /* Classes for article validation */
 
 table.revisionform_default {
-	border: 1px solid #000000;
+    border: 1px solid #000000;
 }
 
 table.revisionform_focus {
-	border: 1px solid #000000;
-	background-color:#00BBFF;
+    border: 1px solid #000000;
+    background-color:#00BBFF;
 }
 
 tr.revision_tr_default {
-	background-color:#EEEEEE;
+    background-color:#EEEEEE;
 }
 
 tr.revision_tr_first {
-	background-color:#DDDDDD;
+    background-color:#DDDDDD;
 }
 
 p.revision_saved {
-	color: green;
-	font-weight:bold;
+    color: green;
+    font-weight:bold;
 }
 
 #mw_trackbacks {
-	border: solid 1px #bbbbff;
-	background-color: #eeeeff;
-	padding: 0.2em;
+    border: solid 1px #bbbbff;
+    background-color: #eeeeff;
+    padding: 0.2em;
 }
 
 
 /* Allmessages table */
 
 #allmessagestable th {
-	background-color: #b2b2ff;
+    background-color: #b2b2ff;
 }
 
 #allmessagestable tr.orig {
-	background-color: #ffe2e2;
+    background-color: #ffe2e2;
 }
 
 #allmessagestable tr.new {
-	background-color: #e2ffe2;
+    background-color: #e2ffe2;
 }
 
 #allmessagestable tr.def {
-	background-color: #f0f0ff;
+    background-color: #f0f0ff;
 }
 
 
 /* noarticletext */
 div.noarticletext {
-	border: 1px solid #ccc;
-	background: #fff;
-	padding: .2em 1em;
-	color: #000;
+    border: 1px solid #ccc;
+    background-color: #fff;
+    padding: .2em 1em;
+    color: #000;
 }
 
 div#searchTargetContainer {
-	left:       10px;
-	top:        10px;
-	width:      90%;
-	background: white;
+    left:       10px;
+    top:        10px;
+    width:      90%;
+    background-color: white;
 }
 
 div#searchTarget {
-	padding:    3px;
-	margin:     5px;
-	background: #F0F0F0;
-	border:     solid 1px blue;
+    padding:    3px;
+    margin:     5px;
+    background-color: #F0F0F0;
+    border:     solid 1px blue;
 }
 
 div#searchTarget ul li {
-	list-style: none;
+    list-style: none;
 }
 
 div#searchTarget ul li:before {
-	color: orange;
-	content: "\00BB \0020";
+    color: orange;
+    content: "\00BB \0020";
 }
 
 div.multipageimagenavbox {
-	 border: solid 1px silver;
-	 padding: 4px;
-	 margin: 1em;
-	 background: #f0f0f0;
+     border: solid 1px silver;
+     padding: 4px;
+     margin: 1em;
+     background-color: #f0f0f0;
 }
 
 div.multipageimagenavbox div.thumb {
-	 border: none;
-	 margin-left: 2em;
-	 margin-right: 2em;
+     border: none;
+     margin-left: 2em;
+     margin-right: 2em;
 }
 
 div.multipageimagenavbox hr {
-	 margin: 6px;
+     margin: 6px;
 }
 
 table.multipageimage td {
-	 text-align: center;
+     text-align: center;
 }
 
 /*
-	Table pager (e.g. Special:Imagelist)
-	- remove underlines from the navigation link
-	- collapse borders
-	- set the borders to outsets (similar to Special:Allmessages)
-	- remove line wrapping for all td and th, set background color
-	- restore line wrapping for the last two table cells (description and size)
+    Table pager (e.g. Special:Imagelist)
+    - remove underlines from the navigation link
+    - collapse borders
+    - set the borders to outsets (similar to Special:Allmessages)
+    - remove line wrapping for all td and th, set background color
+    - restore line wrapping for the last two table cells (description and size)
 */
 .TablePager_nav a { text-decoration: none; }
 .TablePager { border-collapse: collapse; }
-.TablePager, .TablePager td, .TablePager th { 
-	border: 0.15em solid #777777;
-	padding: 0 0.15em 0 0.15em;
+.TablePager, .TablePager td, .TablePager th {
+    border: 0.15em solid #777777;
+    padding: 0 0.15em 0 0.15em;
 }
 .TablePager th { background-color: #eeeeff }
 .TablePager td { background-color: #ffffff }
@@ -1603,38 +1537,38 @@
  * PhpWiki Tables
  */
 .pagelist {
-	font-size: smaller;
+    font-size: smaller;
 }
 .pagelist thead td {
-	background: #e8e8e8;
-	text-decoration: none;
-	font-weight: bold;
+    background-color: #e8e8e8;
+    text-decoration: none;
+    font-weight: bold;
 }
 .pagelist thead td u { text-decoration: none; }
 .pagelist tr { vertical-align: top; }
-.pagelist tr.evenrow { background: #eee; }
-.pagelist tr.oddrow  { background: white; }
+.pagelist tr.evenrow { background-color: #eee; }
+.pagelist tr.oddrow  { background-color: white; }
 th.gridbutton {
-	background-color: ThreeDLightShadow;
-	color: black;
-	font-family: Tahoma, Arial, Helvetica, sans-serif;
-	font-size: small;
-	font-weight: normal;
-	white-space: nowrap;
-	margin: 5px 0px;
-	max-height: 24px;
-	padding: 5px 0px 5px 0px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;
+    background-color: ThreeDLightShadow;
+    color: black;
+    font-family: Tahoma, Arial, Helvetica, sans-serif;
+    font-size: small;
+    font-weight: normal;
+    white-space: nowrap;
+    margin: 5px 0px;
+    max-height: 24px;
+    padding: 5px 0px 5px 0px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;
 }
 input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
-	text-decoration: none;
-	font-size: small;
-	font-weight: normal;
-	font-family: Tahoma, Arial, Helvetica, sans-serif;
-	background-color: ThreeDLightShadow;
-	color: black;
+    text-decoration: none;
+    font-size: small;
+    font-weight: normal;
+    font-family: Tahoma, Arial, Helvetica, sans-serif;
+    background-color: ThreeDLightShadow;
+    color: black;
 }
 
 .wikipaging { font-size: 80% }
@@ -1643,118 +1577,113 @@
 /* plugin BoxRight */
 div.boxright {
   background-color: #e9fbff;
-  width: 200px; 
+  width: 200px;
   right: 10px;
-  padding: 0.5em; 
-  float: right; 
-  border: thin solid #888888; 
   padding: 0.5em;
+  float: right;
+  border: thin solid #888888;
+  padding: 0.5em;
 }
 
-div#bottom {   
-	margin-left:   12.2em;
+div#bottom {
+    margin-left:   12.2em;
 }
-/* PHP Warnings */
-div.errors {
-	color: black;
-	background: #eee;
-	margin-top:    1em;
-	margin-bottom: 1em;
-	padding-left:  0.8em; 
-	padding-right: 0.8em; 
-	padding-top:    0.8ex;
-	padding-bottom: 0;
-	border: medium solid red;
-	clear: both;
+
+.error {
+    color: black;
+    background-color: #eee;
+    margin-top:    1em;
+    margin-bottom: 1em;
+    padding-left:  0.8em;
+    padding-right: 0.8em;
+    padding-top:    0.8ex;
+    padding-bottom: 0;
+    border: medium solid red;
+    clear: both;
 }
-h4.errors {
-	color: red;
-	margin:  0;
-	padding: 0;
-	text-decoration: underline;
+
+.warning {
+    color: black;
+    background-color: #eee;
+    margin-top:    1em;
+    margin-bottom: 1em;
+    padding-left:  0.8em;
+    padding-right: 0.8em;
+    padding-top:    0.8ex;
+    padding-bottom: 0;
+    border: thin solid blue;
+    clear: both;
 }
-div.warning {
-	color: black;
-	background: #eee;
-	margin-top:    1em;
-	margin-bottom: 1em;
-	padding-left:  0.8em; 
-	padding-right: 0.8em; 
-	padding-top:    0.8ex;
-	padding-bottom: 0;
-	border: thin solid blue;
-	clear: both;
-}
 
 /* Debug */
 .debug {
-	color: black;
-	background: white;
-	font-family: monospace;
-	font-size: smaller;
-	margin: 1ex 0;
-	padding: 0.5ex 0.5em;
-	border: medium solid #fff8dc; /* darker ivory */
+    color: black;
+    background-color: white;
+    font-family: monospace;
+    font-size: smaller;
+    margin: 1ex 0;
+    padding: 0.5ex 0.5em;
+    border: medium solid #fff8dc; /* darker ivory */
 }
 /* Hints */
 .hint {
-	color: black;
-	background: #eeeeee;
-	 /* font-size: smaller; */
-	font-style: italic;
-	margin-left: 3em;
-	padding: 0.5ex 0.5em;
-	border: thin solid #aaaaaa;
+    color: black;
+    background-color: #eeeeee;
+     /* font-size: smaller; */
+    font-style: italic;
+    margin-left: 3em;
+    padding: 0.5ex 0.5em;
+    border: thin solid #aaaaaa;
 }
 span.hint {
-	padding: 0;
+    padding: 0;
 }
 /* Disabled Plugins */
 .disabled-plugin
 {
-	clear: both;
-	margin: 1ex 0;
-	padding: 0;
+    clear: both;
+    margin: 1ex 0;
+    padding: 0;
 }
 .disabled-plugin .title {
-	color: #400;
-	background-color: inherit;
-	font-size: x-small;
-	text-align: right;
-	padding: 0 0.5em;
+    color: #400;
+    background-color: inherit;
+    font-size: x-small;
+    text-align: right;
+    padding: 0 0.5em;
 }
 .disabled-plugin pre {
-	color: black;
-	background: #ddd;
-	margin: 0;
-	padding: 0.3ex 0.5em;
+    color: black;
+    background-color: #ddd;
+    margin: 0;
+    padding: 0.3ex 0.5em;
 }
 
 /* "(Redirected from ...)" message. */
 span.redirectfrom {
-	font-size: small;
-	font-style: oblique;
-	font-weight: normal;
-	padding-left: 1em;
+    font-size: small;
+    font-style: oblique;
+    font-weight: normal;
+    padding-left: 1em;
 }
-.search-context { background: white; font-style: oblique; }
+.search-context { background-color: white; font-style: oblique; }
 .search-term {
-	background: yellow;
-	font-weight: normal;
+    background-color: yellow;
+    font-weight: normal;
 }
 
 a.spell-wrong {
-	color:#ba0000; 
-	background: yellow;
+    color:#ba0000;
+    background-color: yellow;
 }
 span.spell-wrong {
-	color:#ba0000; 
+    color:#ba0000;
 }
 
 
 /**
  * Wiki Forms
- * 
+ *
  * The div inside the wikiadmin upload form does not
  * have a class yet, so it must be referenced indirectly
  */
@@ -1767,64 +1696,64 @@
  * Link styles
  */
 .wiki, .named-wiki {
-	text-decoration: none;
-	font-weight: normal;
-	/* font-weight: bold; */
+    text-decoration: none;
+    font-weight: normal;
+    /* font-weight: bold; */
 }
 .wiki relation, .named-wiki relation, .wiki attribute, .named-wiki attribute {
-	font-style: oblique;
-	/* font-weight: normal; */
-	font-weight: bold;
+    font-style: oblique;
+    /* font-weight: normal; */
+    font-weight: bold;
 }
 
 span.relation-symbol {
-	font-weight: bold;
-	font-family: monospace;
-	letter-spacing: 0.1em;
+    font-weight: bold;
+    font-family: monospace;
+    letter-spacing: 0.1em;
 }
 
 /* Action buttons */
 a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe,
 input.wikiaction, input.button, input.wikiadmin {
-	text-decoration: none;
-	font-family: Arial, Helvetica, sans-serif;
-	/* don't wrap text buttons */
-	white-space: nowrap;
-	/*font-size: inherit; */
+    text-decoration: none;
+    font-family: Arial, Helvetica, sans-serif;
+    /* don't wrap text buttons */
+    white-space: nowrap;
+    /*font-size: inherit; */
 }
 
 /*
-a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button { 
-	background-color: #ddd; 
+a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button {
+    background-color: #ddd;
 }
 */
 
 .wikiunsafe { background-color: #fcc; }
 
 /*
-a.wikiadmin, a.wikiadmin:visited, input.wikiadmin  { 
-	background-color: #fdd; 
+a.wikiadmin, a.wikiadmin:visited, input.wikiadmin  {
+    background-color: #fdd;
 }
 */
 
 /* Unknown links */
 .wikiunknown, .named-wikiunknown {
-	font-weight: normal;
-	font-size: 100%;
+    font-weight: normal;
+    font-size: 100%;
 }
  /* QuestionMark #600 */
 .wikiunknown a, .named-wikiunknown a {
-	color: #447;
-	background-color: #eee;
-	text-decoration: none;
-	font-weight: normal;
-	font-size: smaller;
+    color: #447;
+    background-color: #eee;
+    text-decoration: none;
+    font-weight: normal;
+    font-size: smaller;
 }
 
 /* Backlinks */
 .backlinks {
-	text-decoration: underline;
-	color: #006;
+    text-decoration: underline;
+    color: #006;
 }
 h1 .backlinks { text-decoration: underline; }
 
@@ -1919,22 +1848,9 @@
      padding: 0.5em;
 }
 
-/* style for error messages
-   Use this style if you need to display an error, e.g:
-     User does not exist
-*/
-.error {
-    font-weight: bold;
-    border-width: 2px;
-    border-style: solid;
-    background-color: #ffc0cb; /* pink */
-    border-color: red;
-    padding: 0.5em;
-}
-
 #edit-public, h1.firstHeading-public, h1.firstHeading-rating-public {
-	background-color: #ffce7b;
-	border: 1px solid #ffa500;
+    background-color: #ffce7b;
+    border: 1px solid #ffa500;
 }
 
 /* PageTrail plugin */
@@ -1943,7 +1859,8 @@
      padding: 0.2em;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   text-align: right;
   font-style: oblique;
@@ -1966,7 +1883,7 @@
   margin-bottom: 0.1ex;
 }
 .wiki-edithelp {
-  background: white;
+  background-color: white;
   border: medium solid #fff8dc; /* darker ivory */
   padding-left:  0.5em;
   padding-right: 0.5em;

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/rtl-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/rtl-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/rtl-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-body,body *{direction:rtl;unicode-bidi:embed;}#column-content{margin:0 -12.2em 0 0;float:left;}#column-content #content{margin-left:0;margin-right:12.2em;border-right:1px solid #aaa;border-left:none;}html>body .portlet{float:right;clear:right;}*>body .portlet{float:none;clear:none;}.pBody{padding-right:.8em;padding-left:.5em;}.documentByLine,.portletDetails,.portletMore,#p-personal{text-align:left;}div div.thumbcaption{text-align:right;}div.magnify,#div.townBox,#p-logo{left:auto;right:0;}#p-personal{left:auto;right:0;}#p-cactions{left:auto;right:11.5em;padding-left:0;padding-right:1em;}#p-cactions li{margin-left:.3em;margin-right:0;float:right;}* html #p-cactions li a{display:block;padding-bottom:0;}* html #p-cactions li a:hover{padding-bottom:.2em;}li#ca-talk{margin-right:auto;margin-left:1.6em;}li#ca-watch{margin-right:1.6em!important;}ul{margin-left:0;margin-right:1.5em;}ol{margin-left:0;margin-right:2.4em;}dd{margin-left:0;margin-right:1.6em;}#contentSub{margin-right:1em;margin-left:0;}.tocindent{margin-left:0;margin-right:2em;}div.townBox{margin-left:0;margin-right:1em;}div.townBox dl dd{margin-left:0;margin-right:1.1em;}#p-personal li{margin-left:0;margin-right:1em;}li#ca-talk,li#ca-watch{margin-right:auto;margin-left:1.6em;}#p-personal li{float:left;}li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:none;padding-left:0;}.external{padding:0!important;background:none!important;}#footer{clear:both;}* html #footer{margin-left:0;margin-right:13.6em;border-left:0;border-right:1px solid #fabd23;}* html #column-content{float:none;margin-left:0;margin-right:0;}* html #column-content #content{margin-left:0;margin-top:3em;}* html #column-one{right:0;}#preftoc{float:right;}#preftoc li{list-style:none;}#prefcontrol{float:right;}fieldset.prefsection,fieldset.operaprefsection{margin-left:0!important;margin-right:15em;}
\ No newline at end of file
+body,body *{direction:rtl;unicode-bidi:embed;}#column-content{margin:0 -12.2em 0 0;float:left;}#column-content #content{margin-left:0;margin-right:12.2em;border-right:1px solid #aaa;border-left:none;}html>body .portlet{float:right;clear:right;}.pBody{padding-right:.8em;padding-left:.5em;}.documentByLine,.portletDetails,.portletMore,#p-personal{text-align:left;}div div.thumbcaption{text-align:right;}div.magnify,#div.townBox,#p-logo{left:auto;right:0;}#p-personal{left:auto;right:0;}#p-cactions{left:auto;right:11.5em;padding-left:0;padding-right:1em;}#p-cactions li{margin-left:.3em;margin-right:0;float:right;}* html #p-cactions li a{display:block;padding-bottom:0;}* html #p-cactions li a:hover{padding-bottom:.2em;}li#ca-talk{margin-right:auto;margin-left:1.6em;}li#ca-watch{margin-right:1.6em!important;}ul{margin-left:0;margin-right:1.5em;}ol{margin-left:0;margin-right:2.4em;}dd{margin-left:0;margin-right:1.6em;}#contentSub{margin-right:1em;margin-left:0;}.tocindent{margin-left:0;margin-right:2em;}div.townBox{margin-left:0;margin-right:1em;}div.townBox dl dd{margin-left:0;margin-right:1.1em;}#p-personal li{margin-left:0;margin-right:1em;}li#ca-talk,li#ca-watch{margin-right:auto;margin-left:1.6em;}#p-personal li{float:left;}li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:none;padding-left:0;}.external{padding:0!important;background:none!important;}#footer{clear:both;}* html #footer{margin-left:0;margin-right:13.6em;border-left:0;border-right:1px solid #fabd23;}* html #column-content{float:none;margin-left:0;margin-right:0;}* html #column-content #content{margin-left:0;margin-top:3em;}* html #column-one{right:0;}#preftoc{float:right;}#preftoc li{list-style:none;}#prefcontrol{float:right;}fieldset.prefsection,fieldset.operaprefsection{margin-left:0!important;margin-right:15em;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/rtl.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/rtl.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/rtl.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
 /**
- *  $Id: rtl.css 6413 2009-01-19 10:33:24Z vargenau $
- */ 
+ *  $Id: rtl.css 7965 2011-03-07 09:47:31Z vargenau $
+ */
 
 /*
 Right-to-left fixes for MonoBook.
@@ -11,9 +11,6 @@
 Safari bugs (1.2.1):
 * Tabs are still appearing in left-to-right order. (Try after localizing)
 
-Opera bugs (7.23 linux):
-* Some bits of ltr text (sidebar box titles) have forward and backward versions overlapping each other
-
 IE/mac bugs:
 * The thing barfs on Hebrew and Arabic anyway, so no point testing.
 
@@ -24,25 +21,19 @@
 Missing features due to lack of support:
 * external link icons, icon next to user name
 
-To test:
-* Opera6
-* IE 5.0
-* etc
-
 */
 body,
 body * {
     direction: rtl;
-/*    unicode-bidi: bidi-override;*/
     unicode-bidi: embed;
 }
 #column-content {
-	margin: 0 -12.2em 0 0;
-        float: left;
+    margin: 0 -12.2em 0 0;
+    float: left;
 }
 #column-content #content{
-	margin-left: 0;
-	margin-right: 12.2em;
+    margin-left: 0;
+    margin-right: 12.2em;
     border-right: 1px solid #aaaaaa;
     border-left: none;
 }
@@ -50,11 +41,6 @@
     float: right;
     clear: right;
 }
-/* recover IEMac (might be fine with the float, but usually it's close to IE */
-*>body .portlet {
-    float: none;
-    clear: none;
-}
 .pBody {
     padding-right: 0.8em;
     padding-left: 0.5em;
@@ -65,27 +51,27 @@
 .portletDetails,
 .portletMore,
 #p-personal {
-	text-align: left;
+    text-align: left;
 }
 
 div div.thumbcaption {
-	text-align: right;
+    text-align: right;
 }
 
 div.magnify,
 #div.townBox,
 #p-logo {
-	left: auto;
-	right: 0;
+    left: auto;
+    right: 0;
 }
 #p-personal {
-	left: auto;
-	right: 0;
+    left: auto;
+    right: 0;
 }
 
 #p-cactions {
-	left: auto;
-	right: 11.5em;
+    left: auto;
+    right: 11.5em;
         padding-left: 0;
         padding-right: 1em;
 }
@@ -114,42 +100,42 @@
 /* top right bottom left */
 
 ul {
-	margin-left: 0;
-	margin-right: 1.5em;
+    margin-left: 0;
+    margin-right: 1.5em;
 }
 ol {
-	margin-left: 0;
-	margin-right: 2.4em;
+    margin-left: 0;
+    margin-right: 2.4em;
 }
 dd {
-	margin-left: 0;
-	margin-right: 1.6em;
+    margin-left: 0;
+    margin-right: 1.6em;
 }
 #contentSub {
-	margin-right: 1em;
-	margin-left: 0;
+    margin-right: 1em;
+    margin-left: 0;
 }
 .tocindent {
-	margin-left: 0;
-	margin-right: 2em;
+    margin-left: 0;
+    margin-right: 2em;
 }
 div.townBox {
-	margin-left: 0;
-	margin-right: 1em;
+    margin-left: 0;
+    margin-right: 1em;
 }
 div.townBox dl dd {
-	margin-left: 0;
-	margin-right: 1.1em;
+    margin-left: 0;
+    margin-right: 1.1em;
 }
 #p-personal li {
-	margin-left: 0;
-	margin-right: 1em;
+    margin-left: 0;
+    margin-right: 1em;
 }
 
 li#ca-talk,
 li#ca-watch {
-	margin-right: auto;
-	margin-left: 1.6em;
+    margin-right: auto;
+    margin-left: 1.6em;
 }
 
 #p-personal li {
@@ -159,8 +145,8 @@
 li#pt-userpage,
 li#pt-anonuserpage,
 li#pt-login {
-	background: none;
-	padding-left: 0;
+    background: none;
+    padding-left: 0;
 }
 .external {
     padding: 0 !important;
@@ -174,8 +160,8 @@
     margin-right: 13.6em;
     border-left: 0;
     border-right: 1px solid #fabd23;
-} 
-* html #column-content { 
+}
+* html #column-content {
     float: none;
     margin-left: 0;
     margin-right: 0;
@@ -192,7 +178,7 @@
 #preftoc li { list-style: none; }
 #prefcontrol { float: right; }
 fieldset.prefsection,
-fieldset.operaprefsection { 
+fieldset.operaprefsection {
     margin-left: 0 !important;
     margin-right: 15em;
 }

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7633 2010-08-09 14:00:30Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
   //$p = $WikiTheme->tooltipAccessKeyPrefix();
@@ -12,7 +12,7 @@
 <div class="portlet" id="p-cactions">
   <h5><?php echo _("Views") ?></h5>
   <ul>
-    <?php if (!string_ends_with($pagename, _("/Discussion"))) { ?>
+    <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
       <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
       <?php echo ActionButton(array(),
 		       $isActionPage ? _("ActionPage") : _("Article"), 
@@ -54,7 +54,7 @@
     <?php } ?>
 
     <?php if ( $user->isSignedIn() ) { ?>
-      <?php echo ActionButton("WatchPage", _("Watch"), false, 
+      <?php echo ActionButton(_("WatchPage"), _("Watch"), false, 
 		       array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
     <?php } ?>
   </ul>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: body.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 // Todo: set the body attr dynamically. here class="ns-2" for mozilla
 ?>
 <body <?php echo $WikiTheme->getMoreAttr('body') ?>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/browse-footer.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/browse-footer.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse-footer.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse-footer.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php // <hr class="printer" noshade="noshade" /> ?>
     <div class="visualClear"></div>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/browse.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/browse.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/browse.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <?php if ($revision and !$revision->isCurrent()) { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/editpage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/editpage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/editpage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: editpage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <div id="contentSub"></div>
 <?php echo Template("default/editpage") ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/info.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/info.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/info.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: info.tmpl 7651 2010-08-24 14:24:17Z vargenau $');
+// $Id: info.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
@@ -30,7 +30,7 @@
     $size = fmt("%s bytes", $bytes);
 else {
     $kb = round($bytes / 1024, 1);
-    $size = fmt("%s Kb (%s bytes)", $kb, $bytes);
+    $size = fmt("%s KiB (%s bytes)", $kb, $bytes);
 }
 // Count words
 preg_match_all('/\\w+\\W*/', $revision->_data['%content'], $whitespacematches);

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/logo.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/logo.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/logo.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: logo.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: logo.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <div class="portlet" id="p-logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><img src="<?php echo $WikiTheme->getImageURL('logo') ?>" id="logo-img" alt="<?php echo 
 fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
 // With MonoBook it is similar to Sidebar, named boxes at the left.
@@ -16,7 +16,7 @@
       <li><? $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?></li>
       <li id="n-recentcomments"><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li>
       <li id="n-recentnewpages"><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li>
-      <li id="n-likepages"><?php echo Button(array('action'=>'LikePages'),_("Like pages"), $page->getName()) ?></li>
+      <li id="n-likepages"><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li>
       <li id="n-randompage"><?php echo WikiLink(_("RandomPage"), "",_("Random page")) ?></li>
 <li id="n-help"><?php echo WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li>
     </ul>
@@ -49,7 +49,7 @@
   <div class="pBody">
     <ul>
     <?php if ($revision) { ?>
-      <li id="t-whatlinkshere"><?php echo Button(array('action'=>'BackLinks'), _("What links here"), $page->getName()) ?></li>
+      <li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
     <?php } ?>
     <?php $links = $page->getPageLinks(); if ($links->count() > 1) { ?>
       <li id="t-recentchangeslinked"><?php echo $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/tags.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/tags.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/tags.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: tags.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: tags.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- list of most popular categories -->
 <div class="portlet" id="p-tags">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/top.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/top.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/top.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: top.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: top.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- Page title -->
 <a id="top"></a>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/viewsource.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/viewsource.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/templates/viewsource.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: viewsource.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p class="warning_msg"><strong><?php echo _("Note:")?></strong>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7690 2010-09-17 08:46:20Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 /**
  * The new mediawiki (Wikipedia.org) default style.
  * Mediawiki 'monobook' style sheet for CSS2-capable browsers.
@@ -15,13 +15,6 @@
  *
  * Problems with IE: signin is at the left.
  *
- * We don't (yet) support all mediawiki UI options, but we try to.
- * Besides that, maybe the mediawiki folks will see how much better phpwiki
- * will scale, esp. with a true database, not just mysql.
- * Technically phpwiki has about 2-3 years advantage and our plugins
- * cannot destroy the layout.
- * Anyway, the WikiParser perl module (and our php version) will be able to import
- * and convert back and forth.
  */
 require_once('lib/WikiTheme.php');
 require_once('themes/wikilens/themeinfo.php');
@@ -51,7 +44,7 @@
 
 class WikiTheme_MonoBook extends WikiTheme_Wikilens
 {
-  
+
     /* this adds selected to the class */
     function makeActionButton ($action, $label=false, $page_or_rev=false, $options=false) {
         extract($this->_get_name_and_rev($page_or_rev));
@@ -85,106 +78,90 @@
     }
 
     function load() {
-	$this->addMoreHeaders(JavaScript("var ta;\nvar skin = '".$this->_name."';\n"));
-	$this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikibits.js"))));
-	if (isBrowserIE()) {
-	    $ver = browserVersion();
-	    if ($ver > 5.1 and $ver < 5.9)
-		$this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE55Fixes.css'),'all'));
-	    elseif ($ver > 5.5 and $ver < 7.0)
-		$this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE60Fixes.css'),'all'));
-	    elseif ($ver >= 7.0)
-		$this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE70Fixes.css'),'all'));
-	    else
-		$this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE50Fixes.css'),'all'));
-	    unset($ver);
-	    $this->addMoreHeaders("\n");
-	    $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("IEFixes.js"))));
-	    $this->addMoreHeaders("\n");
-	    $this->addMoreHeaders(HTML::Raw('<meta http-equiv="imagetoolbar" content="no" />'));
-	}
-	$this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"'));
+   $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '".$this->_name."';\n"));
+   $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikibits.js"))));
+   if (isBrowserIE()) {
+       $ver = browserVersion();
+       if ($ver > 5.5 and $ver < 7.0)
+      $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE60Fixes.css'),'all'));
+       elseif ($ver >= 7.0)
+      $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE70Fixes.css'),'all'));
+       unset($ver);
+       $this->addMoreHeaders("\n");
+       $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("IEFixes.js"))));
+       $this->addMoreHeaders("\n");
+       $this->addMoreHeaders(HTML::Raw('<meta http-equiv="imagetoolbar" content="no" />'));
+   }
+   $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"'));
 
-	// 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.
+   // 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.
 
-	// This should result in phpwiki-printer.css being used when
-	// printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
-	$this->setDefaultCSS('PhpWiki',
-			     array(''      => 'monobook.css',
-				   'print' => 'commonPrint.css'));
+   // This should result in phpwiki-printer.css being used when
+   // printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
+   $this->setDefaultCSS('PhpWiki',
+              array(''      => 'monobook.css',
+               'print' => 'commonPrint.css'));
 
-	// This allows one to manually select "Printer" style (when browsing page)
-	// to see what the printer style looks like.
-	$this->addAlternateCSS(_("Printer"), 'commonPrint.css', 'print, screen');
-	$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+   // This allows one to manually select "Printer" style (when browsing page)
+   // to see what the printer style looks like.
+   $this->addAlternateCSS(_("Printer"), 'commonPrint.css', 'print, screen');
+   $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
+   $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	$this->addImageAlias('logo', 'MonoBook-Logo.png');
-	//$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+   /**
+    * The logo image appears on every page and links to the HomePage.
+    */
+   $this->addImageAlias('logo', 'MonoBook-Logo.png');
+   //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is set to false then the "Thank you for editing..." screen will
-	 * be omitted.
-	 */
+   /**
+    * The Signature image is shown after saving an edited page. If this
+    * is set to false then the "Thank you for editing..." screen will
+    * be omitted.
+    */
 
-	$this->addImageAlias('signature', "Signature.png");
-	// Uncomment this next line to disable the signature.
-	$this->addImageAlias('signature', false);
+   $this->addImageAlias('signature', "Signature.png");
+   // Uncomment this next line to disable the signature.
+   $this->addImageAlias('signature', false);
 
-	/*
-	 * Link icons.
-	 */
-	/*
-	  $this->setLinkIcon('http');
-	  $this->setLinkIcon('https');
-	  $this->setLinkIcon('ftp');
-	  $this->setLinkIcon('mailto');
-	  //$this->setLinkIcon('interwiki');
-	  */
-	$this->setLinkIcon('wikiuser');
-	//$this->setLinkIcon('*', 'url');
-	// front or after
-	//$this->setLinkIconAttr('after');
+   /*
+    * Link icons.
+    */
+   $this->setLinkIcon('wikiuser');
 
-	//$this->setButtonSeparator("\n | ");
+   /**
+    * WikiWords can automatically be split by inserting spaces between
+    * the words. The default is to leave WordsSmashedTogetherLikeSo.
+    */
+   //$this->setAutosplitWikiWords(false);
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	//$this->setAutosplitWikiWords(false);
+   /**
+    * Layout improvement with dangling links for mostly closed wiki's:
+    * If false, only users with edit permissions will be presented the
+    * special wikiunknown class with "?" and Tooltip.
+    * If true (default), any user will see the ?, but will be presented
+    * the PrintLoginForm on a click.
+    */
+   $this->setAnonEditUnknownLinks(false);
 
-	/**
-	 * Layout improvement with dangling links for mostly closed wiki's:
-	 * If false, only users with edit permissions will be presented the
-	 * special wikiunknown class with "?" and Tooltip.
-	 * If true (default), any user will see the ?, but will be presented
-	 * the PrintLoginForm on a click.
-	 */
-	$this->setAnonEditUnknownLinks(false);
+   /*
+    * You may adjust the formats used for formatting dates and times
+    * below.  (These examples give the default formats.)
+    * Formats are given as format strings to PHP strftime() function See
+    * http://www.php.net/manual/en/function.strftime.php for details.
+    * Do not include the server's zone (%Z), times are converted to the
+    * user's time zone.
+    */
+   $this->setDateFormat("%B %d, %Y");
+   $this->setTimeFormat("%H:%M");
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	$this->setDateFormat("%B %d, %Y");
-	$this->setTimeFormat("%H:%M");
-
-	/*
-	 * To suppress times in the "Last edited on" messages, give a
-	 * give a second argument of false:
-	 */
-	//$this->setDateFormat("%B %d, %Y", false);
+   /*
+    * To suppress times in the "Last edited on" messages, give a
+    * give a second argument of false:
+    */
+   //$this->setDateFormat("%B %d, %Y", false);
     }
 }
 
@@ -196,5 +173,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikibits-min.js
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikibits-min.js	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikibits-min.js	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-var noOverwrite=false;var alertText;var clientPC=navigator.userAgent.toLowerCase();var is_gecko=((clientPC.indexOf("gecko")!=-1)&&(clientPC.indexOf("spoofer")==-1)&&(clientPC.indexOf("khtml")==-1)&&(clientPC.indexOf("netscape/7.0")==-1));var is_safari=((clientPC.indexOf("AppleWebKit")!=-1)&&(clientPC.indexOf("spoofer")==-1));var is_khtml=(navigator.vendor=="KDE"||(document.childNodes&&!document.all&&!navigator.taintEnabled));if(clientPC.indexOf("opera")!=-1){var is_opera=true;var is_opera_preseven=(window.opera&&!document.childNodes);var is_opera_seven=(window.opera&&document.childNodes)}function onloadhook(){if(!(document.getElementById&&document.getElementsByTagName)){return}histrowinit();unhidetzbutton();tabbedprefs()}if(window.addEventListener){window.addEventListener("load",onloadhook,false)}else{if(window.attachEvent){window.attachEvent("onload",onloadhook)}}function addcss(a){if(is_opera_preseven){document.write('<link rel="stylesheet" type="text/css" href="'+a+'Opera6Fixes.css">')}else{if(is_opera_seven){document.write('<link rel="stylesheet" type="text/css" href="'+a+'Opera7Fixes.css">')}else{if(is_khtml){document.write('<link rel="stylesheet" type="text/css" href="'+a+'KHTMLFixes.css">')}}}return}if(window.top!=window){window.top.location=window.location}function toggleVisibility(b,e,a){var c=document.getElementById(b);var d=document.getElementById(e);var f=document.getElementById(a);if(c.style.display=="none"){c.style.display="block";d.style.display="none";f.style.display="inline"}else{c.style.display="none";d.style.display="inline";f.style.display="none"}}function histrowinit(){hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[0]&&inputs[1]){inputs[0].onclick=diffcheck;inputs[1].onclick=diffcheck}}diffcheck()}function diffcheck(){var b=false;var a=false;hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[1]&&inputs[0]){if(inputs[1].checked||inputs[0].checked){if(inputs[1].checked&&inputs[0].checked&&inputs[0].value==inputs[1].value){return false}if(a){if(inputs[1].checked){a.className="selected";return false}}else{if(inputs[0].checked){return false}}if(inputs[0].checked){b=lis[i]}if(!a){inputs[0].style.visibility="hidden"}if(b){inputs[1].style.visibility="hidden"}lis[i].className="selected";a=lis[i]}else{if(!a){inputs[0].style.visibility="hidden"}else{inputs[0].style.visibility="visible"}if(b){inputs[1].style.visibility="hidden"}else{inputs[1].style.visibility="visible"}lis[i].className=""}}}}function tabbedprefs(){prefform=document.getElementById("preferences");if(!prefform||!document.createElement){return}prefform.className=prefform.className+"jsprefs";var g=new Array();children=prefform.childNodes;var e=0;for(i=0;i<children.length;i++){if(children[i].nodeName.indexOf("FIELDSET")!=-1){children[i].id="prefsection-"+e;children[i].className="prefsection";if(is_opera||is_khtml){children[i].className="prefsection operaprefsection"}legends=children[i].getElementsByTagName("LEGEND");g[e]=new Object();if(legends[0]&&legends[0].firstChild.nodeValue){g[e].text=legends[0].firstChild.nodeValue}else{g[e].text="# "+e}g[e].secid=children[i].id;e++;if(g.length!=1){children[i].style.display="none"}else{var c=children[i].id}}}var f=document.createElement("UL");f.id="preftoc";f.selectedid=c;for(i=0;i<g.length;i++){var b=document.createElement("LI");if(i==0){b.className="selected"}var d=document.createElement("A");d.href="#"+g[i].secid;d.onclick=uncoversection;d.innerHTML=g[i].text;d.secid=g[i].secid;b.appendChild(d);f.appendChild(b)}prefform.insertBefore(f,children[0]);document.getElementById("prefsubmit").id="prefcontrol"}function uncoversection(){oldsecid=this.parentNode.parentNode.selectedid;newsec=document.getElementById(this.secid);if(oldsecid!=this.secid){ul=document.getElementById("preftoc");document.getElementById(oldsecid).style.display="none";newsec.style.display="block";ul.selectedid=this.secid;lis=ul.getElementsByTagName("LI");for(i=0;i<lis.length;i++){lis[i].className=""}this.parentNode.className="selected"}return false}function checkTimezone(h,f){var c=new Date();var g=c.getTimezoneOffset();var b=Math.floor(Math.abs(g)/60);var a=Math.abs(g)%60;var d=((g>=0)?"-":"+")+((b<10)?"0":"")+b+((a<10)?"0":"")+a;if(h!=d){var e=f.split("$1");document.write(e[0]+"UTC"+d+e[1])}}function unhidetzbutton(){tzb=document.getElementById("guesstimezonebutton");if(tzb){tzb.style.display="inline"}}function fetchTimezone(){var c=new Date();var e=c.getTimezoneOffset();var b=Math.floor(Math.abs(e)/60);var a=Math.abs(e)%60;var d=((e>=0)?"-":"")+((b<10)?"0":"")+b+":"+((a<10)?"0":"")+a;return d}function guessTimezone(a){document.preferences.wpHourDiff.value=fetchTimezone()}function showTocToggle(a,b){if(document.getElementById){document.writeln('<span class=\'toctoggle\'>[<a href="javascript:toggleToc()" class="internal"><span id="showlink" style="display:none;">'+a+'</span><span id="hidelink">'+b+"</span></a>]</span>")}}function toggleToc(){var c=document.getElementById("tocinside");var b=document.getElementById("showlink");var a=document.getElementById("hidelink");if(c.style.display=="none"){c.style.display=tocWas;a.style.display="";b.style.display="none"}else{tocWas=c.style.display;c.style.display="none";a.style.display="none";b.style.display=""}}function addButton(f,a,c,b,e){a=escapeQuotes(a);c=escapeQuotes(c);b=escapeQuotes(b);e=escapeQuotes(e);var g="";if(!document.selection&&!is_gecko){var d=new RegExp("\\\\n","g");c=c.replace(d,"");b=b.replace(d,"");g="onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+c+e+b+"'};\""}document.write('<a href="javascript:insertTags');document.write("('"+c+"','"+b+"','"+e+"');\">");document.write('<img width="23" height="22" src="'+f+'" border="0" ALT="'+a+'" TITLE="'+a+'"'+g+">");document.write("</a>");return}function addInfobox(d,c){alertText=c;var a=navigator.userAgent.toLowerCase();var b=new RegExp("\\\\n","g");alertText=alertText.replace(b,"\n");if(!document.selection&&!is_gecko){d=escapeQuotesHTML(d);document.write("<form name='infoform' id='infoform'><input size=80 id='infobox' name='infobox' value=\""+d+'" READONLY></form>')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,""");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,""");return b}function insertTags(j,a,b){var l=document.editform.wpTextbox1;if(document.selection&&!is_gecko){var m=document.selection.createRange().text;if(!m){m=b}l.focus();if(m.charAt(m.length-1)==" "){m=m.substring(0,m.length-1);document.selection.createRange().text=j+m+a+" "}else{document.selection.createRange().text=j+m+a}}else{if(l.selectionStart||l.selectionStart=="0"){var k=l.selectionStart;var c=l.selectionEnd;var e=l.scrollTop;var d=(l.value).substring(k,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=j+d.substring(0,(d.length-1))+a+" "}else{subst=j+d+a}l.value=l.value.substring(0,k)+subst+l.value.substring(c,l.value.length);l.focus();var o=k+(j.length+d.length+a.length);l.selectionStart=o;l.selectionEnd=o;l.scrollTop=e}else{var h=alertText;var g=new RegExp("\\$1","g");var f=new RegExp("\\$2","g");h=h.replace(g,b);h=h.replace(f,j+b+a);var n;if(b){n=prompt(h)}else{n=""}if(!n){n=b}n=j+n+a;document.infoform.infobox.value=n;if(!is_safari){l.focus()}noOverwrite=true}}if(l.createTextRange){l.caretPos=document.selection.createRange().duplicate()}};
\ No newline at end of file
+var noOverwrite=false;var alertText;var clientPC=navigator.userAgent.toLowerCase();var is_gecko=((clientPC.indexOf("gecko")!=-1)&&(clientPC.indexOf("spoofer")==-1)&&(clientPC.indexOf("khtml")==-1)&&(clientPC.indexOf("netscape/7.0")==-1));var is_safari=((clientPC.indexOf("AppleWebKit")!=-1)&&(clientPC.indexOf("spoofer")==-1));var is_khtml=(navigator.vendor=="KDE"||(document.childNodes&&!document.all&&!navigator.taintEnabled));if(clientPC.indexOf("opera")!=-1){var is_opera=true;var is_opera_seven=(window.opera&&document.childNodes)}function onloadhook(){if(!(document.getElementById&&document.getElementsByTagName)){return}histrowinit();unhidetzbutton();tabbedprefs()}if(window.addEventListener){window.addEventListener("load",onloadhook,false)}else{if(window.attachEvent){window.attachEvent("onload",onloadhook)}}function addcss(a){return}if(window.top!=window){window.top.location=window.location}function toggleVisibility(b,e,a){var c=document.getElementById(b);var d=document.getElementById(e);var f=document.getElementById(a);if(c.style.display=="none"){c.style.display="block";d.style.display="none";f.style.display="inline"}else{c.style.display="none";d.style.display="inline";f.style.display="none"}}function histrowinit(){hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[0]&&inputs[1]){inputs[0].onclick=diffcheck;inputs[1].onclick=diffcheck}}diffcheck()}function diffcheck(){var b=false;var a=false;hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i<lis.length;i++){inputs=lis[i].getElementsByTagName("INPUT");if(inputs[1]&&inputs[0]){if(inputs[1].checked||inputs[0].checked){if(inputs[1].checked&&inputs[0].checked&&inputs[0].value==inputs[1].value){return false}if(a){if(inputs[1].checked){a.className="selected";return false}}else{if(inputs[0].checked){return false}}if(inputs[0].checked){b=lis[i]}if(!a){inputs[0].style.visibility="hidden"}if(b){inputs[1].style.visibility="hidden"}lis[i].className="selected";a=lis[i]}else{if(!a){inputs[0].style.visibility="hidden"}else{inputs[0].style.visibility="visible"}if(b){inputs[1].style.visibility="hidden"}else{inputs[1].style.visibility="visible"}lis[i].className=""}}}}function tabbedprefs(){prefform=document.getElementById("preferences");if(!prefform||!document.createElement){return}prefform.className=prefform.className+"jsprefs";var g=new Array();children=prefform.childNodes;var e=0;for(i=0;i<children.length;i++){if(children[i].nodeName.indexOf("FIELDSET")!=-1){children[i].id="prefsection-"+e;children[i].className="prefsection";if(is_opera||is_khtml){children[i].className="prefsection operaprefsection"}legends=children[i].getElementsByTagName("LEGEND");g[e]=new Object();if(legends[0]&&legends[0].firstChild.nodeValue){g[e].text=legends[0].firstChild.nodeValue}else{g[e].text="# "+e}g[e].secid=children[i].id;e++;if(g.length!=1){children[i].style.display="none"}else{var c=children[i].id}}}var f=document.createElement("UL");f.id="preftoc";f.selectedid=c;for(i=0;i<g.length;i++){var b=document.createElement("LI");if(i==0){b.className="selected"}var d=document.createElement("A");d.href="#"+g[i].secid;d.onclick=uncoversection;d.innerHTML=g[i].text;d.secid=g[i].secid;b.appendChild(d);f.appendChild(b)}prefform.insertBefore(f,children[0]);document.getElementById("prefsubmit").id="prefcontrol"}function uncoversection(){oldsecid=this.parentNode.parentNode.selectedid;newsec=document.getElementById(this.secid);if(oldsecid!=this.secid){ul=document.getElementById("preftoc");document.getElementById(oldsecid).style.display="none";newsec.style.display="block";ul.selectedid=this.secid;lis=ul.getElementsByTagName("LI");for(i=0;i<lis.length;i++){lis[i].className=""}this.parentNode.className="selected"}return false}function checkTimezone(h,f){var c=new Date();var g=c.getTimezoneOffset();var b=Math.floor(Math.abs(g)/60);var a=Math.abs(g)%60;var d=((g>=0)?"-":"+")+((b<10)?"0":"")+b+((a<10)?"0":"")+a;if(h!=d){var e=f.split("$1");document.write(e[0]+"UTC"+d+e[1])}}function unhidetzbutton(){tzb=document.getElementById("guesstimezonebutton");if(tzb){tzb.style.display="inline"}}function fetchTimezone(){var c=new Date();var e=c.getTimezoneOffset();var b=Math.floor(Math.abs(e)/60);var a=Math.abs(e)%60;var d=((e>=0)?"-":"")+((b<10)?"0":"")+b+":"+((a<10)?"0":"")+a;return d}function guessTimezone(a){document.preferences.wpHourDiff.value=fetchTimezone()}function showTocToggle(a,b){if(document.getElementById){document.writeln('<span class=\'toctoggle\'>[<a href="javascript:toggleToc()" class="internal"><span id="showlink" style="display:none;">'+a+'</span><span id="hidelink">'+b+"</span></a>]</span>")}}function toggleToc(){var c=document.getElementById("tocinside");var b=document.getElementById("showlink");var a=document.getElementById("hidelink");if(c.style.display=="none"){c.style.display=tocWas;a.style.display="";b.style.display="none"}else{tocWas=c.style.display;c.style.display="none";a.style.display="none";b.style.display=""}}function addButton(f,a,c,b,e){a=escapeQuotes(a);c=escapeQuotes(c);b=escapeQuotes(b);e=escapeQuotes(e);var g="";if(!document.selection&&!is_gecko){var d=new RegExp("\\\\n","g");c=c.replace(d,"");b=b.replace(d,"");g="onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+c+e+b+"'};\""}document.write('<a href="javascript:insertTags');document.write("('"+c+"','"+b+"','"+e+"');\">");document.write('<img width="23" height="22" src="'+f+'" border="0" ALT="'+a+'" TITLE="'+a+'"'+g+">");document.write("</a>");return}function addInfobox(d,c){alertText=c;var a=navigator.userAgent.toLowerCase();var b=new RegExp("\\\\n","g");alertText=alertText.replace(b,"\n");if(!document.selection&&!is_gecko){d=escapeQuotesHTML(d);document.write("<form name='infoform' id='infoform'><input size=80 id='infobox' name='infobox' value=\""+d+'" READONLY></form>')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,""");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,""");return b}function insertTags(j,a,b){var l=document.editform.wpTextbox1;if(document.selection&&!is_gecko){var m=document.selection.createRange().text;if(!m){m=b}l.focus();if(m.charAt(m.length-1)==" "){m=m.substring(0,m.length-1);document.selection.createRange().text=j+m+a+" "}else{document.selection.createRange().text=j+m+a}}else{if(l.selectionStart||l.selectionStart=="0"){var k=l.selectionStart;var c=l.selectionEnd;var e=l.scrollTop;var d=(l.value).substring(k,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=j+d.substring(0,(d.length-1))+a+" "}else{subst=j+d+a}l.value=l.value.substring(0,k)+subst+l.value.substring(c,l.value.length);l.focus();var o=k+(j.length+d.length+a.length);l.selectionStart=o;l.selectionEnd=o;l.scrollTop=e}else{var h=alertText;var g=new RegExp("\\$1","g");var f=new RegExp("\\$2","g");h=h.replace(g,b);h=h.replace(f,j+b+a);var n;if(b){n=prompt(h)}else{n=""}if(!n){n=b}n=j+n+a;document.infoform.infobox.value=n;if(!is_safari){l.focus()}noOverwrite=true}}if(l.createTextRange){l.caretPos=document.selection.createRange().duplicate()}};
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikibits.js
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikibits.js	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikibits.js	2011-05-18 19:36:20 UTC (rev 13355)
@@ -10,7 +10,6 @@
 var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled ));
 if (clientPC.indexOf('opera')!=-1) {
     var is_opera = true;
-    var is_opera_preseven = (window.opera && !document.childNodes);
     var is_opera_seven = (window.opera && document.childNodes);
 }
 
@@ -28,13 +27,6 @@
 
 // document.write special stylesheet links
 function addcss ( stylepath ) {
-    if (is_opera_preseven) {
-        document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'Opera6Fixes.css">');
-    } else if (is_opera_seven) {
-        document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'Opera7Fixes.css">');
-    } else if (is_khtml) {
-        document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'KHTMLFixes.css">');
-    }
     return;
 }
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikiprintable.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikiprintable.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/MonoBook/wikiprintable.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,56 +1,45 @@
 /**
- *  $Id: wikiprintable.css 6413 2009-01-19 10:33:24Z vargenau $
- */ 
+ *  $Id: wikiprintable.css 7965 2011-03-07 09:47:31Z vargenau $
+ */
 
 /* MediaWiki print stylesheet */
 
 body {
-	color: #000000; background: #ffffff;
+    color: #000000; background: #ffffff;
 }
 
-
 /* MSIE/Win doesn't understand 'inherit' */
 a, a.external, a.new, a.stub {
-	color: black ! important;
-	text-decoration: none ! important;
+    color: black ! important;
+    text-decoration: none ! important;
 }
 #article {
-	margin: 0 ! important;
+    margin: 0 ! important;
 }
 
 /* Continue ... */
 a, a.external, a.new, a.stub {
-	color: inherit ! important;
-	text-decoration: inherit ! important;
+    color: inherit ! important;
+    text-decoration: inherit ! important;
 }
 
 /* Hide ugly UI stuff */
 #quickbar, #topbar, #footer,
 .editsection, .toctoggle {
-	display: none;
+    display: none;
 }
 
-/* */
 #article {
-	position: relative;
-	margin: inherit ! important;
+    position: relative;
+    margin: inherit ! important;
 }
 
 /* Show some stuff */
 .urlexpansion {
-	display: inline ! important;
+    display: inline ! important;
 }
 
 .printfooter {
-	border-top: solid 1px black;
-	display: block ! important;
+    border-top: solid 1px black;
+    display: block ! important;
 }
-
-/* Old stuff, fixme:
-.bodytext { }
-a.CBlink { color: #0000AA; text-decoration: none; font-size: 12pt; }
-a.interwiki, a.external { color: #3333BB; text-decoration: none; }
-h1.pagetitle { padding-bottom: 0; margin-bottom: 0; }
-i.link, u.link { color: #000066; }
-p.subtitle { padding-top: 0; margin-top: 0; }
-*/

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/lib/RecentChanges.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/lib/RecentChanges.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/lib/RecentChanges.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: RecentChanges.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: RecentChanges.php 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * Extensions/modifications to the stock RecentChanges (and PageHistory) format.
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/portland-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/portland-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/portland-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-body{color:black;background:white;}img{border:0 none;}.wiki-edithelp{font-size:smaller;}input.numeric{text-align:right;}.clear-floats{clear:both;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file
+body{color:black;background:white;}img{border:0;}.wiki-edithelp{font-size:smaller;}input.numeric{text-align:right;}.clear-floats{clear:both;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.transclusion-title{font-style:oblique;font-size:.75em;text-decoration:underline;text-align:right;}.transclusion{background:lightgreen;border:thin;border-style:solid;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin:.5ex 0;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/portland.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/portland.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/portland.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: portland.css 6464 2009-01-30 18:07:40Z vargenau $
+ * $Id: portland.css 7821 2011-01-07 12:42:51Z vargenau $
  *
  * PhpWiki's Portland style sheet based on the original Wiki
  *
@@ -12,7 +12,7 @@
 }
 
 img {
-  border : 0 none;
+  border: 0;
 }
 
 .wiki-edithelp {
@@ -64,6 +64,26 @@
 body.sidebar div.wikitext ul { padding-left: 1em; }
 body.sidebar h2 { margin-top: 0; }
 
+/* IncludePage plugin ================================================= */
+
+.transclusion-title {
+   font-style: oblique;
+   font-size: 0.75em;
+   text-decoration: underline;
+   text-align: right;
+}
+
+.transclusion {
+   background: lightgreen;
+   border: thin;
+   border-style: solid;
+   padding-left: 0.8em;
+   padding-right: 0.8em;
+   padding-top: 0px;
+   padding-bottom: 0px;
+   margin: 0.5ex 0px;
+}
+
 /*
  * table class="boxed"
  * will put a border around the table (but not around the cells)

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
   if ($revision and (!$page->get('locked') || $user->isAdmin()))

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: body.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <body<?php echo $WikiTheme->getMoreAttr('body') ?>>
 <!-- Page title and logo -->

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/browse.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/browse.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/browse.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <br class="clear-floats" />

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/debug.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/debug.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/debug.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: debug.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: debug.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php global $RUNTIMER; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/editpage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/editpage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/editpage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: editpage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php /*
  * FIXME: Hack!

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,11 +1,11 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- The bottom navigation/search bar -->
 
     <?php echo WikiLink(_("FindPage"), "button") ?> by searching
     <?php if ($revision) { ?>
-      (or browse <?php echo Button("LikePages", _("LikePages")) ?>)
+      (or browse <?php echo Button(_("LikePages"), _("LikePages")) ?>)
     <?php } ?>
     <?php if ($user->isAdmin()) { ?>
      <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock')?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/viewsource.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/viewsource.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/templates/viewsource.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: viewsource.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p class="warning_msg"><strong><?php echo _("Note:")?></strong>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Portland/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /*
  * This file defines an appearance ("theme") of PhpWiki similar to the Portland Pattern Repository.
@@ -25,7 +25,7 @@
         else {
             $default_text = $wikiword;
         }
-      
+
         $url = WikiURL($wikiword, array('action' => 'create'));
         $link = HTML::span(HTML::a(array('href' => $url, 'rel' => 'nofollow'), '?'));
 
@@ -55,56 +55,50 @@
     }
 
     function load() {
-	// 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.
+   // 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.
 
-	$this->setDefaultCSS('Portland', 'portland.css');
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
-	$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
+   $this->setDefaultCSS('Portland', 'portland.css');
+   $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+   $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+   $this->addAlternateCSS('PhpWiki', 'phpwiki.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	$this->addImageAlias('logo', WIKI_NAME . 'logo.png');
+   /**
+    * The logo image appears on every page and links to the HomePage.
+    */
+   $this->addImageAlias('logo', WIKI_NAME . 'logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is set to false then the "Thank you for editing..." screen will
-	 * be omitted.
-	 */
-	$this->addImageAlias('signature', WIKI_NAME . "Signature.png");
-	// Uncomment this next line to disable the signature.
-	//$this->addImageAlias('signature', false);
+   /**
+    * The Signature image is shown after saving an edited page. If this
+    * is set to false then the "Thank you for editing..." screen will
+    * be omitted.
+    */
+   $this->addImageAlias('signature', WIKI_NAME . "Signature.png");
+   // Uncomment this next line to disable the signature.
+   //$this->addImageAlias('signature', false);
 
-	/*
-	 * Link icons.
-	 */
-	//$this->setLinkIcon('http');
-	//$this->setLinkIcon('https');
-	//$this->setLinkIcon('ftp');
-	//$this->setLinkIcon('mailto');
-	//$this->setLinkIcon('interwiki');
-	//$this->setLinkIcon('*', 'url');
+   /*
+    * Link icons.
+    */
 
-	$this->setButtonSeparator(' ');
+   $this->setButtonSeparator(' ');
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	$this->setAutosplitWikiWords(false);
+   /**
+    * WikiWords can automatically be split by inserting spaces between
+    * the words. The default is to leave WordsSmashedTogetherLikeSo.
+    */
+   $this->setAutosplitWikiWords(false);
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	$this->setDateFormat("%B %d, %Y", false);
+   /*
+    * You may adjust the formats used for formatting dates and times
+    * below.  (These examples give the default formats.)
+    * Formats are given as format strings to PHP strftime() function See
+    * http://www.php.net/manual/en/function.strftime.php for details.
+    * Do not include the server's zone (%Z), times are converted to the
+    * user's time zone.
+    */
+   $this->setDateFormat("%B %d, %Y", false);
 
     }
 }
@@ -117,5 +111,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/clock.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/clock.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/clock.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
-<?php 
-  // rcs_id('$Id: clock.php 7589 2010-07-02 07:31:33Z vargenau $');
+<?php
+  // $Id: clock.php 7968 2011-03-07 13:39:47Z vargenau $
   $ora = isset($GLOBALS['WikiTheme']) ? DATA_PATH . '/' . $GLOBALS['WikiTheme']->_findFile("ora.swf") : "ora.swf";
 ?>
 <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,29,0" width="160" height="160" align="middle">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/hyperapplet.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/hyperapplet.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/hyperapplet.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,16 +1,16 @@
-<?php 
-  // rcs_id('$Id: hyperapplet.php 7589 2010-07-02 07:31:33Z vargenau $');
-/* Download hyperapplet.jar (or hyperwiki.jar) and GraphXML.dtd from 
+<?php
+  // $Id: hyperapplet.php 7968 2011-03-07 13:39:47Z vargenau $
+/* Download hyperapplet.jar (or hyperwiki.jar) and GraphXML.dtd from
  *   http://hypergraph.sourceforge.net/download.html
  *   and place it into your theme directory.
  * Include this php file and adjust the width/height.
- * The static version requires a dumped "LinkDatabase.xml" via 
+ * The static version requires a dumped "LinkDatabase.xml" via
  *   cd themes/default; wget http://localhost/wiki/index.php/LinkDatabase?format=xml -O LinkDatabase.xml
  * into the same dir as hyperapplet.jar
  */
 global $WikiTheme;
 ?>
-<applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline" 
+<applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline"
         archive="<?php echo $WikiTheme->_finddata("hyperapplet.jar") ?>"
         width="160" height="360">
 <?php // the dynamic version: ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/hyperwiki.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/hyperwiki.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/hyperwiki.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,15 +1,15 @@
-<?php 
-  // rcs_id('$Id: hyperwiki.php 7589 2010-07-02 07:31:33Z vargenau $');
-  /* Download hyperwiki.jar and GraphXML.dtd from 
+<?php
+  // $Id: hyperwiki.php 7968 2011-03-07 13:39:47Z vargenau $
+  /* Download hyperwiki.jar and GraphXML.dtd from
    *   http://hypergraph.sourceforge.net/download.html
    *   and place it into your theme directory.
    * Include this php file and adjust the width/height.
    */
 global $WikiTheme;
-  // via the RPC interface it goes like this... 
+  // via the RPC interface it goes like this...
 ?>
-<applet code="hypergraph.applications.hwiki.HWikiApplet.class" 
-        archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>" 
+<applet code="hypergraph.applications.hwiki.HWikiApplet.class"
+        archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>"
         width="162" height="240">
   <param name="startPage" value="<?php echo $page->getName() ?>" />
   <param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>" />

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/sidebar-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/sidebar-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/sidebar-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0;}#content{margin:61px 0 0 12.2em;padding:1em 1em 1.5em 1em;background:White;border:1px solid #aaa;border-right:none;line-height:1.5em;position:relative;z-index:2;}#column-one{padding-top:50px;}body{font:small sans-serif;background:#fff;color:black;margin:0;padding:0;}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0;}.visualClear{clear:both;}table{font-size:100%;color:black;}a{text-decoration:none;color:#004ba6;background:none;}a:visited{color:#5a3696;}a:active{color:#faa700;}a:hover{text-decoration:underline;}a.stub{color:#723;}a.new,#p-personal a.new{color:#ba0000;}a.new:visited,#p-personal a.new:visited{color:#a55858;}img{border:none;}p{margin:.4em 0 .5em 0;line-height:1.5em;}p img{margin:0;}img.inlineimage{border:none;display:inline;}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0;}h1,h2,h3,h4,h5,h6{color:black;background:none;font-weight:bold;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1{font-size:188%;}h2{font-size:150%;}h3,h4,h5,h6{border-bottom:none;font-weight:bold;}h3{font-size:132%;}h4{font-size:116%;}h5{font-size:100%;}h6{font-size:80%;}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png");}ul.clicked{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bulletLoading.gif");}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none;}li{margin-bottom:.1em;}dt{font-size:115%;margin-bottom:.5em;}dl{margin-top:.2em;margin-bottom:.5em;}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em;}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em;}legend{padding:.5em;font-size:95%;}form{border:none;margin:0;}textarea{width:100%;padding:.1em;}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em;}select{vertical-align:top;}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background:none;cursor:help;}q{font-family:Times,"Times New Roman",serif;font-style:italic;}code{background-color:#f9f9f9;}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em;}#siteSub{display:none;}#jump-to-nav{display:none;}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto;}span.subpages{display:block;}h1.firstHeading-rating{margin-right:220px;line-height:1.2em;}h1.firstHeading{margin-right:40px;line-height:1.2em;}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500;}#bodyContent h1,#bodyContent h2{margin-bottom:.6em;}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em;}.firstHeading{margin-bottom:.1em;}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle;}#siteNotice{text-align:center;font-size:95%;padding:0 .9em;}#siteNotice p{margin:0;padding:0;}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000;}.errorbox{border-color:red;background-color:#fff2f2;}.successbox{border-color:green;background-color:#dfd;}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:none;}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both;}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em;}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c;}.center{width:100%;text-align:center;}*.center *{margin-left:auto;margin-right:auto;}.small,.small *{font-size:94%;}table.small{font-size:100%;}.pageinfo-majoredit{font-weight:normal;}.wiki-summary{font-size:94%;font-style:italic;}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-bottom:8px;font-size:95%;}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right;}#toc h2,.toc h2{display:inline;border:none;padding:0;font-size:100%;font-weight:bold;}.toc #toclist{width:auto;border:none;}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center;}#toc ul,.toc ul{list-style-type:none;list-style-image:none;margin-left:0;padding-left:0;text-align:left;}#toc ul ul,.toc ul ul{margin:0 0 0 2em;}#toc .toctoggle,.toc .toctoggle{font-size:94%;}.mw-warning{margin-left:50px;margin-right:50px;text-align:center;}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0;}div.floatright p{font-style:italic;}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0;}div.floatleft p{font-style:italic;}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto;}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden;}div.thumb div a img{border:1px solid #ccc;}div.thumb div div.thumbcaption{border:none;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0;}div.magnify{float:right;border:none!important;background:none!important;}div.magnify a,div.magnify img{display:block;border:none!important;background:none!important;}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em;}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0;}.hiddenStructure{display:none;speak:none;}img.tex{vertical-align:middle;}span.texhtml{font-family:serif;}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center;}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}div.townBox{position:relative;float:right;background:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right;}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%;}div.townBox dl dt{background:none;margin:.4em 0 0;}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3;}.special li{line-height:1.4em;margin:0;padding:0;}.autocomment{color:gray;}#pagehistory span.user{margin-left:1.4em;margin-right:.4em;}#pagehistory span.minor{font-weight:bold;}#pagehistory li{border:1px solid white;}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white;}td.diff-addedline{background:#cfc;font-size:smaller;}td.diff-deletedline{background:#ffa;font-size:smaller;}td.diff-context{background:#eee;font-size:smaller;}span.diffchange{color:red;font-weight:bold;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background:url("images/url.png") center right no-repeat;padding-right:13px;}#bodyContent a[href ^="https://"],.link-https{background:url("images/lock_icon.png") center right no-repeat;padding-right:16px;}#bodyContent a[href ^="mailto:"],.link-mailto{background:url("images/mail_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="news://"]{background:url("images/news_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="ftp://"],.link-ftp{background:url("images/file_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a[href ^="irc://"],.link-irc{background:url("images/discussionitem_icon.png") center right no-repeat;padding-right:18px;}#bodyContent a.extiw,#bodyContent a.extiw:active{color:#36b;background:none;padding:0;}#bodyContent a.external{color:#36b;}#bodyContent .plainlinks a{background:none!important;padding:0!important;}.portlet{border:none;margin:0 0 .5em;padding:0;float:none;width:11.6em;overflow:hidden;}.portlet h4{font-size:95%;font-weight:normal;white-space:nowrap;}.portlet h5{background:transparent;padding:0 1em 0 .5em;display:inline;font-size:91%;height:16px;width:11.6em;font-weight:bold;white-space:nowrap;}.portlet h5 img{padding:0;margin:0;top:0;right:0;height:15px;width:15px;border:0;}.portlet h6{background:#ffae2e;border:1px solid #2f6fab;border-style:solid solid none solid;padding:0 1em 0 1em;display:block;font-size:1em;height:1.2em;font-weight:normal;white-space:nowrap;}.pBody{font-size:95%;background-color:white;color:black;border-collapse:collapse;border:1px solid #aaa;padding:0 .8em .3em .5em;}.portlet h1,.portlet h2,.portlet h3,.portlet h4{margin:0;padding:0;}.portlet ul{line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;}.portlet li{padding:0;margin:0;margin-bottom:0;}#p-logo{z-index:1;position:absolute;top:0;left:0;height:42px;width:100%;overflow:visible;background:#005A99;}#p-logo h5{display:none;}#p-logo a,#p-logo a:hover{display:block;height:42px;background-repeat:no-repeat;background-position:35% 50%!important;}span.logo{z-index:1;position:absolute;white-space:nowrap;left:18px;top:3px;color:#fff;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:24pt;font-weight:bolder;text-decoration:none;vertical-align:middle;}#img-logo-right{position:absolute;z-index:3;top:0;right:40px;}#img-logo-band{position:absolute;z-index:3;top:0;right:40px;height:45px;}#p-navigation{position:relative;z-index:3;}#p-navigation .pBody{padding-right:0;}#p-nav1{position:relative;z-index:3;}#p-navigation a{display:block;}#p-navigation li.active a,#p-navigation li.active a:hover{text-decoration:none;display:inline;font-weight:bold;}#logo-search{position:absolute;z-index:4;top:5px;left:340px;height:25px;overflow:visible;}#p-search{position:relative;z-index:3;}div.pBody>button,#searchButton{margin:0;padding:0;}#p-search .pBody{margin:0;padding:.5em 0 .4em .4em;}#searchholder form.searchform{margin:0;padding:0;display:inline;}button.searchButton{margin:0;padding:0;cursor:pointer;width:18px;height:18px;border:1px solid ButtonShadow;}input.searchButton{margin-top:1px;font-size:8pt;cursor:pointer;width:64px;padding-left:1px;background-color:White;border:1px solid #2f6fab;text-transform:capitalize;}#searchInput{width:120px;height:18px;margin:0;font-size:95%;border-width:1px;border-style:solid;border-color:#aaa #eee #eee #aaa;-moz-box-sizing:border-box;}#p-personal{width:100%;white-space:nowrap;padding:0;margin:0;position:absolute;right:140px;top:15px;z-index:4;border:none;overflow:visible;color:black;line-height:1.2em;}#p-personal h5{display:none;}#p-personal .portlet,#p-personal .pBody{padding:0;margin:0;border:none;z-index:0;overflow:visible;background:none;}#p-personal ul{border:none;line-height:1.5em;color:#2f6fab;padding:0 1.5em 0 2em;margin:0;text-align:right;list-style:none;z-index:0;background:none;cursor:default;}#p-personal li{z-index:0;border:none;padding:0;display:inline;color:#2f6fab;margin-left:.8em;line-height:1.2em;background:none;}#p-personal li a{text-decoration:none;color:white;padding-left:.5em;padding-bottom:.2em;}#p-personal li a:hover{color:white;background:#005A99;padding-bottom:.2em;font-weight:bold;text-decoration:none;}li#pt-mypages,li#pt-mychanges,li#pt-userpage,li#pt-anonuserpage,li#pt-login{background:url('images/wikiuser.png') top left no-repeat;background-repeat:no-repeat;padding-left:10px;text-transform:none;}#p-personal a.new{color:#ba0000;}#p-cactions{position:absolute;top:40px;left:13.2em;margin:0;white-space:nowrap;width:76%;line-height:1.1em;overflow:visible;background:none;border-collapse:collapse;padding-left:1em;list-style:none;font-size:95%;}#p-cactions .hiddenStructure{display:none;}#p-cactions ul{list-style:none;}#p-cactions li{display:inline;border:1px solid #aaa;border-bottom:none;padding:0 0 .1em 0;margin:0 .3em 0 0;overflow:visible;background:white;}#p-cactions li.selected{border-color:#fabd23;padding:0 0 .2em 0;}#p-cactions li a{background-color:#fbfbfb;color:#002bb8;border:none;padding:0 .8em .3em;text-decoration:none;position:relative;z-index:0;margin:0;}#p-cactions li.selected a{z-index:3;background-color:#fff;padding:0 1em .2em;}#p-cactions .new a{color:#ba0000;}#p-cactions li a:hover{z-index:3;text-decoration:none;background-color:#fff;padding-bottom:.3em;}#p-cactions li a#btn-edit{background:url('images/UEB16.png') top left no-repeat;background-repeat:no-repeat;padding-left:20px!important;text-transform:none;}#p-cactions li a#btn-edit:hover{z-index:3;text-decoration:none;background-color:#fff;}#p-cactions h5{display:none;}#p-cactions li.istalk{margin-right:0;}#p-cactions li.istalk a{padding-right:.5em;}#p-cactions #ca-addsection a{padding-left:.4em;padding-right:.4em;}li#ca-talk{margin-right:1.6em;}li#ca-watch,li#ca-unwatch,li#ca-varlang-0,li#ca-print{margin-left:1.6em;}#p-tbx,#p-lang{position:relative;z-index:3;}#footer,#bottom{background-color:white;border:1px solid #fabd23;margin:.6em .5em 1em 13.6em;padding:.4em 0 1.2em 0;text-align:center;font-size:90%;}#footer li{display:inline;margin:0 1.3em;}#bottom{border:none;text-align:left;}head:first-child+body #footer li{white-space:nowrap;}#f-poweredbyico,#f-copyrightico{margin:0 8px;height:31px;position:relative;top:-31px;}#f-poweredbyico{float:right;}#f-copyrightico{float:left;}#preftoc{float:left;margin:1em 1em 1em 1em;width:13em;}#preftoc li{border:1px solid White;}#preftoc li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}#preftoc a,#preftoc a:active{display:block;color:#0014a6;}#prefcontrol{clear:both;float:left;margin-top:1em;}div.prefsectiontip{font-size:95%;margin-top:1em;}fieldset.operaprefsection{margin-left:15em;}*>html #p-cactions li{border:none;}*>html #p-cactions li a{border:1px solid #aaa;border-bottom:none;}*>html #p-cactions li.selected a{border-color:#fabd23;}*>html #f-poweredbyico,*>html #f-copyrightico{width:88px;}*>html #bodyContent,*>html #bodyContent pre{overflow-x:auto;width:100%;padding-bottom:25px;}* html #footer{margin-top:0;}* html #column-content{display:inline;margin-bottom:0;}* html div.editsection{font-size:smaller;}#pagehistory li.selected{position:relative;}*>html #column-content{float:none;}*>html #column-one{position:absolute;left:0;top:0;}*>html #footer{margin-left:13.2em;}.redirectText{font-size:150%;margin:5px;}.printfooter{display:none;}.not-patrolled{background-color:#ffa;}div.patrollink{font-size:75%;text-align:right;}span.newpage,span.minor,span.searchmatch,span.bot{font-weight:bold;}span.unpatrolled{font-weight:bold;color:red;}span.searchmatch{color:red;}.sharedUploadNotice{font-style:italic;}span.updatedmarker{color:black;background-color:#0f0;}span.newpageletter{font-weight:bold;color:black;background-color:yellow;}span.minoreditletter{color:black;background-color:#c5ffe6;}table.gallery{border:1px solid #ccc;margin:2px;padding:2px;background-color:white;}table.gallery tr{vertical-align:top;}table.gallery td{vertical-align:top;background-color:#f9f9f9;border:solid 2px white;}table.gallery td.galleryheader{text-align:center;font-weight:bold;}div.gallerybox{margin:2px;width:150px;}div.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px;}div.gallerytext{font-size:94%;padding:2px 4px;}span.comment{font-style:italic;}span.changedby{font-size:95%;}.previewnote{text-indent:3em;color:#c00;border-bottom:1px solid #aaa;padding-bottom:1em;margin-bottom:1em;}.previewnote p{margin:0;padding:0;}.editExternally{border:1px solid gray;background-color:#fff;padding:3px;margin-top:.5em;float:left;font-size:small;text-align:center;}.editExternallyHelp{font-style:italic;color:gray;}li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic;}.toggle{margin-left:2em;text-indent:-2em;}table.mw_metadata{font-size:.8em;margin-left:.5em;margin-bottom:.5em;width:300px;}table.mw_metadata caption{font-weight:bold;}table.mw_metadata th{font-weight:normal;}table.mw_metadata td{padding:.1em;}table.mw_metadata{border:none;border-collapse:collapse;}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaa;padding-left:.1em;padding-right:.1em;}table.mw_metadata th{background-color:#f9f9f9;}table.mw_metadata td{background-color:#fcfcfc;}table.collapsed tr.collapsable{display:none;}ul#filetoc{text-align:center;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:.5em;margin-left:0;margin-right:0;}#filetoc li{display:inline;list-style-type:none;padding-right:2em;}input#wpSave,input#wpDiff{margin-right:.33em;}#editform .editOptions{display:inline;}#wpSave{font-weight:bold;}table.revisionform_default{border:1px solid #000;}table.revisionform_focus{border:1px solid #000;background-color:#0BF;}tr.revision_tr_default{background-color:#EEE;}tr.revision_tr_first{background-color:#DDD;}p.revision_saved{color:green;font-weight:bold;}#mw_trackbacks{border:solid 1px #bbf;background-color:#eef;padding:.2em;}#allmessagestable th{background-color:#b2b2ff;}#allmessagestable tr.orig{background-color:#ffe2e2;}#allmessagestable tr.new{background-color:#e2ffe2;}#allmessagestable tr.def{background-color:#f0f0ff;}div.noarticletext{border:1px solid #ccc;background:#fff;padding:.2em 1em;color:#000;}div#searchTargetContainer{left:10px;top:10px;width:90%;background:white;}div#searchTarget{padding:3px;margin:5px;background:#F0F0F0;border:solid 1px blue;}div#searchTarget ul li{list-style:none;}div#searchTarget ul li:before{color:orange;content:"\00BB \0020";}div.multipageimagenavbox{border:solid 1px silver;padding:4px;margin:1em;-moz-border-radius:6px;background:#f0f0f0;}div.multipageimagenavbox div.thumb{border:none;margin-left:2em;margin-right:2em;}div.multipageimagenavbox hr{margin:6px;}table.multipageimage td{text-align:center;}.TablePager_nav a{text-decoration:none;}.TablePager{border-collapse:collapse;}.TablePager,.TablePager td,.TablePager th{border:.15em solid #777;padding:0 .15em 0 .15em;}.TablePager th{background-color:#eef;}.TablePager td{background-color:#fff;}.TablePager tr:hover td{background-color:#eef;}.imagelist td,.imagelist th{white-space:nowrap;}.imagelist .TablePager_col_links{background-color:#eef;}.imagelist .TablePager_col_img_description{white-space:normal;}.imagelist th.TablePager_sort{background-color:#ccf;}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold;font-size:smaller;}.pagelist thead td u{text-decoration:none;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikipaging{font-size:80%;}.wikipaging-disabled{color:#999;}div.boxright{width:200px;right:10px;float:right;border:thin solid #888;padding:.5em .5em .5em .5em;margin:0;}div.boxright>blockquote{padding:.5em;margin:0;}div.errors{color:black;background-color:#F99;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}h4.errors{color:red;margin:0;padding:0;text-decoration:underline;}div.warning{color:black;background-color:#FCC;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:1px solid #aaa;clear:both;}.debug{color:black;background:white;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}a.spell-wrong{color:#ba0000;background:yellow;}span.spell-wrong{color:#ba0000;}.wiki,.named-wiki{text-decoration:none;font-weight:normal;}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold;}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;white-space:nowrap;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;color:#006;}h1 .backlinks{text-decoration:underline;}.wikipage{font-weight:normal;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}#p-rc-body div div.box-title{display:none;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}div#rateit-widget-top-1{width:120px;height:29px;top:5px;right:75px;z-index:1;position:absolute;}div#rateit-widget-top{padding-top:0;position:absolute;z-index:1;width:120px;height:29px;top:0;right:110px;}span.rateit{text-decoration:none;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:10px;}div.public,span.public{background-color:#ffce7b;}.transclusion-title{font-weight:bold;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:97%;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.feedback{font-weight:bold;border-width:2px;border-style:solid;background-color:#DFD;border-color:green;padding:.5em;}.error{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}
\ No newline at end of file
+#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0;}#content{margin:61px 0 0 12.2em;padding:1em 1em 1.5em 1em;background-color:white;border:1px solid #aaa;border-right:none;line-height:1.5em;position:relative;z-index:2;}#column-one{padding-top:50px;}body{font:small sans-serif;background-color:#fff;color:black;margin:0;padding:0;}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0;}.visualClear{clear:both;}table{font-size:100%;color:black;}a{text-decoration:none;color:#004ba6;background-image:none;}a:visited{color:#5a3696;}a:active{color:#faa700;}a:hover{text-decoration:underline;}a.stub{color:#723;}a.new,#p-personal a.new{color:#ba0000;}a.new:visited,#p-personal a.new:visited{color:#a55858;}img{border:0;}p{margin:.4em 0 .5em 0;line-height:1.5em;}p img{margin:0;}img.inlineimage{border:none;display:inline;}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0;}h1,h2,h3,h4,h5,h6{color:black;background-image:none;font-weight:bold;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1{font-size:188%;}h2{font-size:150%;}h3,h4,h5,h6{border-bottom:none;font-weight:bold;}h3{font-size:132%;}h4{font-size:116%;}h5{font-size:100%;}h6{font-size:80%;}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png");}ul.clicked{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bulletLoading.gif");}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none;}li{margin-bottom:.1em;}dt{font-size:115%;margin-bottom:.5em;}dl{margin-top:.2em;margin-bottom:.5em;}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em;}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em;}legend{padding:.5em;font-size:95%;}form{border:none;margin:0;}textarea{width:100%;padding:.1em;}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em;}select{vertical-align:top;}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background-image:none;cursor:help;}q{font-family:Times,"Times New Roman",serif;font-style:italic;}code{background-color:#f9f9f9;}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em;}#siteSub{display:none;}#jump-to-nav{display:none;}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto;}span.subpages{display:block;}h1.firstHeading-rating{margin-right:220px;line-height:1.2em;}h1.firstHeading{margin-right:40px;line-height:1.2em;}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500;}#bodyContent h1,#bodyContent h2{margin-bottom:.6em;}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em;}.firstHeading{margin-bottom:.1em;}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle;}#siteNotice{text-align:center;font-size:95%;padding:0 .9em;}#siteNotice p{margin:0;padding:0;}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000;}.errorbox{border-color:red;background-color:#fff2f2;}.successbox{border-color:green;background-color:#dfd;}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:none;}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both;}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em;}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c;}.center{width:100%;text-align:center;}*.center *{margin-left:auto;margin-right:auto;}.small,.small *{font-size:94%;}table.small{font-size:100%;}.pageinfo-majoredit{font-weight:normal;}.wiki-summary{font-size:94%;font-style:italic;}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-bottom:8px;font-size:95%;}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right;}#toc h2,.toc h2{display:inline;border:none;padding:0;font-size:100%;font-weight:bold;}.toc #toclist{width:auto;border:none;}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center;}#toc ul,.toc ul{list-style-type:none;list-style-image:none;margin-left:0;padding-left:0;text-align:left;}#toc ul ul,.toc ul ul{margin:0 0 0 2em;}#toc .toctoggle,.toc .toctoggle{font-size:94%;}.mw-warning{margin-left:50px;margin-right:50px;text-align:center;}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0;}div.floatright p{font-style:italic;}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0;}div.floatleft p{font-style:italic;}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto;}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden;}div.thumb div a img{border:1px solid #ccc;}div.thumb div div.thumbcaption{border:none;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0;}div.magnify{float:right;border-style:none!important;background-image:none!important;}div.magnify a,div.magnify img{display:block;border-style:none!important;background-image:none!important;}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em;}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0;}.hiddenStructure{display:none;speak:none;}img.tex{vertical-align:middle;}span.texhtml{font-family:serif;}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center;}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;}div.townBox{position:relative;float:right;background-color:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right;}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%;}div.townBox dl dt{background-image:none;margin:.4em 0 0;}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3;}.special li{line-height:1.4em;margin:0;padding:0;}.autocomment{color:gray;}#pagehistory span.user{margin-left:1.4em;margin-right:.4em;}#pagehistory span.minor{font-weight:bold;}#pagehistory li{border:1px solid white;}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white;}td.diff-addedline{background-color:#cfc;font-size:smaller;}td.diff-deletedline{background-color:#ffa;font-size:smaller;}td.diff-context{background-color:#eee;font-size:smaller;}span.diffchange{color:red;font-weight:bold;}.diff{margin-top:1ex;margin-bottom:.5ex;background-color:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background-color:#ddd;padding-left:1em;}.diff .context{background-color:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background-color:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background-color:white;}.diff .original,.diff .deleted{background-color:#fcc;border:none;}.diff .final,.diff .added{background-color:#cfc;border:none;}.diff del{background-color:#f99;}.diff ins{background-color:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}table.cal{border:1px outset gray;background-color:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background-color:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background-image:url("images/url.png");background-position:center right;background-repeat:no-repeat;padding-right:13px;}#bodyContent a[href ^="https://"],.link-https{background-image:url("images/lock_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:16px;}#bodyContent a[href ^="mailto:"],.link-mailto{background-image:url("images/mail_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px;}#bodyContent a[href ^="news://"]{background-image:url("images/news_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px;}#bodyContent a[href ^="ftp://"],.link-ftp{background-image:url("images/file_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px;}#bodyContent a[href ^="irc://"],.link-irc{background-image:url("images/discussionitem_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px;}#bodyContent a.extiw,#bodyContent a.extiw:active{color:#36b;background-image:none;padding:0;}#bodyContent a.external{color:#36b;}#bodyContent .plainlinks a{background-image:none!important;padding:0!important;}.portlet{border:none;margin:0 0 .5em;padding:0;float:none;width:11.6em;overflow:hidden;}.portlet h4{font-size:95%;font-weight:normal;white-space:nowrap;}.portlet h5{background-color:transparent;padding:0 1em 0 .5em;display:inline;font-size:91%;height:16px;width:11.6em;font-weight:bold;white-space:nowrap;}.portlet h5 img{padding:0;margin:0;top:0;right:0;height:15px;width:15px;border:0;}.portlet h6{background-color:#ffae2e;border:1px solid #2f6fab;border-style:solid solid none solid;padding:0 1em 0 1em;display:block;font-size:1em;height:1.2em;font-weight:normal;white-space:nowrap;}.pBody{font-size:95%;background-color:white;color:black;border-collapse:collapse;border:1px solid #aaa;padding:0 .8em .3em .5em;}.portlet h1,.portlet h2,.portlet h3,.portlet h4{margin:0;padding:0;}.portlet ul{line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%;}.portlet li{padding:0;margin:0;margin-bottom:0;}#p-logo{z-index:1;position:absolute;top:0;left:0;height:42px;width:100%;overflow:visible;background-color:#005A99;}#p-logo h5{display:none;}#p-logo a,#p-logo a:hover{display:block;height:42px;background-repeat:no-repeat;background-position:35% 50%!important;}span.logo{z-index:1;position:absolute;white-space:nowrap;left:18px;top:3px;color:#fff;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:24pt;font-weight:bolder;text-decoration:none;vertical-align:middle;}#img-logo-right{position:absolute;z-index:3;top:0;right:40px;}#img-logo-band{position:absolute;z-index:3;top:0;right:40px;height:45px;}#p-navigation{position:relative;z-index:3;}#p-navigation .pBody{padding-right:0;}#p-nav1{position:relative;z-index:3;}#p-navigation a{display:block;}#p-navigation li.active a,#p-navigation li.active a:hover{text-decoration:none;display:inline;font-weight:bold;}#logo-search{position:absolute;z-index:4;top:5px;left:340px;height:25px;overflow:visible;}#p-search{position:relative;z-index:3;}div.pBody>button,#searchButton{margin:0;padding:0;}#p-search .pBody{margin:0;padding:.5em 0 .4em .4em;}#searchholder form.searchform{margin:0;padding:0;display:inline;}button.searchButton{margin:0;padding:0;cursor:pointer;width:18px;height:18px;border:1px solid ButtonShadow;}input.searchButton{margin-top:1px;font-size:8pt;cursor:pointer;width:64px;padding-left:1px;background-color:White;border:1px solid #2f6fab;text-transform:capitalize;}#searchInput{width:120px;height:18px;margin:0;font-size:95%;border-width:1px;border-style:solid;border-color:#aaa #eee #eee #aaa;-moz-box-sizing:border-box;}#p-personal{width:100%;white-space:nowrap;padding:0;margin:0;position:absolute;right:140px;top:15px;z-index:4;border:none;overflow:visible;color:black;line-height:1.2em;}#p-personal h5{display:none;}#p-personal .portlet,#p-personal .pBody{padding:0;margin:0;border:none;z-index:0;overflow:visible;background-image:none;}#p-personal ul{border:none;line-height:1.5em;color:#2f6fab;padding:0 1.5em 0 2em;margin:0;text-align:right;list-style:none;z-index:0;background-image:none;cursor:default;}#p-personal li{z-index:0;border:none;padding:0;display:inline;color:#2f6fab;margin-left:.8em;line-height:1.2em;background-image:none;}#p-personal li a{text-decoration:none;color:white;padding-left:.5em;padding-bottom:.2em;}#p-personal li a:hover{color:white;background-color:#005A99;padding-bottom:.2em;font-weight:bold;text-decoration:none;}li#pt-mypages,li#pt-mychanges,li#pt-userpage,li#pt-anonuserpage,li#pt-login{background-image:url('images/wikiuser.png');background-position:top left;background-repeat:no-repeat;padding-left:10px;text-transform:none;}#p-personal a.new{color:#ba0000;}#p-cactions{position:absolute;top:40px;left:13.2em;margin:0;white-space:nowrap;width:76%;line-height:1.1em;overflow:visible;background-image:none;border-collapse:collapse;padding-left:1em;list-style:none;font-size:95%;}#p-cactions .hiddenStructure{display:none;}#p-cactions ul{list-style:none;}#p-cactions li{display:inline;border:1px solid #aaa;border-bottom:none;padding:0 0 .1em 0;margin:0 .3em 0 0;overflow:visible;background-color:white;}#p-cactions li.selected{border-color:#fabd23;padding:0 0 .2em 0;}#p-cactions li a{background-color:#fbfbfb;color:#002bb8;border:none;padding:0 .8em .3em;text-decoration:none;position:relative;z-index:0;margin:0;}#p-cactions li.selected a{z-index:3;background-color:#fff;padding:0 1em .2em;}#p-cactions .new a{color:#ba0000;}#p-cactions li a:hover{z-index:3;text-decoration:none;background-color:#fff;padding-bottom:.3em;}#p-cactions li a#btn-edit{background-image:url('images/UEB16.png');background-position:top left;background-repeat:no-repeat;padding-left:20px!important;text-transform:none;}#p-cactions li a#btn-edit:hover{z-index:3;text-decoration:none;background-color:#fff;}#p-cactions h5{display:none;}#p-cactions li.istalk{margin-right:0;}#p-cactions li.istalk a{padding-right:.5em;}#p-cactions #ca-addsection a{padding-left:.4em;padding-right:.4em;}li#ca-talk{margin-right:1.6em;}li#ca-watch,li#ca-unwatch,li#ca-varlang-0,li#ca-print{margin-left:1.6em;}#p-tbx,#p-lang{position:relative;z-index:3;}#footer,#bottom{background-color:white;border:1px solid #fabd23;margin:.6em .5em 1em 13.6em;padding:.4em 0 1.2em 0;text-align:center;font-size:90%;}#footer li{display:inline;margin:0 1.3em;}#bottom{border:none;text-align:left;}head:first-child+body #footer li{white-space:nowrap;}#f-poweredbyico,#f-copyrightico{margin:0 8px;height:31px;position:relative;top:-31px;}#f-poweredbyico{float:right;}#f-copyrightico{float:left;}#preftoc{float:left;margin:1em 1em 1em 1em;width:13em;}#preftoc li{border:1px solid White;}#preftoc li.selected{background-color:#f9f9f9;border:1px dashed #aaa;}#preftoc a,#preftoc a:active{display:block;color:#0014a6;}#prefcontrol{clear:both;float:left;margin-top:1em;}div.prefsectiontip{font-size:95%;margin-top:1em;}fieldset.operaprefsection{margin-left:15em;}* html #footer{margin-top:0;}* html #column-content{display:inline;margin-bottom:0;}* html div.editsection{font-size:smaller;}#pagehistory li.selected{position:relative;}.redirectText{font-size:150%;margin:5px;}.printfooter{display:none;}.not-patrolled{background-color:#ffa;}div.patrollink{font-size:75%;text-align:right;}span.newpage,span.minor,span.searchmatch,span.bot{font-weight:bold;}span.unpatrolled{font-weight:bold;color:red;}span.searchmatch{color:red;}.sharedUploadNotice{font-style:italic;}span.updatedmarker{color:black;background-color:#0f0;}span.newpageletter{font-weight:bold;color:black;background-color:yellow;}span.minoreditletter{color:black;background-color:#c5ffe6;}table.gallery{border:1px solid #ccc;margin:2px;padding:2px;background-color:white;}table.gallery tr{vertical-align:top;}table.gallery td{vertical-align:top;background-color:#f9f9f9;border:solid 2px white;}table.gallery td.galleryheader{text-align:center;font-weight:bold;}div.gallerybox{margin:2px;width:150px;}div.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px;}div.gallerytext{font-size:94%;padding:2px 4px;}span.comment{font-style:italic;}span.changedby{font-size:95%;}.previewnote{text-indent:3em;color:#c00;border-bottom:1px solid #aaa;padding-bottom:1em;margin-bottom:1em;}.previewnote p{margin:0;padding:0;}.editExternally{border:1px solid gray;background-color:#fff;padding:3px;margin-top:.5em;float:left;font-size:small;text-align:center;}.editExternallyHelp{font-style:italic;color:gray;}li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic;}.toggle{margin-left:2em;text-indent:-2em;}table.mw_metadata{font-size:.8em;margin-left:.5em;margin-bottom:.5em;width:300px;}table.mw_metadata caption{font-weight:bold;}table.mw_metadata th{font-weight:normal;}table.mw_metadata td{padding:.1em;}table.mw_metadata{border:none;border-collapse:collapse;}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaa;padding-left:.1em;padding-right:.1em;}table.mw_metadata th{background-color:#f9f9f9;}table.mw_metadata td{background-color:#fcfcfc;}table.collapsed tr.collapsable{display:none;}ul#filetoc{text-align:center;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:.5em;margin-left:0;margin-right:0;}#filetoc li{display:inline;list-style-type:none;padding-right:2em;}input#wpSave,input#wpDiff{margin-right:.33em;}#editform .editOptions{display:inline;}#wpSave{font-weight:bold;}table.revisionform_default{border:1px solid #000;}table.revisionform_focus{border:1px solid #000;background-color:#0BF;}tr.revision_tr_default{background-color:#EEE;}tr.revision_tr_first{background-color:#DDD;}p.revision_saved{color:green;font-weight:bold;}#mw_trackbacks{border:solid 1px #bbf;background-color:#eef;padding:.2em;}#allmessagestable th{background-color:#b2b2ff;}#allmessagestable tr.orig{background-color:#ffe2e2;}#allmessagestable tr.new{background-color:#e2ffe2;}#allmessagestable tr.def{background-color:#f0f0ff;}div.noarticletext{border:1px solid #ccc;background-color:#fff;padding:.2em 1em;color:#000;}div#searchTargetContainer{left:10px;top:10px;width:90%;background-color:white;}div#searchTarget{padding:3px;margin:5px;background-color:#F0F0F0;border:solid 1px blue;}div#searchTarget ul li{list-style:none;}div#searchTarget ul li:before{color:orange;content:"\00BB \0020";}div.multipageimagenavbox{border:solid 1px silver;padding:4px;margin:1em;-moz-border-radius:6px;background-color:#f0f0f0;}div.multipageimagenavbox div.thumb{border:none;margin-left:2em;margin-right:2em;}div.multipageimagenavbox hr{margin:6px;}table.multipageimage td{text-align:center;}.TablePager_nav a{text-decoration:none;}.TablePager{border-collapse:collapse;}.TablePager,.TablePager td,.TablePager th{border:.15em solid #777;padding:0 .15em 0 .15em;}.TablePager th{background-color:#eef;}.TablePager td{background-color:#fff;}.TablePager tr:hover td{background-color:#eef;}.imagelist td,.imagelist th{white-space:nowrap;}.imagelist .TablePager_col_links{background-color:#eef;}.imagelist .TablePager_col_img_description{white-space:normal;}.imagelist th.TablePager_sort{background-color:#ccf;}.pagelist thead td{background-color:#e8e8e8;text-decoration:none;font-weight:bold;font-size:smaller;}.pagelist thead td u{text-decoration:none;}.pagelist tr.evenrow{background-color:#eee;}.pagelist tr.oddrow{background-color:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikipaging{font-size:80%;}.wikipaging-disabled{color:#999;}div.boxright{width:200px;right:10px;float:right;border:thin solid #888;padding:.5em .5em .5em .5em;margin:0;}div.boxright>blockquote{padding:.5em;margin:0;}.error{color:black;background-color:#F99;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.warning{color:black;background-color:#FCC;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:1px solid #aaa;clear:both;}.debug{color:black;background-color:white;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background-color:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background-color:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.search-context{background-color:white;font-style:oblique;}.search-term{background-color:yellow;font-weight:normal;}a.spell-wrong{color:#ba0000;background-color:yellow;}span.spell-wrong{color:#ba0000;}.wiki,.named-wiki{text-decoration:none;font-weight:normal;}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold;}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;white-space:nowrap;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;color:#006;}h1 .backlinks{text-decoration:underline;}.wikipage{font-weight:normal;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}#p-rc-body div div.box-title{display:none;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}div#rateit-widget-top-1{width:120px;height:29px;top:5px;right:75px;z-index:1;position:absolute;}div#rateit-widget-top{padding-top:0;position:absolute;z-index:1;width:120px;height:29px;top:0;right:110px;}span.rateit{text-decoration:none;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:10px;}div.public,span.public{background-color:#ffce7b;}.transclusion-title{font-weight:bold;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:97%;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.feedback{font-weight:bold;border-width:2px;border-style:solid;background-color:#DFD;border-color:green;padding:.5em;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/sidebar.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/sidebar.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/sidebar.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -13,22 +13,20 @@
 */
 
 #column-content {
-	width: 100%;
-	float: right;
-	margin: 0 0 .6em -12.2em;
-	padding: 0;
+    width: 100%;
+    float: right;
+    margin: 0 0 .6em -12.2em;
+    padding: 0;
 }
 #content {
-	/*  margin: 2.8em 0 0 12.2em; */
-	/*  padding: 0em 1em 1.5em 1em; */
-	margin: 61px 0 0 12.2em;
-	padding: 1em 1em 1.5em 1em;
-	background: White;
-	border: 1px solid #aaaaaa;
-	border-right: none;
-	line-height: 1.5em;
-	position: relative;
-	z-index: 2;
+    margin: 61px 0 0 12.2em;
+    padding: 1em 1em 1.5em 1em;
+    background-color: white;
+    border: 1px solid #aaaaaa;
+    border-right: none;
+    line-height: 1.5em;
+    position: relative;
+    z-index: 2;
 }
 #column-one { padding-top: 50px; }
 /* the left column width is specified in class .portlet */
@@ -40,84 +38,82 @@
 */
 
 body {
-	font: small sans-serif;
-	background: #ffffff;
-/*	background: #f9f9f9 url("images/headbg.jpg") 0px 0px no-repeat; */
-	color: black;
-	margin: 0;
-	padding: 0;
+    font: small sans-serif;
+    background-color: #ffffff;
+    color: black;
+    margin: 0;
+    padding: 0;
 }
 
 /* scale back up to a sane default */
 #globalWrapper {
-	font-size:127%;
-	width: 100%;
-	margin: 0;
-	padding: 0;
+    font-size:127%;
+    width: 100%;
+    margin: 0;
+    padding: 0;
 }
 .visualClear { clear: both; }
 
 /* general styles */
 
 table {
-	font-size: 100%;
-	color: black;
+    font-size: 100%;
+    color: black;
 }
 a {
-	text-decoration: none;
-	color: #004ba6;
-	background: none;
+    text-decoration: none;
+    color: #004ba6;
+    background-image: none;
 }
 a:visited { color: #5a3696; }
 a:active { color: #faa700; }
 a:hover { text-decoration: underline; }
 a.stub { color: #772233; }
 a.new, #p-personal a.new {
-	color: #ba0000;
+    color: #ba0000;
 }
 a.new:visited, #p-personal a.new:visited {
-	color: #a55858;
+    color: #a55858;
 }
 
 img {
-	border: none;
-	/*vertical-align: middle;*/
+    border: 0;
 }
 p {
-	margin: .4em 0 .5em 0;
-	line-height: 1.5em;
+    margin: .4em 0 .5em 0;
+    line-height: 1.5em;
 }
 p img {
-	margin: 0;
+    margin: 0;
 }
 img.inlineimage {
-	border: none;
-  	display: inline;
+    border: none;
+    display: inline;
 }
 
 hr {
-	height: 1px;
-	color: #aaa;
-	background-color: #aaa;
-	border: 0;
-	margin: .2em 0 .2em 0;
+    height: 1px;
+    color: #aaa;
+    background-color: #aaa;
+    border: 0;
+    margin: .2em 0 .2em 0;
 }
 
 h1, h2, h3, h4, h5, h6 {
-	color: black;
-	background: none;
-	font-weight: bold;
-	font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
-	margin: 0;
-	padding-top: 0.5em;
-	padding-bottom: 0.17em;
-	border-bottom: 1px solid #aaa;
+    color: black;
+    background-image: none;
+    font-weight: bold;
+    font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
+    margin: 0;
+    padding-top: 0.5em;
+    padding-bottom: 0.17em;
+    border-bottom: 1px solid #aaa;
 }
 h1 { font-size: 188%; }
 h2 { font-size: 150%; }
-h3, h4, h5, h6 { 
-	border-bottom: none;
-	font-weight: bold;
+h3, h4, h5, h6 {
+    border-bottom: none;
+    font-weight: bold;
 }
 h3 { font-size: 132%; }
 h4 { font-size: 116%; }
@@ -125,95 +121,94 @@
 h6 { font-size: 80%;  }
 
 ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	margin: 0.3em 0 0 1.5em;
-	padding:0;
-	list-style-image: url("images/bullet.png");
+    line-height: 1.5em;
+    list-style-type: square;
+    margin: 0.3em 0 0 1.5em;
+    padding:0;
+    list-style-image: url("images/bullet.png");
 }
 ul.clicked {
-	line-height: 1.5em;
-	list-style-type: square;
-	margin: 0.3em 0 0 1.5em;
-	padding:0;
-	list-style-image: url("images/bulletLoading.gif");
+    line-height: 1.5em;
+    list-style-type: square;
+    margin: 0.3em 0 0 1.5em;
+    padding:0;
+    list-style-image: url("images/bulletLoading.gif");
 }
 ol {
-	line-height: 1.5em;
-	margin: 0.3em 0 0 3.2em;
-	padding:0;
-	list-style-image: none;
+    line-height: 1.5em;
+    margin: 0.3em 0 0 3.2em;
+    padding:0;
+    list-style-image: none;
 }
-li {	margin-bottom: 0.1em; }
-dt { 
-	font-size: 115%;
-	margin-bottom: .5em;
+li {    margin-bottom: 0.1em; }
+dt {
+    font-size: 115%;
+    margin-bottom: .5em;
 }
 dl {
-	margin-top: .2em;
-	margin-bottom: .5em;
+    margin-top: .2em;
+    margin-bottom: .5em;
 }
 dd {
-	line-height: 1.5em;
-	margin-left: 2em;
-	margin-bottom: .1em;
+    line-height: 1.5em;
+    margin-left: 2em;
+    margin-bottom: .1em;
 }
 
 fieldset {
-	border: 1px solid #2f6fab;
-	margin: 1em 0 1em 0;
-	padding: 0 1em 1em 1em;
-	line-height: 1.5em;
+    border: 1px solid #2f6fab;
+    margin: 1em 0 1em 0;
+    padding: 0 1em 1em 1em;
+    line-height: 1.5em;
 }
 legend {
-	/*background: white;*/
-	padding: 0.5em;
-	font-size: 95%;
+    padding: 0.5em;
+    font-size: 95%;
 }
 form {
-	border: none;
-	margin: 0;
+    border: none;
+    margin: 0;
 }
 
 textarea {
-	width: 100%;
-	padding: .1em;
+    width: 100%;
+    padding: .1em;
 }
 
 input.historysubmit {
-	padding: 0 0.3em 0.3em 0.3em !important;
-	font-size: 94%;
-	cursor: pointer;
-	height: 1.7em !important;
-	margin-left: 1.6em;
+    padding: 0 0.3em 0.3em 0.3em !important;
+    font-size: 94%;
+    cursor: pointer;
+    height: 1.7em !important;
+    margin-left: 1.6em;
 }
 select {
-	vertical-align: top;
+    vertical-align: top;
 }
 abbr, acronym, .explain {
-	border-bottom: 1px dotted black;
-	color: black;
-	background: none;
-	cursor: help;
+    border-bottom: 1px dotted black;
+    color: black;
+    background-image: none;
+    cursor: help;
 }
 q {
-	font-family: Times, "Times New Roman", serif;
-	font-style: italic;
+    font-family: Times, "Times New Roman", serif;
+    font-style: italic;
 }
 /* disabled for now
 blockquote {
-	font-family: Times, "Times New Roman", serif;
-	font-style: italic;
+    font-family: Times, "Times New Roman", serif;
+    font-style: italic;
 }*/
 code {
-	background-color: #f9f9f9;
+    background-color: #f9f9f9;
 }
 pre {
-	padding: 1em;
-	border: 1px dashed #2f6fab;
-	color: black;
-	background-color: #f9f9f9;
-	line-height: 1.1em;
+    padding: 1em;
+    border: 1px dashed #2f6fab;
+    color: black;
+    background-color: #f9f9f9;
+    line-height: 1.1em;
 }
 
 /*
@@ -222,275 +217,270 @@
 
 #siteSub { display: none; }
 #jump-to-nav {
-	display: none;
+    display: none;
 }
 #contentSub {
-	font-size: 84%;
-	line-height: 1.2em;
-	margin: 0 0 1.4em 1em;
-	color: #7d7d7d;
-	width: auto;
+    font-size: 84%;
+    line-height: 1.2em;
+    margin: 0 0 1.4em 1em;
+    color: #7d7d7d;
+    width: auto;
 }
 span.subpages { display: block; }
 
 /* Space for the right logo with rating */
 h1.firstHeading-rating {
-	margin-right: 220px;
-	line-height: 1.2em;
+    margin-right: 220px;
+    line-height: 1.2em;
 }
 /* Space for the right logo without rating */
 h1.firstHeading {
-	margin-right: 40px;
-	line-height: 1.2em;
+    margin-right: 40px;
+    line-height: 1.2em;
 }
 #edit-public, h1.firstHeading-public, h1.firstHeading-rating-public {
-	background-color: #ffce7b;
-	border: 1px solid #ffa500;
+    background-color: #ffce7b;
+    border: 1px solid #ffa500;
 }
 /* Some space under the headers in the content area */
 #bodyContent h1, #bodyContent h2 {
-	margin-bottom: .6em;
+    margin-bottom: .6em;
 }
 #bodyContent h3, #bodyContent h4, #bodyContent h5 {
-	margin-bottom: .3em;
+    margin-bottom: .3em;
 }
 .firstHeading { margin-bottom: 0.1em; }
 
 /* user notification thing */
 .usermessage {
-	background-color: #ffce7b;
-	border: 1px solid #ffa500;
-	color: black;
-	font-weight: bold;
-	margin: 2em 0 1em;
-	padding: .5em 1em;
-	vertical-align: middle;
+    background-color: #ffce7b;
+    border: 1px solid #ffa500;
+    color: black;
+    font-weight: bold;
+    margin: 2em 0 1em;
+    padding: .5em 1em;
+    vertical-align: middle;
 }
 #siteNotice {
-	text-align: center;
-	font-size: 95%;
-	padding: 0 .9em;
+    text-align: center;
+    font-size: 95%;
+    padding: 0 .9em;
 }
 #siteNotice p {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 .errorbox, .successbox {
-	font-size: larger;
-	border: 2px solid;
-	padding: .5em 1em;
-	float: left;
-	margin-bottom: 2em;
-	color: #000;
+    font-size: larger;
+    border: 2px solid;
+    padding: .5em 1em;
+    float: left;
+    margin-bottom: 2em;
+    color: #000;
 }
 .errorbox {
-	border-color: red;
-	background-color: #fff2f2;
+    border-color: red;
+    background-color: #fff2f2;
 }
 .successbox {
-	border-color: green;
-	background-color: #dfd;
+    border-color: green;
+    background-color: #dfd;
 }
 .errorbox h2, .successbox h2 {
-	font-size: 1em;
-	font-weight: bold;
-	display: inline;
-	margin: 0 .5em 0 0;
-	border: none;
+    font-size: 1em;
+    font-weight: bold;
+    display: inline;
+    margin: 0 .5em 0 0;
+    border: none;
 }
 
 #catlinks {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	margin-top: 1em;
-	clear: both;
+    border: 1px solid #aaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    margin-top: 1em;
+    clear: both;
 }
 /* currently unused, intended to be used by a metadata box
 in the bottom-right corner of the content area */
 .documentDescription {
-	/* The summary text describing the document */
-	font-weight: bold;
-	display: block;
-	margin: 1em 0;
-	line-height: 1.5em;
+    /* The summary text describing the document */
+    font-weight: bold;
+    display: block;
+    margin: 1em 0;
+    line-height: 1.5em;
 }
 .documentByLine {
-	text-align: right;
-	font-size: 90%;
-	clear: both;
-	font-weight: normal;
-	color: #76797c;
+    text-align: right;
+    font-size: 90%;
+    clear: both;
+    font-weight: normal;
+    color: #76797c;
 }
 
 /* emulate center */
 .center {
-	width: 100%;
-	text-align: center;
+    width: 100%;
+    text-align: center;
 }
 *.center * {
-	margin-left: auto;
-	margin-right: auto;
+    margin-left: auto;
+    margin-right: auto;
 }
 /* small for tables and similar */
 .small, .small * {
-	font-size: 94%;
+    font-size: 94%;
 }
 table.small {
-	font-size: 100%;
+    font-size: 100%;
 }
 
 /*
 ** RecentChanges
 */
-.pageinfo-majoredit { 
-	font-weight: normal; /*bold;*/
+.pageinfo-majoredit {
+    font-weight: normal; /*bold;*/
 }
 .wiki-summary {
-	font-size: 94%;
-	font-style: italic;
+    font-size: 94%;
+    font-style: italic;
 }
 
 /*
 ** content styles
 */
 .mw-warning {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	margin-bottom: 8px;
-	font-size: 95%;
+    border: 1px solid #aaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    margin-bottom: 8px;
+    font-size: 95%;
 }
 #toc,
 .toc {
-	width: 200px;
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
-	float: right;
-	clear: right;
+    width: 200px;
+    border: 1px solid #aaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    font-size: 95%;
+    float: right;
+    clear: right;
 }
 #toc h2,
 .toc h2 {
-	display: inline;
-	border: none;
-	padding: 0;
-	font-size: 100%;
-	font-weight: bold;
+    display: inline;
+    border: none;
+    padding: 0;
+    font-size: 100%;
+    font-weight: bold;
 }
 .toc #toclist {
-	width: auto;
-	border: none;
+    width: auto;
+    border: none;
 }
 #toc #toctitle,
 .toc #toctitle,
 #toc .toctitle,
 .toc .toctitle {
-	text-align: center;
+    text-align: center;
 }
 #toc ul,
 .toc ul {
-	list-style-type: none;
-	list-style-image: none;
-	margin-left: 0;
-	padding-left: 0;
-	text-align: left;
+    list-style-type: none;
+    list-style-image: none;
+    margin-left: 0;
+    padding-left: 0;
+    text-align: left;
 }
 #toc ul ul,
 .toc ul ul {
-	margin: 0 0 0 2em;
+    margin: 0 0 0 2em;
 }
 #toc .toctoggle,
 .toc .toctoggle {
-	font-size: 94%;
+    font-size: 94%;
 }
 
 .mw-warning {
-	margin-left: 50px;
-	margin-right: 50px;
-	text-align: center;
+    margin-left: 50px;
+    margin-right: 50px;
+    text-align: center;
 }
 
 /* images */
 div.floatright, table.floatright {
-	clear: right;
-	float: right;
-	position: relative;
-	margin: 0 0 .5em .5em;
-	border: 0;
+    clear: right;
+    float: right;
+    position: relative;
+    margin: 0 0 .5em .5em;
+    border: 0;
 /*
-	border: .5em solid white;
-	border-width: .5em 0 .8em 1.4em;
+    border: .5em solid white;
+    border-width: .5em 0 .8em 1.4em;
 */
 }
 div.floatright p { font-style: italic; }
 div.floatleft, table.floatleft {
-	float: left;
-	position: relative;
-	margin: 0 .5em .5em 0;
-	border: 0;
-/*
-	margin: .3em .5em .5em 0;
-	border: .5em solid white;
-	border-width: .5em 1.4em .8em 0;
-*/
+    float: left;
+    position: relative;
+    margin: 0 .5em .5em 0;
+    border: 0;
 }
 div.floatleft p { font-style: italic; }
 /* thumbnails */
 div.thumb {
-	margin-bottom: .5em;
-	border-style: solid;
-	border-color: white;
-	width: auto;
+    margin-bottom: .5em;
+    border-style: solid;
+    border-color: white;
+    width: auto;
 }
 div.thumb div {
-	border: 1px solid #ccc;
-	padding: 3px !important;
-	background-color: #f9f9f9;
-	font-size: 94%;
-	text-align: center;
-	overflow: hidden;
+    border: 1px solid #ccc;
+    padding: 3px !important;
+    background-color: #f9f9f9;
+    font-size: 94%;
+    text-align: center;
+    overflow: hidden;
 }
 div.thumb div a img {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
 }
 div.thumb div div.thumbcaption {
-	border: none;
-	text-align: left;
-	line-height: 1.4em;
-	padding: .3em 0 .1em 0;
+    border: none;
+    text-align: left;
+    line-height: 1.4em;
+    padding: .3em 0 .1em 0;
 }
 div.magnify {
-	float: right;
-	border: none !important;
-	background: none !important;
+    float: right;
+    border-style: none !important;
+    background-image: none !important;
 }
 div.magnify a, div.magnify img {
-	display: block;
-	border: none !important;
-	background: none !important;
+    display: block;
+    border-style: none !important;
+    background-image: none !important;
 }
 div.tright {
-	clear: right;
-	float: right;
-	border-width: .5em 0 .8em 1.4em;
+    clear: right;
+    float: right;
+    border-width: .5em 0 .8em 1.4em;
 }
 div.tleft {
-	float: left;
-	margin-right: .5em;
-	border-width: .5em 1.4em .8em 0;
+    float: left;
+    margin-right: .5em;
+    border-width: .5em 1.4em .8em 0;
 }
 
 .hiddenStructure {
-	display: none;
-	speak: none;
+    display: none;
+    speak: none;
 }
 img.tex {
-	vertical-align: middle;
+    vertical-align: middle;
 }
 span.texhtml {
-	font-family: serif;
+    font-family: serif;
 }
 
 /*
@@ -503,93 +493,93 @@
 */
 /* table standards */
 table.rimage {
-	float: right;
-	position: relative;
-	margin-left: 1em;
-	margin-bottom: 1em;
-	text-align: center;
+    float: right;
+    position: relative;
+    margin-left: 1em;
+    margin-bottom: 1em;
+    text-align: center;
 }
 .toccolours {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
+    border: 1px solid #aaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    font-size: 95%;
 }
 div.townBox {
-	position: relative;
-	float: right;
-	background: white;
-	margin-left: 1em;
-	border: 1px solid gray;
-	padding: .3em;
-	width: 200px;
-	overflow: hidden;
-	clear: right;
+    position: relative;
+    float: right;
+    background-color: white;
+    margin-left: 1em;
+    border: 1px solid gray;
+    padding: .3em;
+    width: 200px;
+    overflow: hidden;
+    clear: right;
 }
 div.townBox dl {
-	padding: 0;
-	margin: 0 0 .3em;
-	font-size: 96%;
+    padding: 0;
+    margin: 0 0 .3em;
+    font-size: 96%;
 }
 div.townBox dl dt {
-	background: none;
-	margin: .4em 0 0;
+    background-image: none;
+    margin: .4em 0 0;
 }
 div.townBox dl dd {
-	margin: .1em 0 0 1.1em;
-	background-color: #f3f3f3;
+    margin: .1em 0 0 1.1em;
+    background-color: #f3f3f3;
 }
 
 /*
 ** edit views etc
 */
 .special li {
-	line-height: 1.4em;
-	margin: 0;
-	padding: 0;
+    line-height: 1.4em;
+    margin: 0;
+    padding: 0;
 }
 
 /* Page history styling */
 /* the auto-generated edit comments */
 .autocomment {
-	color: gray;
+    color: gray;
 }
 #pagehistory span.user {
-	margin-left: 1.4em;
-	margin-right: .4em;
+    margin-left: 1.4em;
+    margin-right: .4em;
 }
 #pagehistory span.minor {
-	font-weight: bold;
+    font-weight: bold;
 }
 #pagehistory li {
-	border: 1px solid white;
+    border: 1px solid white;
 }
 #pagehistory li.selected {
-	background-color: #f9f9f9;
-	border: 1px dashed #aaa;
+    background-color: #f9f9f9;
+    border: 1px dashed #aaa;
 }
 
 /*
 ** Diff rendering (unused)
 */
 table.diff, td.diff-otitle, td.diff-ntitle {
-	background-color: white;
+    background-color: white;
 }
 td.diff-addedline {
-	background: #cfc;
-	font-size: smaller;
+    background-color: #cfc;
+    font-size: smaller;
 }
 td.diff-deletedline {
-	background: #ffa;
-	font-size: smaller;
+    background-color: #ffa;
+    font-size: smaller;
 }
 td.diff-context {
-	background: #eee;
-	font-size: smaller;
+    background-color: #eee;
+    font-size: smaller;
 }
 span.diffchange {
-	color: red;
-	font-weight: bold;
+    color: red;
+    font-weight: bold;
 }
 
 /**
@@ -597,155 +587,123 @@
  */
 /* main box */
 .diff {
-	margin-top:    1ex;
-	margin-bottom: 0.5ex;
-	background: white;
-	/* Netscape 4 requires this 1px border.
-	 Without it, the paper borders below cause
-	 the white background to disappear. */
-	border: 1px #ccc solid;
-	color: black;
-	border-top: 1px solid #494f5d;
-	border-left:  1px solid #494f5d;
-	border-bottom:  1px solid #c6d2de;
-	border-right: 1px solid #c6d2de;
-	padding-top:    1px;
-	padding-bottom: 1px;
-	padding-left:  .125em;
-	padding-right: .125em;
-	padding: 0;
-	/* "paper" borders */
-	/*border-top: 2px #d2d2d2 solid;
-	border-left:  2px #b2b2b2 solid;
-	border-bottom:  2px #e8e6df solid;
-	border-right: 2px #e8e6df solid;*/
-/*  padding-left:  0em; 
-	padding-bottom: 0ex;*/
-/*  border-style: inset;*/
-	/*This breaks Netscape 4: (display does not go full width).
-	 * width: auto;
-	 */
-	/* I'm not sure what the intent of this was, but it's
-	 *  not valid CSS: */
-	/* display: editarea; */
-	clear: both;
+    margin-top:    1ex;
+    margin-bottom: 0.5ex;
+    background-color: white;
+    color: black;
+    border-top: 1px solid #494f5d;
+    border-left:  1px solid #494f5d;
+    border-bottom:  1px solid #c6d2de;
+    border-right: 1px solid #c6d2de;
+    padding-top:    1px;
+    padding-bottom: 1px;
+    padding-left:  .125em;
+    padding-right: .125em;
+    padding: 0;
+    clear: both;
 }
 .diff .block {
-	background: #ddd;
-	padding-left: 1em;
-	/* for NS4 */
-	/*border: none;*/
+    background-color: #ddd;
+    padding-left: 1em;
 }
 
 /* individual blocks */
 .diff .context {
-	background: white;
-	/* for NS4 */
-	border: none;
+    background-color: white;
+    border: none;
 }
 /* entire difftextblock */
 .difftext {
-	margin-top:    0;
-	margin-bottom: 0;
-	background: white;
-	/* Netscape 4 requires this 1px border.
-	 Without it, the paper borders below cause
-	 the white background to disappear. */
-	border: 1px black solid;
-	/* "paper" borders */
-	border-top:  1px #e8e6df solid;
-	border-left: 1px #e8e6df solid;
-	border-bottom: 1px #d2d2d2 solid;
-	border-right:  1px #b2b2b2 solid;
-	padding-left:  0em; 
-	padding-right: 0em;
-	padding-top:    0ex;
-	padding-bottom: 0ex;
-	/*This breaks Netscape 4: (display does not go full width).
-	 * width: auto;
-	 */
-	clear: both;
+    margin-top:    0;
+    margin-bottom: 0;
+    background-color: white;
+    /* "paper" borders */
+    border-top:  1px #e8e6df solid;
+    border-left: 1px #e8e6df solid;
+    border-bottom: 1px #d2d2d2 solid;
+    border-right:  1px #b2b2b2 solid;
+    padding-left:  0em;
+    padding-right: 0em;
+    padding-top:    0ex;
+    padding-bottom: 0ex;
+    clear: both;
 }
 /* + - line prefix */
 .diff .block tt {
-	font-weight: normal;
-	font-family: monospace;
-	color: black;
-	/* for NS4 */
-	margin-left: 0;
-	border: none;
+    font-weight: normal;
+    font-family: monospace;
+    color: black;
+    margin-left: 0;
+    border: none;
 }
 /* changed words */
 .diff del, .diff ins {
-	font-weight: bold;
-	text-decoration: none;
+    font-weight: bold;
+    text-decoration: none;
 }
 
 /* blocks containing deleted or added words */
 .diff .original, .diff .deleted,
 .diff .final, .diff .added {
-	background: white;
+    background-color: white;
 }
 /* blocks containing deleted words */
 .diff .original, .diff .deleted {
-	background: #fcc;
-	/* for NS4 */
-	border: none;
+    background-color: #fcc;
+    border: none;
 }
 /* blocks containing added words */
 .diff .final, .diff .added {
-	background: #cfc;
-	/* for NS4 */
-	border: none;
+    background-color: #cfc;
+    border: none;
 }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 /* deleted words */
-.diff del { background: #f99; }
+.diff del { background-color: #f99; }
 /* added words */
-.diff ins { background: #9f9; }
+.diff ins { background-color: #9f9; }
 
 /**
  * PageHistory, Info
  */
 td.pageinfo { font-weight: bold; }
 .pageinfo-minoredit, .pageinfo-authorid {
-	font-size: smaller;
-	font-style: oblique;
+    font-size: smaller;
+    font-style: oblique;
 }
 
 /**
  * Calendar plugin
  */
 table.cal {
-	border: 1px outset gray;
-	background: white;
-	margin: 0.5ex 0.5em;
-	padding: 1px;
-	/* For Mozilla */
-	empty-cells: hide;
-} 
+    border: 1px outset gray;
+    background-color: white;
+    margin: 0.5ex 0.5em;
+    padding: 1px;
+    /* For Mozilla */
+    empty-cells: hide;
+}
 
 /* cells */
 table.cal td {
-	background: white;
-	text-align: right;
-} 
+    background-color: white;
+    text-align: right;
+}
 
 /* Month-name header */
 table.cal-header { font-size: larger; }
 table.cal-header tr, table.cal-header td { text-align: center; }
 .cal-arrow {
-	font-weight: bold;
-	text-decoration: none;
+    font-weight: bold;
+    text-decoration: none;
 }
 
 /* Day-names header */
 table.cal tbody tr .cal-dayname {  }
 .cal-dayname td {
-	text-align: center;
-	font-size: smaller;
-	text-decoration: underline;
+    text-align: center;
+    font-size: smaller;
+    text-decoration: underline;
 }
 
 /* Individual days */
@@ -754,60 +712,72 @@
 /* Today */
  /* cell */
 table.cal td.cal-today {
-	margin: 1px;
-	border: 1px solid gray;
+    margin: 1px;
+    border: 1px solid gray;
 }
  /* text */
 table.cal td.cal-today a.cal-hide {  }
 
-/* 
+/*
 ** keep the whitespace in front of the ^=, hides rule from konqueror
-** this is css3, the validator doesn't like it when validating as css2 
+** this is css3, the validator doesn't like it when validating as css2
 */
 #bodyContent a.external,
 #bodyContent a[href ^="gopher://"] {
-	background: url("images/url.png") center right no-repeat;
-	padding-right: 13px;
+    background-image: url("images/url.png");
+    background-position: center right;
+    background-repeat: no-repeat;
+    padding-right: 13px;
 }
 #bodyContent a[href ^="https://"],
 .link-https {
-	background: url("images/lock_icon.png") center right no-repeat;
-	padding-right: 16px;
+    background-image: url("images/lock_icon.png");
+    background-position: center right;
+    background-repeat: no-repeat;
+    padding-right: 16px;
 }
 #bodyContent a[href ^="mailto:"],
 .link-mailto {
-	background: url("images/mail_icon.png") center right no-repeat;
-	padding-right: 18px;
+    background-image: url("images/mail_icon.png");
+    background-position: center right;
+    background-repeat: no-repeat;
+    padding-right: 18px;
 }
 #bodyContent a[href ^="news://"] {
-	background: url("images/news_icon.png") center right no-repeat;
-	padding-right: 18px;
+    background-image: url("images/news_icon.png");
+    background-position: center right;
+    background-repeat: no-repeat;
+    padding-right: 18px;
 }
 #bodyContent a[href ^="ftp://"],
 .link-ftp {
-	background: url("images/file_icon.png") center right no-repeat;
-	padding-right: 18px;
+    background-image: url("images/file_icon.png");
+    background-position: center right;
+    background-repeat: no-repeat;
+    padding-right: 18px;
 }
 #bodyContent a[href ^="irc://"],
 .link-irc {
-	background: url("images/discussionitem_icon.png")  center right no-repeat;
-	padding-right: 18px;
+    background-image: url("images/discussionitem_icon.png");
+    background-position: center right;
+    background-repeat: no-repeat;
+    padding-right: 18px;
 }
 /* disable interwiki styling */
 #bodyContent a.extiw,
 #bodyContent a.extiw:active {
-	color: #36b;
-	background: none;
-	padding: 0;
+    color: #36b;
+    background-image: none;
+    padding: 0;
 }
 #bodyContent a.external {
-	color: #36b;
+    color: #36b;
 }
 /* this can be used in the content area to switch off
 special external link styling */
 #bodyContent .plainlinks a {
-	background: none !important;
-	padding: 0 !important;
+    background-image: none !important;
+    padding: 0 !important;
 }
 /*
 ** Structural Elements
@@ -817,129 +787,127 @@
 ** general portlet styles (elements in the quickbar)
 */
 .portlet {
-	border: none;
-	margin: 0 0 .5em;
-	padding: 0;
-	float: none;
-	width: 11.6em;
-	overflow: hidden;
+    border: none;
+    margin: 0 0 .5em;
+    padding: 0;
+    float: none;
+    width: 11.6em;
+    overflow: hidden;
 }
 .portlet h4 {
-	font-size: 95%;
-	font-weight: normal;
-	white-space: nowrap;
+    font-size: 95%;
+    font-weight: normal;
+    white-space: nowrap;
 }
 .portlet h5 {
-	background: transparent;
-	padding: 0em 1em 0em 0.5em;
-	/*text-transform: lowercase;*/
-	display: inline;
-	font-size: 91%;
-	height: 16px;
-	width: 11.6em;
-	font-weight: bold;
-	white-space: nowrap;
+    background-color: transparent;
+    padding: 0em 1em 0em 0.5em;
+    /*text-transform: lowercase;*/
+    display: inline;
+    font-size: 91%;
+    height: 16px;
+    width: 11.6em;
+    font-weight: bold;
+    white-space: nowrap;
 }
 .portlet h5 img {
-	padding: 0;
-	margin: 0;
-	top: 0px;
-	right: 0px;
-	height: 15px;
-	width: 15px;
-	border: 0;
+    padding: 0;
+    margin: 0;
+    top: 0px;
+    right: 0px;
+    height: 15px;
+    width: 15px;
+    border: 0;
 }
-.portlet h6 { 
-	background: #ffae2e;
-	border: 1px solid #2f6fab;
-	border-style: solid solid none solid;
-	padding: 0em 1em 0em 1em;
-	/*text-transform: lowercase;*/
-	display: block;
-	font-size: 1em;
-	height: 1.2em;
-	font-weight: normal;
-	white-space: nowrap;
+.portlet h6 {
+    background-color: #ffae2e;
+    border: 1px solid #2f6fab;
+    border-style: solid solid none solid;
+    padding: 0em 1em 0em 1em;
+    /*text-transform: lowercase;*/
+    display: block;
+    font-size: 1em;
+    height: 1.2em;
+    font-weight: normal;
+    white-space: nowrap;
 }
 .pBody {
-	font-size: 95%;
-	background-color: white;
-	color: black;
-	border-collapse: collapse;
-	border: 1px solid #aaa;
-	padding: 0 .8em .3em .5em;
+    font-size: 95%;
+    background-color: white;
+    color: black;
+    border-collapse: collapse;
+    border: 1px solid #aaa;
+    padding: 0 .8em .3em .5em;
 }
 .portlet h1,
 .portlet h2,
 .portlet h3,
 .portlet h4 {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 .portlet ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	list-style-image: url("images/bullet.png");
-	font-size:95%;
+    line-height: 1.5em;
+    list-style-type: square;
+    list-style-image: url("images/bullet.png");
+    font-size:95%;
 }
 .portlet li {
-	padding:0;
-	margin: 0 0 0 0;
-	margin-bottom: 0;
+    padding:0;
+    margin: 0 0 0 0;
+    margin-bottom: 0;
 }
 
-/* 
-** Logo properties 
+/*
+** Logo properties
  * Optionally at the right also an image
 */
 #p-logo {
-	z-index: 1;
-	position: absolute; /*needed to use z-index */
-	top:  0;
-	left: 0;
-	height: 42px;
-	width: 100%;
-	/*width:  340px;*/
-	overflow: visible;
-	background: #005A99;
-	/*background: #000099;*/
+    z-index: 1;
+    position: absolute; /*needed to use z-index */
+    top:  0;
+    left: 0;
+    height: 42px;
+    width: 100%;
+    overflow: visible;
+    background-color: #005A99;
 }
 #p-logo h5 { display: none; }
 #p-logo a,
 #p-logo a:hover {
-	display: block;
-	height: 42px;
-	/*width: 12.2em;*/
-	background-repeat: no-repeat;
-	background-position: 35% 50% !important;
+    display: block;
+    height: 42px;
+    /*width: 12.2em;*/
+    background-repeat: no-repeat;
+    background-position: 35% 50% !important;
 }
 span.logo {
-	z-index: 1;
-	position: absolute; /*needed to use z-index */
-	white-space: nowrap;
-        left: 18px;
-	top: 3px;
-	color: #ffffff;
-	font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
-        font-size: 24pt;
-	font-weight: bolder;
-	text-decoration: none;
-	vertical-align: middle;
+    z-index: 1;
+    position: absolute; /*needed to use z-index */
+    white-space: nowrap;
+    left: 18px;
+    top: 3px;
+    color: #ffffff;
+    font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
+    font-size: 24pt;
+    font-weight: bolder;
+    text-decoration: none;
+    vertical-align: middle;
 }
 
 /* At the right we put a small "wiki stamp" */
-#img-logo-right { 
-	position: absolute;
-	z-index: 3;
-	top:  0;
-	right: 40px;
+#img-logo-right {
+    position: absolute;
+    z-index: 3;
+    top:  0;
+    right: 40px;
 }
-#img-logo-band { 
-	position: absolute;
-	z-index: 3;
-	top:  0;
-	right: 40px;
-	height: 45px;
+#img-logo-band {
+    position: absolute;
+    z-index: 3;
+    top:  0;
+    right: 40px;
+    height: 45px;
 }
 
 /*
@@ -947,25 +915,25 @@
 */
 
 #p-navigation {
-	position: relative;
-	z-index: 3;
+    position: relative;
+    z-index: 3;
 }
 #p-navigation .pBody {
-	padding-right: 0;
+    padding-right: 0;
 }
 #p-nav1 {
-	position:relative;
-	z-index:3;
+    position:relative;
+    z-index:3;
 }
 
 #p-navigation a {
-	display: block;
+    display: block;
 }
 
 #p-navigation li.active a, #p-navigation li.active a:hover {
-	text-decoration: none;
-	display: inline;
-	font-weight: bold;
+    text-decoration: none;
+    display: inline;
+    font-weight: bold;
 }
 
 
@@ -974,63 +942,61 @@
 *  Search in the top row (not yet), see p-personal how to do that
 */
 #logo-search {
-	position:absolute;
-	z-index: 4;
-	top:  5px;
-	left: 340px;
-	height: 25px;
-	/*width:  100%;*/
-	overflow: visible;
-}  
+    position:absolute;
+    z-index: 4;
+    top:  5px;
+    left: 340px;
+    height: 25px;
+    overflow: visible;
+}
 #p-search {
-	position:relative;
-	z-index:3;
-}    
+    position:relative;
+    z-index:3;
+}
 #p-search .pBody {
-	/*text-align: center;*/
+    /*text-align: center;*/
 }
-div.pBody > button, #searchButton { 
-	margin: 0;
-	padding: 0;
+div.pBody > button, #searchButton {
+    margin: 0;
+    padding: 0;
 }
 #p-search .pBody {
-	margin: 0;
-	padding: .5em 0 .4em .4em;
-	/*text-align: center;*/
+    margin: 0;
+    padding: .5em 0 .4em .4em;
+    /*text-align: center;*/
 }
-#searchholder form.searchform { 
-	margin: 0; 
-	padding: 0; 
-	display: inline;
+#searchholder form.searchform {
+    margin: 0;
+    padding: 0;
+    display: inline;
 }
-button.searchButton { 
-	margin: 0;
-	padding: 0;
-	cursor: pointer;
-	width: 18px;
-	height: 18px;
-	border: 1px solid ButtonShadow;
+button.searchButton {
+    margin: 0;
+    padding: 0;
+    cursor: pointer;
+    width: 18px;
+    height: 18px;
+    border: 1px solid ButtonShadow;
 }
 input.searchButton {
-	margin-top: 1px;
-	/*padding: 0 0.4em !important;*/
-	font-size: 8pt;
-	cursor: pointer;
-	width: 64px;
-	padding-left: 1px;
-	background-color: White;
-	border: 1px solid #2f6fab;
-	text-transform: capitalize;
+    margin-top: 1px;
+    font-size: 8pt;
+    cursor: pointer;
+    width: 64px;
+    padding-left: 1px;
+    background-color: White;
+    border: 1px solid #2f6fab;
+    text-transform: capitalize;
 }
 #searchInput {
-	width: 120px;
-	height: 18px;
-	margin: 0;
-	font-size: 95%;
-	border-width: 1px;
-	border-style: solid;
-	border-color: #aaa #eee #eee #aaa;
-	-moz-box-sizing: border-box;
+    width: 120px;
+    height: 18px;
+    margin: 0;
+    font-size: 95%;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #aaa #eee #eee #aaa;
+    -moz-box-sizing: border-box;
 }
 
 /*
@@ -1038,74 +1004,67 @@
 */
 
 #p-personal {
-	width:100%;
-	white-space:nowrap;
-	padding: 0 0 0 0;
-	margin: 0;
-	position: absolute;
-	/*left: 300px;*/
-	right: 140px;
-	top: 15px;
-	z-index: 4;
-	border: none;
-	/* background: white; */
-	overflow: visible;
-	color: black;
-	line-height: 1.2em;
+    width:100%;
+    white-space:nowrap;
+    padding: 0 0 0 0;
+    margin: 0;
+    position: absolute;
+    right: 140px;
+    top: 15px;
+    z-index: 4;
+    border: none;
+    overflow: visible;
+    color: black;
+    line-height: 1.2em;
 }
 
 #p-personal h5 {
-	display:none;
+    display:none;
 }
 #p-personal .portlet,
 #p-personal .pBody {
-	padding:0;
-	margin:0;
-	border: none;
-	z-index:0;
-	overflow: visible;
-	background: none;
+    padding:0;
+    margin:0;
+    border: none;
+    z-index:0;
+    overflow: visible;
+    background-image: none;
 }
 /* this is the ul contained in the portlet */
 #p-personal ul {
-	border: none;
-	line-height: 1.5em;
-	color: #2f6fab;
-	padding: 0em 1.5em 0 2em;
-	margin: 0;
-	text-align: right;
-	/* text-transform: lowercase; */
-	list-style: none;
-	z-index:0;
-	background: none;
-	cursor: default;
+    border: none;
+    line-height: 1.5em;
+    color: #2f6fab;
+    padding: 0em 1.5em 0 2em;
+    margin: 0;
+    text-align: right;
+    list-style: none;
+    z-index:0;
+    background-image: none;
+    cursor: default;
 }
 #p-personal li {
-	z-index:0;
-	border:none;
-	padding:0;
-	display: inline;
-	color: #2f6fab;
-	margin-left: 0.8em;
-	line-height: 1.2em;
-	background: none;
+    z-index:0;
+    border:none;
+    padding:0;
+    display: inline;
+    color: #2f6fab;
+    margin-left: 0.8em;
+    line-height: 1.2em;
+    background-image: none;
 }
 #p-personal li a {
-	text-decoration: none;
-	color: white;
-	/*background: #005A99;*/
-	/*background: #000099;*/
-	padding-left: 0.5em;
-	padding-bottom: 0.2em;
-	/* letter-spacing: 110%; */
-	/* background: none; */
+    text-decoration: none;
+    color: white;
+    padding-left: 0.5em;
+    padding-bottom: 0.2em;
 }
 #p-personal li a:hover {
-	color: white;
-	background: #005A99;
-	padding-bottom: 0.2em;
-	font-weight: bold;
-	text-decoration: none;
+    color: white;
+    background-color: #005A99;
+    padding-bottom: 0.2em;
+    font-weight: bold;
+    text-decoration: none;
 }
 
 /* the icon in front of the user name, single quotes
@@ -1115,10 +1074,11 @@
 li#pt-userpage,
 li#pt-anonuserpage,
 li#pt-login {
-	background:  url('images/wikiuser.png') top left no-repeat;
-	background-repeat: no-repeat;
-	padding-left: 10px;
-	text-transform: none;
+    background-image: url('images/wikiuser.png');
+    background-position: top left;
+    background-repeat: no-repeat;
+    padding-left: 10px;
+    text-transform: none;
 }
 #p-personal a.new { color:#ba0000; }
 
@@ -1126,94 +1086,93 @@
 ** the page-related actions- page/talk, edit etc
 */
 #p-cactions {
-	position: absolute;
-	top: 40px; /*1.3em;*/
-	left: /*11.5em;*/ 13.2em;
-	margin: 0;
-	white-space:nowrap;
-	width: 76%;
-	line-height: 1.1em;
-	overflow: visible;
-	background: none;
-	border-collapse: collapse;
-	padding-left: 1em;
-	list-style: none;
-	font-size: 95%;
+    position: absolute;
+    top: 40px; /*1.3em;*/
+    left: /*11.5em;*/ 13.2em;
+    margin: 0;
+    white-space:nowrap;
+    width: 76%;
+    line-height: 1.1em;
+    overflow: visible;
+    background-image: none;
+    border-collapse: collapse;
+    padding-left: 1em;
+    list-style: none;
+    font-size: 95%;
 }
 #p-cactions .hiddenStructure { display: none; }
 #p-cactions ul {
-	list-style: none;
+    list-style: none;
 }
 #p-cactions li {
-	display: inline;
-	border: 1px solid #aaa;
-	border-bottom: none;
-	padding: 0 0 .1em 0;
-	margin: 0 .3em 0 0;
-	overflow: visible;
-	background: white;
+    display: inline;
+    border: 1px solid #aaa;
+    border-bottom: none;
+    padding: 0 0 .1em 0;
+    margin: 0 .3em 0 0;
+    overflow: visible;
+    background-color: white;
 }
 #p-cactions li.selected {
-	border-color: #fabd23;
-	padding: 0 0 0.2em 0;
+    border-color: #fabd23;
+    padding: 0 0 0.2em 0;
 }
 #p-cactions li a {
-	background-color: #fbfbfb;
-	color: #002bb8;
-	border: none;
-	padding: 0 .8em .3em;
-	text-decoration: none;
-	/*text-transform: lowercase;*/
-	position: relative;
-	z-index: 0;
-	margin: 0;
+    background-color: #fbfbfb;
+    color: #002bb8;
+    border: none;
+    padding: 0 .8em .3em;
+    text-decoration: none;
+    position: relative;
+    z-index: 0;
+    margin: 0;
 }
 #p-cactions li.selected a {
-	z-index: 3;
-	background-color: #fff;
-	padding: 0 1em .2em;
+    z-index: 3;
+    background-color: #fff;
+    padding: 0 1em .2em;
 }
 #p-cactions .new a {
-	color: #ba0000;
+    color: #ba0000;
 }
 #p-cactions li a:hover {
-	z-index: 3;
-	text-decoration: none;
-	background-color: #fff;
-	padding-bottom: 0.3em;
+    z-index: 3;
+    text-decoration: none;
+    background-color: #fff;
+    padding-bottom: 0.3em;
 }
 /* http://universaleditbutton.org */
 #p-cactions li a#btn-edit {
-	background:  url('images/UEB16.png') top left no-repeat;
-	background-repeat: no-repeat;
-	padding-left: 20px !important;
-	text-transform: none;
+    background-image: url('images/UEB16.png');
+    background-position: top left;
+    background-repeat: no-repeat;
+    padding-left: 20px !important;
+    text-transform: none;
 }
 #p-cactions li a#btn-edit:hover {
-	z-index: 3;
-	text-decoration: none;
-	background-color: #fff;
-	/*padding-bottom: 0.3em !important;*/
+    z-index: 3;
+    text-decoration: none;
+    background-color: #fff;
 }
 #p-cactions h5 {
-	display: none;
+    display: none;
 }
 #p-cactions li.istalk {
-	margin-right: 0;
+    margin-right: 0;
 }
 #p-cactions li.istalk a {
-	padding-right: .5em;
+    padding-right: .5em;
 }
 #p-cactions #ca-addsection a {
-	padding-left: .4em;
-	padding-right: .4em;
+    padding-left: .4em;
+    padding-right: .4em;
 }
 /* offsets to distinguish the tab groups */
 li#ca-talk {
-	margin-right: 1.6em;
+    margin-right: 1.6em;
 }
 li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
-	margin-left: 1.6em;
+    margin-left: 1.6em;
 }
 
 /*
@@ -1221,440 +1180,403 @@
 */
 #p-tbx,
 #p-lang {
-	position: relative;
-	z-index: 3;
+    position: relative;
+    z-index: 3;
 }
 
 /*
 ** footer
 */
 #footer, #bottom {
-	background-color: white;
-	border: 1px solid #fabd23;
-	/* top, right, bottom, left */
-	margin: 0.6em 0.5em 1em 13.6em;
-	/*margin-left: 13.6em;*/
-	padding: .4em 0 1.2em 0;
-	text-align: center;
-	font-size: 90%;
+    background-color: white;
+    border: 1px solid #fabd23;
+    margin: 0.6em 0.5em 1em 13.6em;
+    padding: .4em 0 1.2em 0;
+    text-align: center;
+    font-size: 90%;
 }
 #footer li {
-	display: inline;
-	margin: 0 1.3em;
+    display: inline;
+    margin: 0 1.3em;
 }
-#bottom { 
-	border: none;
-	text-align: left;
+#bottom {
+    border: none;
+    text-align: left;
 }
 /* hide from incapable browsers */
 head:first-child+body #footer li { white-space: nowrap; }
 #f-poweredbyico, #f-copyrightico {
-	margin: 0 8px;
-	/*vertical-align: middle;*/
-	height: 31px;
-	position: relative;
-	top: -31px; /* Bump it up just a tad */
+    margin: 0 8px;
+    /*vertical-align: middle;*/
+    height: 31px;
+    position: relative;
+    top: -31px; /* Bump it up just a tad */
 }
 #f-poweredbyico {
-	float: right;
+    float: right;
 }
 #f-copyrightico {
-	float: left;
+    float: left;
 }
 
 /* js pref toc */
-#preftoc { 
-	float: left;
-	margin: 1em 1em 1em 1em;
-	width: 13em;
+#preftoc {
+    float: left;
+    margin: 1em 1em 1em 1em;
+    width: 13em;
 }
 #preftoc li { border: 1px solid White; }
-#preftoc li.selected { 
-	background-color:#f9f9f9;
-	border:1px dashed #aaaaaa;
+#preftoc li.selected {
+    background-color:#f9f9f9;
+    border:1px dashed #aaaaaa;
 }
 #preftoc a,
 #preftoc a:active {
-	display: block;
-	color: #0014a6;
+    display: block;
+    color: #0014a6;
 }
-#prefcontrol { 
-	clear: both;
-	float: left;
-	margin-top: 1em;
+#prefcontrol {
+    clear: both;
+    float: left;
+    margin-top: 1em;
 }
-div.prefsectiontip { 
-	font-size: 95%;
-	margin-top: 1em;
+div.prefsectiontip {
+    font-size: 95%;
+    margin-top: 1em;
 }
 fieldset.operaprefsection { margin-left: 15em }
 
-/* 
-** IE/Mac fixes, hope to find a validating way to move this
-** to a separate stylesheet. This would work but doesn't validate: 
-** @import("IEMacFixes.css");
-*/
-
-/* tabs: border on the a, not the div */
-* > html #p-cactions li { border:none; }
-* > html #p-cactions li a {
-	border: 1px solid #aaa;
-	border-bottom: none;
-}
-* > html #p-cactions li.selected a { border-color: #fabd23; }
-/* footer icons need a fixed width */
-* > html #f-poweredbyico,
-* > html #f-copyrightico { width: 88px; }
-* > html #bodyContent,
-* > html #bodyContent pre {
-	overflow-x: auto;
-	width: 100%;
-	padding-bottom: 25px;
-}
-
 /* more IE fixes */
 /* float/negative margin brokenness */
 * html #footer {margin-top: 0;}
 * html #column-content {
-	display: inline;
-	margin-bottom: 0;
+    display: inline;
+    margin-bottom: 0;
 }
 * html div.editsection { font-size: smaller; }
 #pagehistory li.selected { position: relative; }
 
-/* Mac IE 5.0 fix; floated content turns invisible */
-* > html #column-content {
-	float: none;
-}
-* > html #column-one {
-	position: absolute;
-	left: 0;
-	top: 0;
-}
-* > html #footer {
-	margin-left: 13.2em;
-}
 .redirectText {
-	font-size: 150%;
-	margin: 5px;
+    font-size: 150%;
+    margin: 5px;
 }
 
 .printfooter {
-	display: none;
+    display: none;
 }
 
 .not-patrolled {
-	background-color: #ffa;
+    background-color: #ffa;
 }
 div.patrollink {
-	font-size: 75%;
-	text-align: right;
+    font-size: 75%;
+    text-align: right;
 }
 span.newpage, span.minor, span.searchmatch, span.bot {
-	font-weight: bold;
+    font-weight: bold;
 }
 span.unpatrolled {
-	font-weight: bold;
-	color: red;
+    font-weight: bold;
+    color: red;
 }
 
 span.searchmatch {
-	color: red;
+    color: red;
 }
 .sharedUploadNotice {
-	font-style: italic;
+    font-style: italic;
 }
 
 span.updatedmarker {
-	color: black;
-	background-color: #0f0;
+    color: black;
+    background-color: #0f0;
 }
 span.newpageletter {
-	font-weight: bold;
-	color: black;
-	background-color: yellow;
+    font-weight: bold;
+    color: black;
+    background-color: yellow;
 }
 span.minoreditletter {
-	color: black;
-	background-color: #c5ffe6;
+    color: black;
+    background-color: #c5ffe6;
 }
 
 table.gallery {
-	border: 1px solid #ccc;
-	margin: 2px;
-	padding: 2px;
-	background-color: white;
+    border: 1px solid #ccc;
+    margin: 2px;
+    padding: 2px;
+    background-color: white;
 }
 
 table.gallery tr {
-	vertical-align: top;
+    vertical-align: top;
 }
 
 table.gallery td {
-	vertical-align: top;
-	background-color: #f9f9f9;
-	border: solid 2px white;
+    vertical-align: top;
+    background-color: #f9f9f9;
+    border: solid 2px white;
 }
 
 table.gallery td.galleryheader {
-	text-align: center;
-	font-weight: bold;
+    text-align: center;
+    font-weight: bold;
 }
 
 div.gallerybox {
-	margin: 2px;
-	width:  150px;
+    margin: 2px;
+    width:  150px;
 }
 
 div.gallerybox div.thumb {
-	text-align: center;
-	border: 1px solid #ccc;
-	margin: 2px;
+    text-align: center;
+    border: 1px solid #ccc;
+    margin: 2px;
 }
 
 div.gallerytext {
-	font-size: 94%;
-	padding: 2px 4px;
+    font-size: 94%;
+    padding: 2px 4px;
 }
 
 span.comment {
-	font-style: italic;
+    font-style: italic;
 }
 
 span.changedby {
-	font-size: 95%;
+    font-size: 95%;
 }
 
 .previewnote {
-	text-indent: 3em;
-	color: #c00;
-	border-bottom: 1px solid #aaa;
-	padding-bottom: 1em;
-	margin-bottom: 1em;
+    text-indent: 3em;
+    color: #c00;
+    border-bottom: 1px solid #aaa;
+    padding-bottom: 1em;
+    margin-bottom: 1em;
 }
 
 .previewnote p {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 .editExternally {
-	border: 1px solid gray;
-	background-color: #ffffff;
-	padding: 3px;
-	margin-top: 0.5em;
-	float: left;
-	font-size: small;
-	text-align: center;
+    border: 1px solid gray;
+    background-color: #ffffff;
+    padding: 3px;
+    margin-top: 0.5em;
+    float: left;
+    font-size: small;
+    text-align: center;
 }
 .editExternallyHelp {
-	font-style: italic;
-	color: gray;
+    font-style: italic;
+    color: gray;
 }
 
 li span.deleted, span.history-deleted {
-	text-decoration: line-through;
-	color: #888;
-	font-style: italic;
+    text-decoration: line-through;
+    color: #888;
+    font-style: italic;
 }
 
 .toggle {
-	margin-left: 2em;
-	text-indent: -2em;
+    margin-left: 2em;
+    text-indent: -2em;
 }
 
 /* Classes for EXIF data display */
 table.mw_metadata {
-	font-size: 0.8em;
-	margin-left: 0.5em;
-	margin-bottom: 0.5em;
-	width: 300px;
+    font-size: 0.8em;
+    margin-left: 0.5em;
+    margin-bottom: 0.5em;
+    width: 300px;
 }
 
 table.mw_metadata caption {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 table.mw_metadata th {
-	font-weight: normal;
+    font-weight: normal;
 }
 
 table.mw_metadata td {
-	padding: 0.1em;
+    padding: 0.1em;
 }
 
 table.mw_metadata {
-	border: none;
-	border-collapse: collapse;
+    border: none;
+    border-collapse: collapse;
 }
 
 table.mw_metadata td, table.mw_metadata th {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	padding-left: 0.1em;
-	padding-right: 0.1em;
+    text-align: center;
+    border: 1px solid #aaaaaa;
+    padding-left: 0.1em;
+    padding-right: 0.1em;
 }
 
 table.mw_metadata th {
-	background-color: #f9f9f9;
+    background-color: #f9f9f9;
 }
 
 table.mw_metadata td {
-	background-color: #fcfcfc;
+    background-color: #fcfcfc;
 }
 
 table.collapsed tr.collapsable {
-	display: none;
+    display: none;
 }
 
 
 /* filetoc */
 ul#filetoc {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
-	margin-bottom: 0.5em;
-	margin-left: 0;
-	margin-right: 0;
+    text-align: center;
+    border: 1px solid #aaaaaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+    font-size: 95%;
+    margin-bottom: 0.5em;
+    margin-left: 0;
+    margin-right: 0;
 }
 
 #filetoc li {
-	display: inline;
-	list-style-type: none;
-	padding-right: 2em;
+    display: inline;
+    list-style-type: none;
+    padding-right: 2em;
 }
 
 /* @bug 1714 */
 input#wpSave, input#wpDiff {
-	margin-right: 0.33em;
+    margin-right: 0.33em;
 }
 
 #editform .editOptions {
-	display: inline;
+    display: inline;
 }
 
 #wpSave {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 /* Classes for article validation */
 
 table.revisionform_default {
-	border: 1px solid #000000;
+    border: 1px solid #000000;
 }
 
 table.revisionform_focus {
-	border: 1px solid #000000;
-	background-color:#00BBFF;
+    border: 1px solid #000000;
+    background-color:#00BBFF;
 }
 
 tr.revision_tr_default {
-	background-color:#EEEEEE;
+    background-color:#EEEEEE;
 }
 
 tr.revision_tr_first {
-	background-color:#DDDDDD;
+    background-color:#DDDDDD;
 }
 
 p.revision_saved {
-	color: green;
-	font-weight:bold;
+    color: green;
+    font-weight:bold;
 }
 
 #mw_trackbacks {
-	border: solid 1px #bbbbff;
-	background-color: #eeeeff;
-	padding: 0.2em;
+    border: solid 1px #bbbbff;
+    background-color: #eeeeff;
+    padding: 0.2em;
 }
 
 
 /* Allmessages table */
 
 #allmessagestable th {
-	background-color: #b2b2ff;
+    background-color: #b2b2ff;
 }
 
 #allmessagestable tr.orig {
-	background-color: #ffe2e2;
+    background-color: #ffe2e2;
 }
 
 #allmessagestable tr.new {
-	background-color: #e2ffe2;
+    background-color: #e2ffe2;
 }
 
 #allmessagestable tr.def {
-	background-color: #f0f0ff;
+    background-color: #f0f0ff;
 }
 
 
 /* noarticletext */
 div.noarticletext {
-	border: 1px solid #ccc;
-	background: #fff;
-	padding: .2em 1em;
-	color: #000;
+    border: 1px solid #ccc;
+    background-color: #fff;
+    padding: .2em 1em;
+    color: #000;
 }
 
 div#searchTargetContainer {
-	left:       10px;
-	top:        10px;
-	width:      90%;
-	background: white;
+    left:       10px;
+    top:        10px;
+    width:      90%;
+    background-color: white;
 }
 
 div#searchTarget {
-	padding:    3px;
-	margin:     5px;
-	background: #F0F0F0;
-	border:     solid 1px blue;
+    padding:    3px;
+    margin:     5px;
+    background-color: #F0F0F0;
+    border:     solid 1px blue;
 }
 
 div#searchTarget ul li {
-	list-style: none;
+    list-style: none;
 }
 
 div#searchTarget ul li:before {
-	color: orange;
-	content: "\00BB \0020";
+    color: orange;
+    content: "\00BB \0020";
 }
 
 div.multipageimagenavbox {
-	 border: solid 1px silver;
-	 padding: 4px;
-	 margin: 1em;
-	 -moz-border-radius: 6px;
-	 background: #f0f0f0;
+     border: solid 1px silver;
+     padding: 4px;
+     margin: 1em;
+     -moz-border-radius: 6px;
+     background-color: #f0f0f0;
 }
 
 div.multipageimagenavbox div.thumb {
-	 border: none;
-	 margin-left: 2em;
-	 margin-right: 2em;
+     border: none;
+     margin-left: 2em;
+     margin-right: 2em;
 }
 
 div.multipageimagenavbox hr {
-	 margin: 6px;
+     margin: 6px;
 }
 
 table.multipageimage td {
-	 text-align: center;
+     text-align: center;
 }
 
 /*
-	Table pager (e.g. Special:Imagelist)
-	- remove underlines from the navigation link
-	- collapse borders
-	- set the borders to outsets (similar to Special:Allmessages)
-	- remove line wrapping for all td and th, set background color
-	- restore line wrapping for the last two table cells (description and size)
+    Table pager (e.g. Special:Imagelist)
+    - remove underlines from the navigation link
+    - collapse borders
+    - set the borders to outsets (similar to Special:Allmessages)
+    - remove line wrapping for all td and th, set background color
+    - restore line wrapping for the last two table cells (description and size)
 */
 .TablePager_nav a { text-decoration: none; }
 .TablePager { border-collapse: collapse; }
-.TablePager, .TablePager td, .TablePager th { 
-	border: 0.15em solid #777777;
-	padding: 0 0.15em 0 0.15em;
+.TablePager, .TablePager td, .TablePager th {
+    border: 0.15em solid #777777;
+    padding: 0 0.15em 0 0.15em;
 }
 .TablePager th { background-color: #eeeeff }
 .TablePager td { background-color: #ffffff }
@@ -1670,36 +1592,36 @@
  */
 .pagelist { }
 .pagelist thead td {
-	background: #e8e8e8;
-	text-decoration: none;
-	font-weight: bold;
-	font-size: smaller;
+    background-color: #e8e8e8;
+    text-decoration: none;
+    font-weight: bold;
+    font-size: smaller;
 }
 .pagelist thead td u { text-decoration: none; }
-.pagelist tr.evenrow { background: #eee; }
-.pagelist tr.oddrow  { background: white; }
+.pagelist tr.evenrow { background-color: #eee; }
+.pagelist tr.oddrow  { background-color: white; }
 th.gridbutton {
-	background-color: ThreeDLightShadow;
-	color: black;
-	font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
-	font-size: small;
-	font-weight: normal;
-	/*font-style: menu;*/
-	white-space: nowrap;
-	margin: 5px 0px;
-	max-height: 24px;
-	padding: 5px 0px 5px 0px;
-	border-width: 1px;
-	border-style: solid;
-	border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;
+    background-color: ThreeDLightShadow;
+    color: black;
+    font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
+    font-size: small;
+    font-weight: normal;
+    /*font-style: menu;*/
+    white-space: nowrap;
+    margin: 5px 0px;
+    max-height: 24px;
+    padding: 5px 0px 5px 0px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;
 }
 input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
-	text-decoration: none;
-	font-size: small;
-	font-weight: normal;
-	font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
-	background-color: ThreeDLightShadow;
-	color: black;
+    text-decoration: none;
+    font-size: small;
+    font-weight: normal;
+    font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
+    background-color: ThreeDLightShadow;
+    color: black;
 }
 
 .wikipaging { font-size: 80% }
@@ -1708,119 +1630,112 @@
 /* <?plugin RawHtml <div class="boxright"> </div> */
 
 div.boxright {
-	width: 200px; 
-	right: 10px;
-	float: right;
-	border: thin solid #888888;
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	margin: 0;
+    width: 200px;
+    right: 10px;
+    float: right;
+    border: thin solid #888888;
+    padding: 0.5em 0.5em 0.5em 0.5em;
+    margin: 0;
 }
 
 div.boxright > blockquote {
-	padding: 0.5em;
-	margin: 0;
+    padding: 0.5em;
+    margin: 0;
 }
 
-/* PHP Warnings */
-div.errors {
-	color: black;
-	background-color: #FF9999;
-	margin-top:    1em;
-	margin-bottom: 1em;
-	padding-left:  0.8em; 
-	padding-right: 0.8em; 
-	padding-top:    0.8ex;
-	padding-bottom: 0;
-	border: medium solid red;
-	clear: both;
+.error {
+    color: black;
+    background-color: #FF9999;
+    margin-top:    1em;
+    margin-bottom: 1em;
+    padding-left:  0.8em;
+    padding-right: 0.8em;
+    padding-top:    0.8ex;
+    padding-bottom: 0;
+    border: medium solid red;
+    clear: both;
 }
-h4.errors {
-	color: red;
-	margin:  0;
-	padding: 0;
-	text-decoration: underline;
+
+.warning {
+    color: black;
+    background-color: #FFCCCC;
+    margin-top:    1em;
+    margin-bottom: 1em;
+    padding-left:  0.8em;
+    padding-right: 0.8em;
+    padding-top:    0.8ex;
+    padding-bottom: 0;
+    border: 1px solid #aaa;
+    clear: both;
 }
-div.warning {
-	color: black;
-	background-color: #FFCCCC;
-	margin-top:    1em;
-	margin-bottom: 1em;
-	padding-left:  0.8em; 
-	padding-right: 0.8em; 
-	padding-top:    0.8ex;
-	padding-bottom: 0;
-	border: 1px solid #aaa;
-	clear: both;
-}
 
 /* Debug */
 .debug {
-	color: black;
-	background: white;
-	font-size: smaller;
-	margin: 1ex 0;
-	padding: 0.5ex 0.5em;
-	border: medium solid #fff8dc; /* darker ivory */
+    color: black;
+    background-color: white;
+    font-size: smaller;
+    margin: 1ex 0;
+    padding: 0.5ex 0.5em;
+    border: medium solid #fff8dc; /* darker ivory */
 }
 /* Hints */
 .hint {
-	color: black;
-	background: #eeeeee;
-	 /* font-size: smaller; */
-	font-style: italic;
-	margin-left: 3em;
-	padding: 0.5ex 0.5em;
-	border: thin solid #aaaaaa;
+    color: black;
+    background-color: #eeeeee;
+    font-style: italic;
+    margin-left: 3em;
+    padding: 0.5ex 0.5em;
+    border: thin solid #aaaaaa;
 }
 span.hint {
-	padding: 0;
+    padding: 0;
 }
 /* Disabled Plugins */
 .disabled-plugin
 {
-	clear: both;
-	margin: 1ex 0;
-	padding: 0;
+    clear: both;
+    margin: 1ex 0;
+    padding: 0;
 }
 .disabled-plugin .title {
-	color: #400;
-	background-color: inherit;
-	font-size: x-small;
-	text-align: right;
-	padding: 0 0.5em;
+    color: #400;
+    background-color: inherit;
+    font-size: x-small;
+    text-align: right;
+    padding: 0 0.5em;
 }
 .disabled-plugin pre {
-	color: black;
-	background: #ddd;
-	margin: 0;
-	padding: 0.3ex 0.5em;
+    color: black;
+    background-color: #ddd;
+    margin: 0;
+    padding: 0.3ex 0.5em;
 }
 
 /* "(Redirected from ...)" message. */
 span.redirectfrom {
-	font-size: small;
-	font-style: oblique;
-	font-weight: normal;
-	padding-left: 1em;
+    font-size: small;
+    font-style: oblique;
+    font-weight: normal;
+    padding-left: 1em;
 }
-.search-context { background: white; font-style: oblique; }
+.search-context { background-color: white; font-style: oblique; }
 .search-term {
-	background: yellow;
-	font-weight: normal;
+    background-color: yellow;
+    font-weight: normal;
 }
 
 a.spell-wrong {
-	color:#ba0000; 
-	background: yellow;
+    color:#ba0000;
+    background-color: yellow;
 }
 span.spell-wrong {
-	color:#ba0000; 
+    color:#ba0000;
 }
 
 
 /**
  * Wiki Forms
- * 
+ *
  * The div inside the wikiadmin upload form does not
  * have a class yet, so it must be referenced indirectly
  */
@@ -1833,66 +1748,54 @@
  * Link styles
  */
 .wiki, .named-wiki {
-	text-decoration: none;
-	font-weight: normal;
-	/* font-weight: bold; */
+    text-decoration: none;
+    font-weight: normal;
+    /* font-weight: bold; */
 }
 .wiki relation, .named-wiki relation, .wiki attribute, .named-wiki attribute {
-	font-style: oblique;
-	/* font-weight: normal; */
-	font-weight: bold;
+    font-style: oblique;
+    /* font-weight: normal; */
+    font-weight: bold;
 }
 
 span.relation-symbol {
-	font-weight: bold;
-	font-family: monospace;
-	letter-spacing: 0.1em;
+    font-weight: bold;
+    font-family: monospace;
+    letter-spacing: 0.1em;
 }
 
 /* Action buttons */
 a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe,
 input.wikiaction, input.button, input.wikiadmin {
-	text-decoration: none;
-	font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
-	/* don't wrap text buttons */
-	white-space: nowrap;
+    text-decoration: none;
+    font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
+    /* don't wrap text buttons */
+    white-space: nowrap;
 }
 
-/*
-a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button { 
-	background-color: #ddd; 
-}
-*/
-
 .wikiunsafe { background-color: #fcc; }
 
-/*
-a.wikiadmin, a.wikiadmin:visited, input.wikiadmin  { 
-	background-color: #fdd; 
-}
-*/
-
 /* Unknown links */
 .wikiunknown, .named-wikiunknown {
-	font-weight: normal;
-	font-size: 100%;
+    font-weight: normal;
+    font-size: 100%;
 }
  /* QuestionMark #600 */
 .wikiunknown a, .named-wikiunknown a {
-	color: #447;
-	background-color: #eee;
-	text-decoration: none;
-	font-weight: normal;
-	font-size: smaller;
+    color: #447;
+    background-color: #eee;
+    text-decoration: none;
+    font-weight: normal;
+    font-size: smaller;
 }
 
 /* Backlinks */
 .backlinks {
-	text-decoration: underline;
-	color: #006;
+    text-decoration: underline;
+    color: #006;
 }
-h1 .backlinks { 
-	text-decoration: underline; 
+h1 .backlinks {
+    text-decoration: underline;
 }
 
 /* Interwiki links */
@@ -1941,21 +1844,21 @@
   background-color: #ffce7b;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
-  /*font-style: oblique;*/
   font-weight: bold;
   text-decoration: underline;
   margin-bottom: 0.25ex;
   margin-right:  0.25em;
-} 
+}
 .transclusion, .wiki-edithelp {
   font-size: 97%;
 }
 .transclusion {
   border: 1px solid gray;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
+  padding-left:  0.8em;
+  padding-right: 0.8em;
   padding-top:     0px;
   padding-bottom:  0px;
   margin-left:   0.25em;
@@ -1963,7 +1866,7 @@
   margin-bottom: 0.1ex;
 }
 .wiki-edithelp {
-  background: white;
+  background-color: white;
   border: medium solid #fff8dc; /* darker ivory */
   padding-left:  0.5em;
   padding-right: 0.5em;
@@ -2056,16 +1959,3 @@
      border-color: green;
      padding: 0.5em;
 }
-
-/* style for error messages
-   Use this style if you need to display an error, e.g:
-     User does not exist
-*/
-.error {
-    font-weight: bold;
-    border-width: 2px;
-    border-style: solid;
-    background-color: #ffc0cb; /* pink */
-    border-color: red;
-    padding: 0.5em;
-}

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
   $dbh = $request->getDbh();
   $isAdmin = $user->isAdmin();
   $pagename = $page->getName();
@@ -27,7 +27,7 @@
     <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>_("Past versions of this page.")." [alt-h]")) ?>
     <?php echo ActionButton("diff") ?>
     <?php if ($user->isSignedIn()) { ?>
-      <?php echo ActionButton("WatchPage", _("Watch"), false, 
+      <?php echo ActionButton(_("WatchPage"), _("Watch"), false, 
 		       array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes")." [alt-l]")) ?>
     <?php } ?>
   </ul>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: body.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 // Set the body attr dynamically. here class="ns-2" for Mozilla
 ?>
   <body <?php echo $WikiTheme->getMoreAttr('body') ?>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/calendar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/calendar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/calendar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: calendar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: calendar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <div id="calendar"></div>
 <?php echo JavaScript('

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/content.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/content.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/content.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: content.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: content.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php echo $CONTENT ?>
 </body>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/debug.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/debug.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/debug.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,10 +1,9 @@
 <?php // -*-php-*-
-// rcs_id('$Id: debug.tmpl 7591 2010-07-02 08:05:07Z vargenau $');
+// $Id: debug.tmpl 8016 2011-04-05 09:52:20Z vargenau $
 ?>
 <?php global $RUNTIMER; ?>
 <table width="%100" border="0" cellpadding="0" cellspacing="0">
 <tr><td>
-<?php /* Note: The Portland theme's debug.tmpl overrides this file with it's own non-graphical variant. */ ?>
 <div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img
         id="xhtml"
         src="<?php echo $WikiTheme->_findData('buttons/valid-xhtml10.png')?>"

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/dump-footer.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/dump-footer.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/dump-footer.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: dump-footer.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: dump-footer.tmpl 7956 2011-03-03 17:08:31Z vargenau $
   if (empty($revision)) $revision = $page->getCurrentRevision();
 ?>
 <hr class="printer" noshade="noshade" />

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/frame-left.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/frame-left.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/frame-left.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: frame-left.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: frame-left.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 
 /* 
  * This template is responsible mainly for the outer level <html> stuff.

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/frameset.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/frameset.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/frameset.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: frameset.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: frameset.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 
 /*
  * This template is used for the FrameInclude plugin.

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/html.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/html.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/html.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,12 +1,9 @@
 <?php  // -*-php-*-
-// rcs_id('$Id: html.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: html.tmpl 7827 2011-01-13 13:55:52Z vargenau $
 /*
  * This template is responsible mainly for the outer level <html> stuff.
- *
- * NS/MO/IE/Op Browsers before 4.0 don't like the xml pi.
  */
-if (browserVersion() >= 4.0)
-  echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n";
+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 <?php /* xmlns="http://www.w3.org/1999/xhtml" */ ?> xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/htmldump.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/htmldump.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/htmldump.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php  // -*-php-*-
-// rcs_id('$Id: htmldump.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: htmldump.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * This template is used only for html file dumps, and is responsible
  * mainly for the outer level <html> stuff and the and <head>.
@@ -11,13 +11,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
-<?php /**
-       * Additional navigation links are provided here in the html header for browsers
-       * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??).
-       *
-       * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK
-       *     http://www.euronet.nl/~tekelenb/WWW/LINK/index.html
-       */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
 <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/logo.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/logo.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/logo.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: logo.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: logo.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <div class="portlet" id="p-logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" title="Visit the Home Page [<?php echo $WikiTheme->tooltipAccessKeyPrefix() ?>-z]" accesskey="z"><span class="logo"><?php echo WIKI_NAME ?></span></a></div>
 <img id="img-logo-right" src="<?php echo $WikiTheme->_findData('images/wiki_stamp.png')?>" alt="This is a WIKI! Edit every page" height="86" width="86" />

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7667 2010-08-31 16:13:53Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
 // With MonoBook it is similar to Sidebar, named boxes at the left.
@@ -45,7 +45,7 @@
     <li><? $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?> </li>
     <li><?php echo WikiLink(_("RecentNewPages"), "",_("RecentNewPages")) ?></li>
     <?php if (!empty($revision)) { ?>
-      <li id="t-whatlinkshere"><?php echo Button(array('action'=>'BackLinks'), _("What links here"), $page->getName()) ?></li>
+      <li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
     <?php } ?>
     <?php if (!empty($user) && $user->isSignedIn()) { ?>
       <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/ratings.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/ratings.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/ratings.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ratings.tmpl 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: ratings.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- Ratings -->
 <?php if (!$WikiTheme->DUMP_MODE) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/rc.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/rc.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/rc.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*- 
-// rcs_id('$Id: rc.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: rc.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- RecentChangesCached Box -->
 <div class="portlet" id="p-rc">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/search.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/search.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/search.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: search.tmpl 7591 2010-07-02 08:05:07Z vargenau $');
+// $Id: search.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!--{{{ LiveSearch --> <?php // -*- php -*- ?>
 <div id="searchholder">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/signin.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/signin.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/signin.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: signin.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: signin.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <div class="portlet" id="p-personal"><div class="pBody"><ul>
 <?php if ($user->isAuthenticated()) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/tags.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/tags.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/tags.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*- 
-// rcs_id('$Id: tags.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: tags.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- list of most popular categories -->
 <div class="portlet" id="p-tags">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/top.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/top.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/templates/top.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: top.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: top.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 $pagename = $page->getName();
 $isActionPage = isActionPage($pagename);
 if (ENABLE_PAGE_PUBLIC)

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Sidebar/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /*
  * This file defines the Sidebar theme of PhpWiki,
@@ -43,26 +43,26 @@
     /* Display up/down button with persistent state */
     /* persistent state per block in cookie for 30 days */
     function folderArrow ($id, $init='Open') {
-    	global $request;
-    	if ($cookie = $request->cookies->get("folder_".$id)) {
-    	    $init = $cookie;
-	}
+        global $request;
+        if ($cookie = $request->cookies->get("folder_".$id)) {
+            $init = $cookie;
+    }
         if ($init == 'Open' or $init == 'Closed')
             $png = $this->_findData('images/folderArrow'.$init.'.png');
         else
             $png = $this->_findData('images/folderArrowOpen.png');
-	return HTML::img(array('id' => $id.'-img',
-	                       'src' => $png,
-			       //'align' => 'right',
-	                       'onclick' => "showHideFolder('$id')",
-			       'alt'  => _("Click to hide/show"),
-			       'title'  => _("Click to hide/show")));
+    return HTML::img(array('id' => $id.'-img',
+                           'src' => $png,
+                   //'align' => 'right',
+                           'onclick' => "showHideFolder('$id')",
+                   'alt'  => _("Click to hide/show"),
+                   'title'  => _("Click to hide/show")));
     }
 
     /* Callback when a new user creates or edits a page */
     function CbNewUserEdit (&$request, $userid) {
-    	$userid = strtoupper($userid);
-	$content = "{{Template/UserPage}}";
+        $userid = strtoupper($userid);
+    $content = "{{Template/UserPage}}";
         $dbi =& $request->_dbi;
         $page = $dbi->getPage($userid);
         $page->save($content, WIKIDB_FORCE_CREATE, array('author' => $userid));
@@ -81,19 +81,19 @@
      */
     function CbUpload (&$request, $pathname) {
         $cmdline = CLAMDSCAN_PATH . " --nosummary --move=" . CLAMDSCAN_VIRUS;
-	$report = `$cmdline "$pathname"`;
-	if (!$report) {
-	    trigger_error("clamdscan failed", E_USER_WARNING);
-	    return true;
-	}
-	if (!preg_match("/: OK$/", $report)) {
-	    //preg_match("/: (.+)$/", $report, $m);
-	    trigger_error("Upload failed. virus-scanner: $report", E_USER_WARNING);
-	    return false;
-	} else {
-	    return true;
-	}
+    $report = `$cmdline "$pathname"`;
+    if (!$report) {
+        trigger_error("clamdscan failed", E_USER_WARNING);
+        return true;
     }
+    if (!preg_match("/: OK$/", $report)) {
+        //preg_match("/: (.+)$/", $report, $m);
+        trigger_error("Upload failed. virus-scanner: $report", E_USER_WARNING);
+        return false;
+    } else {
+        return true;
+    }
+    }
 
 
     function findTemplate ($name) {
@@ -111,88 +111,87 @@
 
         $this->initGlobals();
 
-	// 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.
+    // 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.
 
-	$this->setDefaultCSS(_("Sidebar"), 'sidebar.css');
-	//$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
-	//$this->setDefaultCSS('PhpWiki', 'phpwiki.css');
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+    $this->setDefaultCSS(_("Sidebar"), array('' => 'sidebar.css',
+                                             'print' => 'phpwiki-printer.css'));
+    $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+    $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	//$this->addImageAlias('logo', 'logo.png');
+    /**
+     * The logo image appears on every page and links to the HomePage.
+     */
+    //$this->addImageAlias('logo', 'logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is not set, any signature defined in index.php will be used. If it
-	 * is not defined by index.php or in here then the "Thank you for
-	 * editing..." screen will be omitted.
-	 */
+    /**
+     * The Signature image is shown after saving an edited page. If this
+     * is not set, any signature defined in index.php will be used. If it
+     * is not defined by index.php or in here then the "Thank you for
+     * editing..." screen will be omitted.
+     */
 
-	// Comment this next line out to enable signature.
-	$this->addImageAlias('signature', false);
+    // Comment this next line out to enable signature.
+    $this->addImageAlias('signature', false);
 
-	$this->addImageAlias('search', 'search.png');
+    $this->addImageAlias('search', 'search.png');
 
-	/*
-	 * Link icons.
-	 */
-	$this->setLinkIcon('http');
-	$this->setLinkIcon('https');
-	$this->setLinkIcon('ftp');
-	$this->setLinkIcon('mailto');
-	$this->setLinkIcon('interwiki');
-	$this->setLinkIcon('*', 'url');
+    /*
+     * Link icons.
+     */
+    $this->setLinkIcon('http');
+    $this->setLinkIcon('https');
+    $this->setLinkIcon('ftp');
+    $this->setLinkIcon('mailto');
+    $this->setLinkIcon('interwiki');
+    $this->setLinkIcon('*', 'url');
 
-	//$this->setButtonSeparator(' | ');
+    //$this->setButtonSeparator(' | ');
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	//$this->setAutosplitWikiWords(true);
+    /**
+     * WikiWords can automatically be split by inserting spaces between
+     * the words. The default is to leave WordsSmashedTogetherLikeSo.
+     */
+    //$this->setAutosplitWikiWords(true);
 
-	/**
-	 * If true (default) show create '?' buttons on not existing pages, even if the
-	 * user is not signed in.
-	 * If false, anon users get no links and it looks cleaner, but then they
-	 * cannot easily fix missing pages.
-	 */
-	$this->setAnonEditUnknownLinks(false);
+    /**
+     * If true (default) show create '?' buttons on not existing pages, even if the
+     * user is not signed in.
+     * If false, anon users get no links and it looks cleaner, but then they
+     * cannot easily fix missing pages.
+     */
+    $this->setAnonEditUnknownLinks(false);
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	//$this->setDateFormat("%B %d, %Y");
+    /*
+     * You may adjust the formats used for formatting dates and times
+     * below.  (These examples give the default formats.)
+     * Formats are given as format strings to PHP strftime() function See
+     * http://www.php.net/manual/en/function.strftime.php for details.
+     * Do not include the server's zone (%Z), times are converted to the
+     * user's time zone.
+     */
+    //$this->setDateFormat("%B %d, %Y");
 
-	/**
-	 * Custom UserPreferences:
-	 * A list of name => _UserPreference class pairs.
-	 * Rationale: Certain themes should be able to extend the predefined list
-	 * of preferences. Display/editing is done in the theme specific userprefs.tmpl
-	 * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
-	 * See themes/wikilens/themeinfo.php
-	 */
-	//$this->customUserPreference();
+    /**
+     * Custom UserPreferences:
+     * A list of name => _UserPreference class pairs.
+     * Rationale: Certain themes should be able to extend the predefined list
+     * of preferences. Display/editing is done in the theme specific userprefs.tmpl
+     * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+     * See themes/wikilens/themeinfo.php
+     */
+    //$this->customUserPreference();
 
-	/**
-	 * Register custom PageList type and define custom PageList classes.
-	 * Rationale: Certain themes should be able to extend the predefined list
-	 * of pagelist types. E.g. certain plugins, like MostPopular might use
-	 * info=pagename,hits,rating
-	 * which displays the rating column whenever the wikilens theme is active.
-	 * See themes/wikilens/themeinfo.php
-	 */
-	//$this->addPageListColumn();
+    /**
+     * Register custom PageList type and define custom PageList classes.
+     * Rationale: Certain themes should be able to extend the predefined list
+     * of pagelist types. E.g. certain plugins, like MostPopular might use
+     * info=pagename,hits,rating
+     * which displays the rating column whenever the wikilens theme is active.
+     * See themes/wikilens/themeinfo.php
+     */
+    //$this->addPageListColumn();
 
     }
 }
@@ -215,5 +214,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-img{border:0;}form{margin:0;}input.button{font-family:Helvetica,Arial,sans-serif;}input{font-family:Helvetica,Arial,sans-serif;}textarea,input{color:white;background:black;}dt{font-weight:bold;}table{border-spacing:1px;empty-cells:show;}td{color:white;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}a{color:#0053db;}a:hover{color:#5791ff;}body{font-family:Helvetica,Arial,sans-serif;color:white;background-color:black;}div.wikitext{clear:both;}div.wikitext hr{visibility:hidden;background-image:url("images/hr.png");background-repeat:repeat-x;background-position:center;}div.wikitext hr:after{visibility:visible;display:block;content:url("images/hr.png");text-align:center;margin-top:-2.5ex;margin-bottom:1ex;}div.wikitext pre{font-family:monospace;}div.wikiaction,form.wikiadmin div{background-color:#002;border:1px solid #006;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;}form.wikiadmin div{background-color:black;}.wiki{text-decoration:none;}.named-wiki{text-decoration:underline;}div.wikitext a.wiki,div.wikitext a.named-wiki{color:#fff313;font-weight:bold;}.wikitext a.wiki:hover,.wiki:hover{color:#44cff4;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe{text-decoration:none;font-family:Arial,Helvetica,sans-serif;}a.wikiaction{color:#151;font-weight:bold;}a.wikiaction:hover{color:#1bab11;}a.wikiadmin{color:#982505;font-weight:bold;}a.wikiadmin:hover{color:#ef0032;}.wikiunknown,.named-wikiunknown{color:gray;font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#0053db;background:#1b1722;text-decoration:none;font-weight:normal;}.wikiunknown a:hover,.named-wikiunknown a:hover{color:#5791ff;}.backlinks{text-decoration:none;}h1 .backlinks{text-decoration:none;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1{color:#000;background-color:#fff313;}div.toolbar h1 a.wiki,h1 a.backlinks,h2 a.wiki{border:0;color:#fff313;background-color:#000;text-decoration:none;}div.toolbar h1 a.wiki,h2 a.wiki{color:#0053db;}div.toolbar h1 a.wiki:hover,h1 a.wiki:hover,h2 a.wiki:hover{border:0;color:#5791ff;}h2,h3,h4,h5,h6{display:inline;padding-top:.25ex;padding-left:.5em;padding-right:.25em;padding-bottom:1px;margin-top:2ex;margin-bottom:0;}h2:after,h3:after,h4:after,h5:after,h6:after{display:block;content:" | ";color:black;margin-left:.3em;}h2:after{border-left:.5em solid #0053db;border-top:.15ex solid #0053db;}h3:after{border-left:.5em solid #96c;border-top:.15ex solid #96c;}h4:after{border-left:.5em solid #639;border-top:.15ex solid #639;}h5:after{border-left:.5em solid #888;border-top:.15ex solid #888;}h6:after{border-left:.5em solid #aaa;border-top:.15ex solid #aaa;}h2{color:#0053db;border-left:.25em solid #0053db;}h3{color:#96c;border-left:.25em solid #96c;}h4{color:#639;border-left:.25em solid #639;}h5{color:#888;border-left:.25em solid #888;}h6{color:#aaa;border-left:.25em solid #aaa;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:0;line-height:150%;}body.sidebar div.wikitext h2:after{margin-bottom:1ex;vertical-align:top;}table,td{font-family:Arial,Helvetica,sans-serif;}caption{font-family:Arial,Helvetica,sans-serif;}.pagelist tr.evenrow{background:#111;}.pagelist tr.oddrow{background:black;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;margin:5px 0;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.toolbar,input.button,#signin{font-family:Arial,Helvetica,sans-serif;}.toolbar hr{visibility:hidden;}div.toolbar,#signin{color:white;padding:0;margin:0;}div.toolbar{margin-top:1ex;}#navbuttons{margin-right:7em;margin-bottom:1ex;}#navbuttons input{position:relative;bottom:-2px;}.editdate{font-family:Arial,Helvetica,sans-serif;color:#96c;}.toolbar .wiki{color:#0053db;text-decoration:none;font-weight:bold;}.toolbar .wiki:hover{color:#5791ff;font-weight:bold;}div.toolbar input{font-family:Helvetica,Arial,sans-serif;}textarea{border:2px solid #0053db;padding-top:.5ex;padding-bottom:.5ex;padding-left:.5em;padding-right:.25em;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}.transclusion-title{font-style:oblique;font-size:smaller;text-decoration:none;text-align:right;}.wiki-edithelp,.transclusion{background:#1b1722;border:1px solid #403752;}.wiki-edithelp{font-size:smaller;margin:.5ex 0;}.wiki-edithelp,div.transclusion{color:#a2a2a2;background-color:#1b1722;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin-left:0;margin-right:0;}.wiki-edithelp .wiki{color:#fff313;font-weight:bold;text-decoration:none;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px solid #006;background:black;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{border:1px solid #006;color:#fff313;background:black;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff .block{background:#008;padding:.5ex .5em;margin:.5ex 0;}.diff .context{background:black;}.diff .block tt{font-weight:bold;font-family:monospace;margin-left:-.6em;color:black;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted{background:#a40024;}.diff .final,.diff .added{background:#cfc;}.diff del{background:#a40024;}.diff ins{background:#9f9;}table.pageinfo{border:1px solid #96c;}table.pageinfo td{background:black;}table.pageinfo td.pageinfo{border-right:.15em solid #639;font-weight:bold;color:#639;background:#203;}table.pageinfo td+td.pageinfo{border-right:0;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.rssicon{border-color:#000;border-width:2px;}.rc-major{color:#fff;background:#000;font-weight:normal;text-decoration:none;}img.rssicon{vertical-align:top;}b.wikisummary{color:#fff313;background:#000;text-decoration:none;font-weight:bold;}.printer{display:none;}div.errors{color:red;background:black;border:medium solid red;clear:both;}.errors h4{color:black;background:red;text-decoration:underline;}.error{font-family:monospace;}.error ul{font-family:monospace;}.debug{color:white;background:black;font-family:monospace;font-size:smaller;margin-top:16ex;margin-bottom:4ex;margin-left:0;margin-right:0;padding:.5ex .5em;border:medium solid gray;display:table;}.clear-floats{clear:both;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}input.numeric{text-align:right;}input{margin:0;border-left:1px solid #0053db;border-right:1px solid #0053db;border-top:1px solid #0053db;border-bottom:1px solid #0053db;text-align:center;}input[type=text]{border-left:2px solid #0053db;border-right:2px solid #0053db;border-bottom:2px solid #0053db;border-top:0;margin-top:2px;padding:1px;}input[type=submit]{color:#0053db;border-left:1.5em solid #0053db;border-right:.15em solid #0053db;border-top:2px solid #0053db;border-bottom:2px solid #0053db;padding-left:0;padding-right:0;}input[type=submit]:hover{color:#5791ff;border-color:#5791ff;}.logo img{margin-bottom:1ex;}div.wikiaction,form.wikiadmin div{position:relative;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}a.wikiaction{border-left:1.5em solid #151;border-right:.15em solid #151;padding-left:.15em;padding-right:.3em;}a.wikiaction:hover{border-right:.15em solid #1bab11;}a.wikiadmin{border-left:1.5em solid #982505;border-right:.15em solid #982505;padding-left:.15em;padding-right:.3em;}a.wikiadmin:hover{border-right:.15em solid #ef0032;}.wikiunknown a,.named-wikiunknown a{border:1px solid black;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:1px;font-size:smaller;}.wikiunknown a:hover,.named-wikiunknown a:hover{border:1px solid #403752;}a.wiki-rc-action{border-left:.15em solid #0053db;padding-left:.2em;padding-right:.2em;padding-bottom:.2ex;margin-left:-0.25em;}li.rc-major a.wiki-rc-action,li.rc-minor a.wiki-rc-action{border-left:0;margin-left:0;border-right:.25em solid #0053db;padding-right:.25em;margin-right:.8em;}p.wiki-rc-action a.wiki-rc-action:first-child{border-left:0;margin-left:0;border-right:0;}li.rc-major,li.rc-minor{display:table;margin-bottom:.25ex;padding-left:.25em;padding-right:.25em;}li.rc-minor{font-size:75%;margin-top:.5ex;border-bottom:0;padding-left:1em;}li.rc-minor a.wiki-rc-action{border-right:.15em solid #0053db;margin-right:2em;}li.rc-major a.wiki-rc-action:hover,li.rc-minor a.wiki-rc-action:hover,a.wiki-rc-action:hover{border-color:#5791ff;}img.linkicon{vertical-align:middle;}h1{padding-top:.25ex;padding-left:.5em;padding-right:.25em;padding-bottom:1px;}div.toolbar h1 a.wiki,h1 a.backlinks{padding-top:.25ex;padding-left:.25em;padding-right:.25em;padding-bottom:1px;}h2 a.wiki{padding-top:.25ex;padding-left:.25em;padding-right:.25em;padding-bottom:1px;}div.toolbar input{text-align:left;}div.transclusion{font-size:smaller;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:0;top:0;}.editdate{padding-top:.25ex;padding-left:.5em;padding-right:.5em;padding-bottom:1px;margin-top:2em;margin-bottom:0;border-left:.5em solid #96c;border-top:.15em solid #96c;}div.toolbar .wiki{border-left:1.5em solid #0053db;border-right:.15em solid #0053db;padding-left:.15em;padding-right:.3em;}div.toolbar .wiki:hover{border-right:.15em solid #5791ff;}b.wikisummary{padding:2px;margin:1px;}div.errors{font-size:smaller;margin-top:4ex;margin-bottom:2ex;padding:.5ex .25em;}.errors h4{margin:0;padding:.5ex .25em;}.error{padding-left:.25em;padding-right:.25em;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file
+img{border:0;}form{margin:0;}input.button{font-family:Helvetica,Arial,sans-serif;}input{font-family:Helvetica,Arial,sans-serif;}textarea,input{color:white;background:black;}dt{font-weight:bold;}table{border-spacing:1px;empty-cells:show;}td{color:white;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}a{color:#0053db;}a:hover{color:#5791ff;}body{font-family:Helvetica,Arial,sans-serif;color:white;background-color:black;}div.wikitext{clear:both;}div.wikitext hr{visibility:hidden;background-image:url("images/hr.png");background-repeat:repeat-x;background-position:center;}div.wikitext hr:after{visibility:visible;display:block;content:url("images/hr.png");text-align:center;margin-top:-2.5ex;margin-bottom:1ex;}div.wikitext pre{font-family:monospace;}div.wikiaction,form.wikiadmin div{background-color:#002;border:1px solid #006;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;}form.wikiadmin div{background-color:black;}.wiki{text-decoration:none;}.named-wiki{text-decoration:underline;}div.wikitext a.wiki,div.wikitext a.named-wiki{color:#fff313;font-weight:bold;}.wikitext a.wiki:hover,.wiki:hover{color:#44cff4;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe{text-decoration:none;font-family:Arial,Helvetica,sans-serif;}a.wikiaction{color:#151;font-weight:bold;}a.wikiaction:hover{color:#1bab11;}a.wikiadmin{color:#982505;font-weight:bold;}a.wikiadmin:hover{color:#ef0032;}.wikiunknown,.named-wikiunknown{color:gray;font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#0053db;background:#1b1722;text-decoration:none;font-weight:normal;}.wikiunknown a:hover,.named-wikiunknown a:hover{color:#5791ff;}.backlinks{text-decoration:none;}h1 .backlinks{text-decoration:none;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1{color:#000;background-color:#fff313;}div.toolbar h1 a.wiki,h1 a.backlinks,h2 a.wiki{border:0;color:#fff313;background-color:#000;text-decoration:none;}div.toolbar h1 a.wiki,h2 a.wiki{color:#0053db;}div.toolbar h1 a.wiki:hover,h1 a.wiki:hover,h2 a.wiki:hover{border:0;color:#5791ff;}h2,h3,h4,h5,h6{display:inline;padding-top:.25ex;padding-left:.5em;padding-right:.25em;padding-bottom:1px;margin-top:2ex;margin-bottom:0;}h2:after,h3:after,h4:after,h5:after,h6:after{display:block;content:" | ";color:black;margin-left:.3em;}h2:after{border-left:.5em solid #0053db;border-top:.15ex solid #0053db;}h3:after{border-left:.5em solid #96c;border-top:.15ex solid #96c;}h4:after{border-left:.5em solid #639;border-top:.15ex solid #639;}h5:after{border-left:.5em solid #888;border-top:.15ex solid #888;}h6:after{border-left:.5em solid #aaa;border-top:.15ex solid #aaa;}h2{color:#0053db;border-left:.25em solid #0053db;}h3{color:#96c;border-left:.25em solid #96c;}h4{color:#639;border-left:.25em solid #639;}h5{color:#888;border-left:.25em solid #888;}h6{color:#aaa;border-left:.25em solid #aaa;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:0;line-height:150%;}body.sidebar div.wikitext h2:after{margin-bottom:1ex;vertical-align:top;}table,td{font-family:Arial,Helvetica,sans-serif;}caption{font-family:Arial,Helvetica,sans-serif;}.pagelist tr.evenrow{background:#111;}.pagelist tr.oddrow{background:black;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;margin:5px 0;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.toolbar,input.button,#signin{font-family:Arial,Helvetica,sans-serif;}.toolbar hr{visibility:hidden;}div.toolbar,#signin{color:white;padding:0;margin:0;}div.toolbar{margin-top:1ex;}#navbuttons{margin-right:7em;margin-bottom:1ex;}#navbuttons input{position:relative;bottom:-2px;}.editdate{font-family:Arial,Helvetica,sans-serif;color:#96c;}.toolbar .wiki{color:#0053db;text-decoration:none;font-weight:bold;}.toolbar .wiki:hover{color:#5791ff;font-weight:bold;}div.toolbar input{font-family:Helvetica,Arial,sans-serif;}textarea{border:2px solid #0053db;padding-top:.5ex;padding-bottom:.5ex;padding-left:.5em;padding-right:.25em;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}.transclusion-title{font-style:oblique;font-size:smaller;text-decoration:none;text-align:right;}.wiki-edithelp,.transclusion{background:#1b1722;border:1px solid #403752;}.wiki-edithelp{font-size:smaller;margin:.5ex 0;}.wiki-edithelp,div.transclusion{color:#a2a2a2;background-color:#1b1722;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin-left:0;margin-right:0;}.wiki-edithelp .wiki{color:#fff313;font-weight:bold;text-decoration:none;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px solid #006;background:black;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{border:1px solid #006;color:#fff313;background:black;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff .block{background:#008;padding:.5ex .5em;margin:.5ex 0;}.diff .context{background:black;}.diff .block tt{font-weight:bold;font-family:monospace;margin-left:-.6em;color:black;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted{background:#a40024;}.diff .final,.diff .added{background:#cfc;}.diff del{background:#a40024;}.diff ins{background:#9f9;}table.pageinfo{border:1px solid #96c;}table.pageinfo td{background:black;}table.pageinfo td.pageinfo{border-right:.15em solid #639;font-weight:bold;color:#639;background:#203;}table.pageinfo td+td.pageinfo{border-right:0;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.rssicon{border-color:#000;border-width:2px;}.rc-major{color:#fff;background:#000;font-weight:normal;text-decoration:none;}img.rssicon{vertical-align:top;}b.wikisummary{color:#fff313;background:#000;text-decoration:none;font-weight:bold;}.printer{display:none;}.error{color:red;background:black;border:medium solid red;clear:both;}.debug{color:white;background:black;font-family:monospace;font-size:smaller;margin-top:16ex;margin-bottom:4ex;margin-left:0;margin-right:0;padding:.5ex .5em;border:medium solid gray;display:table;}.clear-floats{clear:both;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}input.numeric{text-align:right;}input{margin:0;border-left:1px solid #0053db;border-right:1px solid #0053db;border-top:1px solid #0053db;border-bottom:1px solid #0053db;text-align:center;}input[type=text]{border-left:2px solid #0053db;border-right:2px solid #0053db;border-bottom:2px solid #0053db;border-top:0;margin-top:2px;padding:1px;}input[type=submit]{color:#0053db;border-left:1.5em solid #0053db;border-right:.15em solid #0053db;border-top:2px solid #0053db;border-bottom:2px solid #0053db;padding-left:0;padding-right:0;}input[type=submit]:hover{color:#5791ff;border-color:#5791ff;}.logo img{margin-bottom:1ex;}div.wikiaction,form.wikiadmin div{position:relative;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}a.wikiaction{border-left:1.5em solid #151;border-right:.15em solid #151;padding-left:.15em;padding-right:.3em;}a.wikiaction:hover{border-right:.15em solid #1bab11;}a.wikiadmin{border-left:1.5em solid #982505;border-right:.15em solid #982505;padding-left:.15em;padding-right:.3em;}a.wikiadmin:hover{border-right:.15em solid #ef0032;}.wikiunknown a,.named-wikiunknown a{border:1px solid black;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:1px;font-size:smaller;}.wikiunknown a:hover,.named-wikiunknown a:hover{border:1px solid #403752;}a.wiki-rc-action{border-left:.15em solid #0053db;padding-left:.2em;padding-right:.2em;padding-bottom:.2ex;margin-left:-0.25em;}li.rc-major a.wiki-rc-action,li.rc-minor a.wiki-rc-action{border-left:0;margin-left:0;border-right:.25em solid #0053db;padding-right:.25em;margin-right:.8em;}p.wiki-rc-action a.wiki-rc-action:first-child{border-left:0;margin-left:0;border-right:0;}li.rc-major,li.rc-minor{display:table;margin-bottom:.25ex;padding-left:.25em;padding-right:.25em;}li.rc-minor{font-size:75%;margin-top:.5ex;border-bottom:0;padding-left:1em;}li.rc-minor a.wiki-rc-action{border-right:.15em solid #0053db;margin-right:2em;}li.rc-major a.wiki-rc-action:hover,li.rc-minor a.wiki-rc-action:hover,a.wiki-rc-action:hover{border-color:#5791ff;}img.linkicon{vertical-align:middle;}h1{padding-top:.25ex;padding-left:.5em;padding-right:.25em;padding-bottom:1px;}div.toolbar h1 a.wiki,h1 a.backlinks{padding-top:.25ex;padding-left:.25em;padding-right:.25em;padding-bottom:1px;}h2 a.wiki{padding-top:.25ex;padding-left:.25em;padding-right:.25em;padding-bottom:1px;}div.toolbar input{text-align:left;}div.transclusion{font-size:smaller;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:0;top:0;}.editdate{padding-top:.25ex;padding-left:.5em;padding-right:.5em;padding-bottom:1px;margin-top:2em;margin-bottom:0;border-left:.5em solid #96c;border-top:.15em solid #96c;}div.toolbar .wiki{border-left:1.5em solid #0053db;border-right:.15em solid #0053db;padding-left:.15em;padding-right:.3em;}div.toolbar .wiki:hover{border-right:.15em solid #5791ff;}b.wikisummary{padding:2px;margin:1px;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/SpaceWiki.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: SpaceWiki.css 7331 2010-04-15 09:04:51Z vargenau $
+ * $Id: SpaceWiki.css 7851 2011-01-21 13:17:59Z vargenau $
  *
  * This theme will probably be renamed something like "Space" to
  * avoid any potential copyright issues.
@@ -37,13 +37,12 @@
   /* For Mozilla */
   empty-cells: show;
 }
-td { color: white; } /* for NS4 */
+td { color: white; }
 caption {
   caption-side: top;
   text-align: left;
   margin-bottom: .5ex;
-  /* Allow the caption to extend to the full page width
-     Mac ie5.1 ignores this*/
+  /* Allow the caption to extend to the full page width */
   width: 100%;
 }
 a { color: #0053db; }
@@ -69,7 +68,6 @@
 /**
  * <hr>
  * Not all browsers support this, but it's a cool trick when it is!
- * yes=OmniWeb 4.1sp28; No=IE5.1Mac, Mozilla0.97Mac, iCAB2.6Mac.
  */
 div.wikitext hr {
   visibility: hidden; /* for Mozilla */
@@ -367,12 +365,11 @@
 }
 
 
-/**
- * IncludePage plugin
- */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   font-style: oblique;
-  font-size: smaller; /* 0.75em; */
+  font-size: smaller;
   text-decoration: none;
   text-align: right;
 } 
@@ -487,11 +484,9 @@
 .diff .original, .diff .deleted { background: #a40024; }
 .diff .final, .diff .added { background: #cfc; }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 .diff del { background: #a40024; }
 .diff ins { background: #9f9; }
 
-
 /**
  * PageHistory, Info
  */
@@ -544,20 +539,12 @@
  */
 .printer { display: none; }
 
-/* PHP Warnings */
-div.errors {
+.error {
   color: red;
   background: black;
   border: medium solid red;
   clear: both;
 }
-.errors h4 {
-  color: black;
-  background: red;
-  text-decoration: underline;
-}
-.error { font-family: monospace; }
-.error ul { font-family: monospace; }
 
 /* Debug */
 .debug {
@@ -632,8 +619,7 @@
  */
 /* div.wikiaction, div.wikiadmin { */
 div.wikiaction, form.wikiadmin div {
-  /* Emulate the display behaviour of a table, to shrink it's width.
-   * ie5.1Mac ignores this */
+  /* Emulate the display behaviour of a table, to shrink it's width. */
   position: relative;
   display: table;
 }
@@ -676,7 +662,7 @@
   padding-right: 1px;
   padding-top: 1px;
   margin-right: 1px;
-  font-size: smaller; /* too small in NS4 */
+  font-size: smaller;
 }
 .wikiunknown a:hover, .named-wikiunknown a:hover {
   border: 1px solid #403752;
@@ -754,14 +740,11 @@
   text-align:  left;
 }
 
-
 /**
  * Edit Page & View Source
  */
-/* color: inherit; and background: inherit; display as lime in NS4 */
-div.transclusion { font-size: smaller; } /* too small in NS4 */
+div.transclusion { font-size: smaller; }
 
-
 /**
  * Diff Output
  */
@@ -775,7 +758,6 @@
   top:  0;
 }
 
-
 .editdate {
   padding-top:    0.25ex;
   padding-left:   0.5em;
@@ -803,26 +785,6 @@
   margin: 1px;
 }
 
-/**
- * Other
- */
-/* PHP Warnings */
-div.errors {
-  font-size: smaller; /* too small in NS4 */
-  margin-top:    4ex;
-  margin-bottom: 2ex;
-  padding: 0.5ex 0.25em;
-}
-.errors h4 {
-  margin: 0;
-  padding: 0.5ex 0.25em;
-}
-
-.error {
-  padding-left: 0.25em;
-  padding-right: 0.25em;
-}
-
 /*
  * table class="boxed"
  * will put a border around the table (but not around the cells)

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/lib/RecentChanges.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/lib/RecentChanges.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/lib/RecentChanges.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: RecentChanges.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: RecentChanges.php 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * Extensions/modifications to the stock RecentChanges (and PageHistory) format.
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/SpaceWiki/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,13 +6,11 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /**
  * This theme is by design completely css-based so unfortunately it
  * doesn't render properly or even the same across different browsers.
- * Mozilla 0.98 was used for testing, it is the only Mac browser so
- * far which correctly renders most of the css used here.
  * A preview screen snapshot is included for comparison testing.
  *
  * The reverse coloring of this theme was chosen to provide an extreme
@@ -38,51 +36,51 @@
             return false;       // use default
         return '_SpaceWiki_PageHistory_Formatter';
     }
-  
+
     function load() {
-	// 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.
+    // 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.
 
-	$this->setDefaultCSS('SpaceWiki', 'SpaceWiki.css');
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
-	$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
+    $this->setDefaultCSS('SpaceWiki', 'SpaceWiki.css');
+    $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+    $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+    $this->addAlternateCSS('PhpWiki', 'phpwiki.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	//$this->addImageAlias('logo', 'logo.png');
-	$this->addImageAlias('logo', 'Ufp-logo.jpg');
-	$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+    /**
+     * The logo image appears on every page and links to the HomePage.
+     */
+    //$this->addImageAlias('logo', 'logo.png');
+    $this->addImageAlias('logo', 'Ufp-logo.jpg');
+    $this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is set to false then the "Thank you for editing..." screen will
-	 * be omitted.
-	 */
-	$this->addImageAlias('signature', 'lights.png');
-	$this->addImageAlias('signature', WIKI_NAME . "Signature.png");
-	// Uncomment this next line to disable the signature.
-	//$this->addImageAlias('signature', false);
+    /**
+     * The Signature image is shown after saving an edited page. If this
+     * is set to false then the "Thank you for editing..." screen will
+     * be omitted.
+     */
+    $this->addImageAlias('signature', 'lights.png');
+    $this->addImageAlias('signature', WIKI_NAME . "Signature.png");
+    // Uncomment this next line to disable the signature.
+    //$this->addImageAlias('signature', false);
 
-	$this->addImageAlias('hr', 'hr.png');
+    $this->addImageAlias('hr', 'hr.png');
 
-	$this->setButtonSeparator(" ");
+    $this->setButtonSeparator(" ");
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	//$this->setAutosplitWikiWords(false);
+    /**
+     * WikiWords can automatically be split by inserting spaces between
+     * the words. The default is to leave WordsSmashedTogetherLikeSo.
+     */
+    //$this->setAutosplitWikiWords(false);
 
-	/**
-	 * The "stardate" format here is really just metricdate.24hourtime. A
-	 * "real" date2startdate conversion function might be fun but not very
-	 * useful on a wiki.
-	 */
-	$this->setTimeFormat("%H%M%S");
-	$this->setDateFormat("%Y%m%d"); // must not contain time
+    /**
+     * The "stardate" format here is really just metricdate.24hourtime. A
+     * "real" date2startdate conversion function might be fun but not very
+     * useful on a wiki.
+     */
+    $this->setTimeFormat("%H%M%S");
+    $this->setDateFormat("%Y%m%d"); // must not contain time
 
     }
 }
@@ -95,5 +93,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/Wordpress-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/Wordpress-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/Wordpress-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-body{color:black;background:white;}img{border:0 none;}.wiki-edithelp{font-size:smaller;}input.numeric{text-align:right;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wikitext .wiki,.wikitext .named-wiki{font-weight:bold;}.wikitext{margin:30px 13em 0 3em;padding-right:20px;}.cal-hide{color:#999;}.cal-hide,.cal-day a{font-size:smaller;}.cal-day a,.cal-hide a{font-weight:bold;}hr{border-bottom:1px dotted #ccc;height:0;}body{background:#fff url(images/content-background.png) repeat-x;font-family:Verdana,Geneva,sans-serif;margin:0;padding:0;color:black;}a{color:#036;text-decoration:none;}a:visited{color:#369;}a:hover{color:#69c;}#header{background:#036 url(images/header-background.png) repeat-x;border-bottom:1px solid #69c;font:italic normal 230% 'Times New Roman',Times,serif;letter-spacing:.2em;margin:0;padding:15px 10px 15px 30px;color:#69c;}#header a{color:#fff;text-decoration:none;}#header a:hover{text-decoration:underline;}#actionbar{background:#e8e8e8 url(images/menu-background.png) repeat-x;border-left:1px solid #9cf;border-bottom:1px solid #9cf;padding:30px 0 20px 20px;position:absolute;right:0;top:0;width:11em;}#actionbar form{margin:0;}#actionbar input{width:80%;}input{background:#fff;border:1px solid #999;font-size:smaller;}#actionbar ul{color:#369;font-weight:bold;list-style-type:none;margin:0;padding-left:3px;}#actionbar ul li{font:italic normal 100% 'Times New Roman',Times,serif;letter-spacing:.1em;margin-top:10px;padding-bottom:2px;}#actionbar ul ul{list-style-type:none;font-variant:normal;font-weight:normal;line-height:100%;margin:0;padding:0;text-align:left;}#actionbar ul ul li{border:0;font:normal 70% Verdana,sans-serif;letter-spacing:0;margin-top:0;padding:0 0 1px 12px;}#actionbar ul ul li a{color:#036;text-decoration:none;}#actionbar ul ul li a:hover{border-bottom:1px solid #69c;}.cal{background:#fff;border:1px solid #ddd;empty-cells:show;margin:0 0 0 -5px;}.cal a{text-decoration:none;font-style:normal;}.cal a:hover{background:#e8e8e8;color:#333;}.cal-header,.cal-dayname td{color:#999;padding:1px 1px;}.cal-dayname td{font-size:smaller;color:#69c;}.cal td.pad:hover{background:#fff;}.cal td:hover,.cal-today{background:#e8e8e8;color:#666;}.cal-header{color:#69c;font-style:normal;text-transform:capitalize;}th.gridbutton{background:#e8e8e8 url(images/menu-background.png) repeat-x;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;margin:5px 0;max-height:24px;white-space:nowrap;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;color:black;}.wikipaging{font-size:x-small;}.toolbar{padding:0;margin:0;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.printer,.no-css{display:none;}div.errors{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}h4.errors{color:red;margin:0;padding:0;text-decoration:underline;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.error{font-family:monospace;font-size:120%;}.error ul{font-family:monospace;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid silver;}.box-title{font-family:Tahoma,Arial,Helvetica,sans-serif;font-weight:normal;background-color:#ccc;color:black;text-align:center;border:none;padding:2px 0 2px 0;}.box-data{width:160px;font-size:9pt;font-weight:normal;border:none;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}.wikiwyg_toolbar{background:#D3D3D3;border:1px outset;letter-spacing:0;padding:2px;}span.wikiwyg_control_link a{padding-right:8px;}.wikiwyg_button{background:#D3D3D3;border:1px solid #D3D3D3;cursor:pointer;width:20px;height:20px;vertical-align:bottom;}.wikiwyg_button:hover{border:1px outset;}.wikiwyg_button:active{border:1px inset;}.wikiwyg_separator{background:#D3D3D3;border:1px solid #D3D3D3;width:9px;height:20px;vertical-align:bottom;}.wikiwyg_selector{width:70px;}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em;}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file
+body{color:black;background:white;}img{border:0;}.wiki-edithelp{font-size:smaller;}input.numeric{text-align:right;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wikitext .wiki,.wikitext .named-wiki{font-weight:bold;}.wikitext{margin:30px 13em 0 3em;padding-right:20px;}.cal-hide{color:#999;}.cal-hide,.cal-day a{font-size:smaller;}.cal-day a,.cal-hide a{font-weight:bold;}hr{border-bottom:1px dotted #ccc;height:0;}body{background:#fff url(images/content-background.png) repeat-x;font-family:Verdana,Geneva,sans-serif;margin:0;padding:0;color:black;}a{color:#036;text-decoration:none;}a:visited{color:#369;}a:hover{color:#69c;}#header{background:#036 url(images/header-background.png) repeat-x;border-bottom:1px solid #69c;font:italic normal 230% 'Times New Roman',Times,serif;letter-spacing:.2em;margin:0;padding:15px 10px 15px 30px;color:#69c;}#header a{color:#fff;text-decoration:none;}#header a:hover{text-decoration:underline;}#actionbar{background:#e8e8e8 url(images/menu-background.png) repeat-x;border-left:1px solid #9cf;border-bottom:1px solid #9cf;padding:30px 0 20px 20px;position:absolute;right:0;top:0;width:11em;}#actionbar form{margin:0;}#actionbar input{width:80%;}input{background:#fff;border:1px solid #999;font-size:smaller;}#actionbar ul{color:#369;font-weight:bold;list-style-type:none;margin:0;padding-left:3px;}#actionbar ul li{font:italic normal 100% 'Times New Roman',Times,serif;letter-spacing:.1em;margin-top:10px;padding-bottom:2px;}#actionbar ul ul{list-style-type:none;font-variant:normal;font-weight:normal;line-height:100%;margin:0;padding:0;text-align:left;}#actionbar ul ul li{border:0;font:normal 70% Verdana,sans-serif;letter-spacing:0;margin-top:0;padding:0 0 1px 12px;}#actionbar ul ul li a{color:#036;text-decoration:none;}#actionbar ul ul li a:hover{border-bottom:1px solid #69c;}.cal{background:#fff;border:1px solid #ddd;empty-cells:show;margin:0 0 0 -5px;}.cal a{text-decoration:none;font-style:normal;}.cal a:hover{background:#e8e8e8;color:#333;}.cal-header,.cal-dayname td{color:#999;padding:1px 1px;}.cal-dayname td{font-size:smaller;color:#69c;}.cal td.pad:hover{background:#fff;}.cal td:hover,.cal-today{background:#e8e8e8;color:#666;}.cal-header{color:#69c;font-style:normal;text-transform:capitalize;}th.gridbutton{background:#e8e8e8 url(images/menu-background.png) repeat-x;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;margin:5px 0;max-height:24px;white-space:nowrap;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;color:black;}.wikipaging{font-size:x-small;}.toolbar{padding:0;margin:0;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.printer,.no-css{display:none;}.error{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid silver;}.box-title{font-family:Tahoma,Arial,Helvetica,sans-serif;font-weight:normal;background-color:#ccc;color:black;text-align:center;border:none;padding:2px 0 2px 0;}.box-data{width:160px;font-size:9pt;font-weight:normal;border:none;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}.wikiwyg_toolbar{background:#D3D3D3;border:1px outset;letter-spacing:0;padding:2px;}span.wikiwyg_control_link a{padding-right:8px;}.wikiwyg_button{background:#D3D3D3;border:1px solid #D3D3D3;cursor:pointer;width:20px;height:20px;vertical-align:bottom;}.wikiwyg_button:hover{border:1px outset;}.wikiwyg_button:active{border:1px inset;}.wikiwyg_separator{background:#D3D3D3;border:1px solid #D3D3D3;width:9px;height:20px;vertical-align:bottom;}.wikiwyg_selector{width:70px;}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em;}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/Wordpress.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/Wordpress.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/Wordpress.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,18 +1,18 @@
 /**
- * $Id: Wordpress.css 7331 2010-04-15 09:04:51Z vargenau $
+ * $Id: Wordpress.css 7965 2011-03-07 09:47:31Z vargenau $
  *
  * PhpWiki's Wordpress style sheet contributed by Mike Pickering
  */
 
-/* 
-	Blue-Fade Theme 
-	Modified 2004-01-20 by Alex King (http://www.alexking.org/)
+/*
+    Blue-Fade Theme
+    Modified 2004-01-20 by Alex King (http://www.alexking.org/)
 
-	based on:
-	Default WordPress by Dave Shea || http://mezzoblue.com
-	Modifications by Matthew Mullenweg || http://photomatt.net
-	This is just a basic layout, with only the bare minimum defined.
-	Please tweak this and make it your own. :)
+    based on:
+    Default WordPress by Dave Shea || http://mezzoblue.com
+    Modifications by Matthew Mullenweg || http://photomatt.net
+    This is just a basic layout, with only the bare minimum defined.
+    Please tweak this and make it your own. :)
 */
 
 /* This stuff was copied straight out of portland.css */
@@ -23,7 +23,7 @@
 }
 
 img {
-  border : 0 none;
+  border : 0;
 }
 
 .wiki-edithelp {
@@ -93,7 +93,7 @@
         color: #036;
         text-decoration: none;  /* This was added */
 }
- 
+
 a:visited {
         color: #369;
 }
@@ -270,7 +270,7 @@
   color: black;
 }
 
-.wikipaging { 
+.wikipaging {
   font-size: x-small;
 }
 
@@ -312,7 +312,7 @@
   display: none;
   z-index: 100;
   background-color: white;
-  border: 1px solid #d0d0d0; 
+  border: 1px solid #d0d0d0;
   font-size: 9px;
   overflow: hidden;
 }
@@ -321,9 +321,9 @@
 }
 #LSResult .evenrow {
   background-color: #f0f0f0;
-} 
+}
 #LSREsult .oddrow {
-} 
+}
 .LSEnd {
   text-align: right;
 }
@@ -332,7 +332,7 @@
 }
 .LSRow {
   padding: 1px;
-} 
+}
 ul.LSRes {
   margin: 0px;
   padding: 0px;
@@ -342,7 +342,8 @@
   list-style-image: none;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   text-align: right;
   font-style: oblique;
@@ -350,14 +351,14 @@
   text-decoration: underline;
   margin-bottom: 0.25ex;
   margin-right:  0.25em;
-} 
+}
 .transclusion, .wiki-edithelp {
   font-size: smaller;
 }
 .transclusion {
   border: 1px solid gray;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
+  padding-left:  0.8em;
+  padding-right: 0.8em;
   padding-top:     0px;
   padding-bottom:  0px;
   margin-left:   0.25em;
@@ -399,13 +400,13 @@
   padding: 1px;
   /* For Mozilla */
   empty-cells: hide;
-} 
+}
 
 /* cells */
 table.cal td {
   background: white;
   text-align: right;
-} 
+}
 
 /* Month-name header */
 table.cal-header { font-size: larger; }
@@ -443,10 +444,6 @@
   margin-top:    1ex;
   margin-bottom: 0.5ex;
   background: white;
-  /* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-  border: 1px #ccc solid;
   color: black;
   border-top: 1px solid #494f5d;
   border-left:  1px solid #494f5d;
@@ -457,33 +454,16 @@
   padding-left:  .125em;
   padding-right: .125em;
   padding: 0;
-  /* "paper" borders */
-  /*border-top: 2px #d2d2d2 solid;
-  border-left:  2px #b2b2b2 solid;
-  border-bottom:  2px #e8e6df solid;
-  border-right: 2px #e8e6df solid;*/
-/*  padding-left:  0em; 
-  padding-bottom: 0ex;*/
-/*  border-style: inset;*/
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
-  /* I'm not sure what the intent of this was, but it's
-   *  not valid CSS: */
-  /* display: editarea; */
   clear: both;
 }
 .diff .block {
   background: #ddd;
   padding-left: 1em;
-  /* for NS4 */
-  /*border: none;*/
 }
 
 /* individual blocks */
 .diff .context {
   background: white;
-  /* for NS4 */
   border: none;
 }
 /* entire difftextblock */
@@ -491,22 +471,15 @@
   margin-top:    0;
   margin-bottom: 0;
   background: white;
-  /* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-  border: 1px black solid;
   /* "paper" borders */
   border-top:  1px #e8e6df solid;
   border-left: 1px #e8e6df solid;
   border-bottom: 1px #d2d2d2 solid;
   border-right:  1px #b2b2b2 solid;
-  padding-left:  0em; 
+  padding-left:  0em;
   padding-right: 0em;
   padding-top:    0ex;
   padding-bottom: 0ex;
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
   clear: both;
 }
 /* + - line prefix */
@@ -514,7 +487,6 @@
   font-weight: normal;
   font-family: monospace;
   color: black;
-  /* for NS4 */
   margin-left: 0;
   border: none;
 }
@@ -532,23 +504,19 @@
 /* blocks containing deleted words */
 .diff .original, .diff .deleted {
   background: #fcc;
-  /* for NS4 */
   border: none;
 }
 /* blocks containing added words */
 .diff .final, .diff .added {
   background: #cfc;
-  /* for NS4 */
   border: none;
 }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 /* deleted words */
 .diff del { background: #f99; }
 /* added words */
 .diff ins { background: #9f9; }
 
-
 /**
  * PageHistory, Info
  */
@@ -558,45 +526,36 @@
   font-style: oblique;
 }
 
-
 /**
  * Other
  */
 .printer, .no-css { display: none; }
 
-/* PHP Warnings */
-div.errors {
+.error {
   color: black;
   background: #eee;
   margin-top:    1em;
   margin-bottom: 1em;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
+  padding-left:  0.8em;
+  padding-right: 0.8em;
   padding-top:    0.8ex;
   padding-bottom: 0;
   border: medium solid red;
   clear: both;
 }
-h4.errors {
-  color: red;
-  margin:  0;
-  padding: 0;
-  text-decoration: underline;
-}
-div.warning {
+
+.warning {
   color: black;
   background: #eee;
   margin-top:    1em;
   margin-bottom: 1em;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
+  padding-left:  0.8em;
+  padding-right: 0.8em;
   padding-top:    0.8ex;
   padding-bottom: 0;
   border: thin solid blue;
   clear: both;
 }
-.error { font-family: monospace; font-size: 120%; }
-.error ul { font-family: monospace; }
 
 /* Debug */
 .debug {
@@ -613,7 +572,6 @@
 .hint {
   color: black;
   background: #eeeeee;
-   /* font-size: smaller; */
   font-style: italic;
   margin-left: 3em;
   padding: 0.5ex 0.5em;
@@ -652,7 +610,6 @@
   padding-left: 1em;
 }
 
-
 /*
  * "DL tables"
  */
@@ -663,8 +620,8 @@
 .wiki-dl-table tr {
   border-top: 2px #444 solid;
   border-bottom: 2px #444 solid;
-  border-left: none; 
-  border-right: none; 
+  border-left: none;
+  border-right: none;
 }
 .wiki-dl-table th,
 .wiki-dl-table td {
@@ -695,7 +652,6 @@
   margin-left: -0.6em;
 }
 
-
 /*
  * wikiblog
  */
@@ -802,12 +758,10 @@
   margin: 1em 0 0.5em 0;
 }
 
-
 .clear-floats {
   clear: both;
 }
 
-
 /* postnuke css:*/
 .gensmall{font-size:10px}
 .genmed{font-size:11px}
@@ -831,12 +785,12 @@
 /* plugin BoxRight */
 div.boxright {
   background-color: #e9fbff;
-  width: 200px; 
+  width: 200px;
   right: 10px;
-  padding: 0.5em; 
-  float: right; 
-  border: thin solid #888888; 
   padding: 0.5em;
+  float: right;
+  border: thin solid #888888;
+  padding: 0.5em;
 }
 
 /* RssFeed */
@@ -846,7 +800,7 @@
 div.rssitem { border-top: thin dashed #aaa; }
 
 /* SqlResult */
-table.sqlresult { 
+table.sqlresult {
   border: 1px outset gray;
   background: white;
   margin: 0.5ex 0.5em;
@@ -862,9 +816,8 @@
 /**
  * TeX2png plugin
  */
-img.tex { 
-  border: 0ex;
-  vertical-align: middle; 
+img.tex {
+  vertical-align: middle;
 }
 
 /**

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/lib/RecentChanges.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/lib/RecentChanges.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/lib/RecentChanges.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: RecentChanges.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: RecentChanges.php 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * Extensions/modifications to the stock RecentChanges (and PageHistory) format.
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <div id="actionbar">
@@ -90,7 +90,7 @@
        </li>
        <li>
          <?php if ($revision) { ?>
-           <?php echo Button("LikePages", _("LikePages")) ?>
+           <?php echo Button(_("LikePages"), _("LikePages")) ?>
          <?php } ?>
        </li>
      </ul>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: body.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <body<?php echo $WikiTheme->getMoreAttr('body') ?>>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/browse.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/browse.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/browse.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <br class="clear-floats" />

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/editpage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/editpage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7678 2010-09-08 11:17:03Z vargenau $');
+// $Id: editpage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * FIXME: Hack!
  * The funky URL used for the form action parameter is bogus.

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
   $Sep = $WikiTheme->getButtonSeparator();

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/signin.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/signin.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/signin.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
 <?php // -*-php-*-
 // MPickering: modified; this will be enclosed within an ul
-// rcs_id('$Id: signin.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: signin.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 
 if (empty($FORMNAME))
     $FORMNAME = 'signin';

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/viewsource.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/templates/viewsource.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: viewsource.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <div class="wikitext" id="viewform">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/Wordpress/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /*
  * This file defines an appearance ("theme") of PhpWiki similar to the
@@ -27,7 +27,7 @@
         else {
             $default_text = $wikiword;
         }
-      
+
         $url = WikiURL($wikiword, array('action' => 'create'));
         $link = HTML::span(HTML::a(array('href' => $url, 'rel' => 'nofollow'), '?'));
 
@@ -57,55 +57,49 @@
     }
 
     function load() {
-	// 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.
+    // 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.
 
-	$this->setDefaultCSS('Wordpress', 'Wordpress.css');
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
-	$this->addAlternateCSS('PhpWiki', 'phpwiki.css');
+    $this->setDefaultCSS('Wordpress', 'Wordpress.css');
+    $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+    $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+    $this->addAlternateCSS('PhpWiki', 'phpwiki.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	//$this->addImageAlias('logo', 'logo.png');
+    /**
+     * The logo image appears on every page and links to the HomePage.
+     */
+    //$this->addImageAlias('logo', 'logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is not set, any signature defined in index.php will be used. If it
-	 * is not defined by index.php or in here then the "Thank you for
-	 * editing..." screen will be omitted.
-	 */
-	$this->addImageAlias('signature', 'signature.png');
+    /**
+     * The Signature image is shown after saving an edited page. If this
+     * is not set, any signature defined in index.php will be used. If it
+     * is not defined by index.php or in here then the "Thank you for
+     * editing..." screen will be omitted.
+     */
+    $this->addImageAlias('signature', 'signature.png');
 
-	/*
-	 * Link icons.
-	 */
-	//$this->setLinkIcon('http');
-	//$this->setLinkIcon('https');
-	//$this->setLinkIcon('ftp');
-	//$this->setLinkIcon('mailto');
-	//$this->setLinkIcon('interwiki');
-	//$this->setLinkIcon('*', 'url');
+    /*
+     * Link icons.
+     */
 
-	$this->setButtonSeparator(' ');
+    $this->setButtonSeparator(' ');
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	$this->setAutosplitWikiWords(false);
+    /**
+     * WikiWords can automatically be split by inserting spaces between
+     * the words. The default is to leave WordsSmashedTogetherLikeSo.
+     */
+    $this->setAutosplitWikiWords(false);
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	$this->setDateFormat("%B %d, %Y", false);
+    /*
+     * You may adjust the formats used for formatting dates and times
+     * below.  (These examples give the default formats.)
+     * Formats are given as format strings to PHP strftime() function See
+     * http://www.php.net/manual/en/function.strftime.php for details.
+     * Do not include the server's zone (%Z), times are converted to the
+     * user's time zone.
+     */
+    $this->setDateFormat("%B %d, %Y", false);
     }
 }
 
@@ -117,5 +111,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/Kubrick-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/Kubrick-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/Kubrick-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-body{margin:20px auto;padding:0;font-size:75%;font-family:'Lucida Grande',Verdana,Arial,sans-serif;background-color:#d5d6d7;color:#333;background:url("images/kubrickbgcolor.png");}#header{top:0;background-color:#73a0c5;background:url("images/header.png") no-repeat top center;padding:0;margin:0 auto;height:200px;width:100%;}#flashheader,#yoursiteheader{padding-top:19px;margin-left:19px;width:722px;height:182px;background-color:transparent;font:bolder 67px/50px Verdana,Arial,Helvetica,sans-serif;letter-spacing:-0.1em;}#yoursiteheader a:hover,#yoursiteheader a:link,#yoursiteheader a:visited{text-decoration:none;color:black;}#actionbar,#editbar{background:url("images/actionbarbg.png") no-repeat top center;width:760px;}div.actionbuttons a#btn-edit{background:url('images/UEB16.png') bottom left no-repeat;background-repeat:no-repeat;padding-left:13px!important;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}#sitemeter{float:right;}#actionbuttons,.actionbuttons{float:left;height:20px;margin-top:12px;padding-left:30px;vertical-align:middle;}#editbar p{height:20px;padding-top:8px;margin-left:30px;vertical-align:middle;}#editarea-size{font-size:9px;margin-top:0;margin-left:20px;margin-right:10px;}#editarea-size input{font-size:9px;}#actionbuttons a{padding-right:0;font-size:11px;}#pagetrail{margin-left:19px;width:540px;}#pagetrail p{font-size:9px;margin-top:0;margin-left:20px;margin-right:20px;}#page{background-color:white;background:url("images/kubrickbg.png");margin:20px auto;padding:0;width:760px;}#content{font-size:1.2em;}#pagetitle,#pagetitle a{color:black;padding-left:20px;margin-top:12px;margin-bottom:4px;width:550px;}.indexLetterHeading{margin-top:8px;padding:4px;background-color:#f0f0f0;}div.wikitext{margin-top:12px;}pre{overflow:hidden;padding:2px;background-color:#f0f0f0;}#seealso table,.transclusion-title{font-size:.81em;}.transclusion-title{margin:0;}.transclusion{margin-bottom:8px;}div.comments{margin-top:0;text-align:right;font-size:.81em;}#bottom{font-size:.81em;border:none;width:720px;clear:both;margin:0 20px 0 20px;}#footer{font-size:.81em;background-color:#eee;background:url("images/kubrickfooter.png") no-repeat bottom center;border:none;width:760px;height:60px;clear:both;text-align:center;}#footer p,#bottom p{margin:0;padding:0;}.widecolumn .entry p{font-size:1.05em;}.narrowcolumn .entry,.widecolumn .entry{line-height:1.4em;}.widecolumn{line-height:1.6em;}.narrowcolumn .postmetadata{text-align:center;}.graybox{background-color:#f8f8f8;border-top:1px solid #ddd;border-bottom:1px solid #ddd;}small{font-family:Arial,Helvetica,sans-serif;font-size:.9em;line-height:1.5em;}tt{font-family:'Andale Mono','Lucida Console','Courier New',monospace;font-size:1.05em;}pre{width:486px;font-size:10px;font-family:'Andale Mono','Lucida Console','Courier New',monospace;overflow:hidden;}h1,h2,h3{font-family:'Trebuchet MS','Lucida Grande',Verdana,Arial,sans-serif;font-weight:bold;}h1{font-size:2em;text-align:center;}.description{font-size:1.2em;text-align:center;}h2{font-size:1.6em;margin-top:2px;text-align:left;}#sidebar h2,#sidebar .box-title{font-family:'Lucida Grande',Verdana,sans-serif;font-size:1.2em;}h3{font-size:1.3em;}h1,h1 a,h1 a:hover,h1 a:visited,.description{text-decoration:none;color:black;}h2,h2 a,h2 a:visited,.box-title a:visited,h3,h3 a,h3 a:visited{color:#333;}h2,h2 a,h2 a:hover,h2 a:visited,h3,h3 a,h3 a:hover,h3 a:visited,#sidebar h2,#wp-calendar caption,cite{text-decoration:none;}table.pagelist,table.referrerlist{width:100%;}table.referrerlist td{font-size:.71em;}table.pagelist{font-size:.81em;}tr.evenrow{background-color:#f0f0f0;}.entry p a:visited{color:#b85b5a;}#sidebar{font:1em 'Lucida Grande',Verdana,Arial,sans-serif;left:585px;position:absolute;z-index:2;top:260px;padding:0 10px 10px 0;width:155px;border:none;overflow:visible;color:black;}#moz-sidebar{font:1em 'Lucida Grande',Verdana,Arial,sans-serif;margin-left:560px;position:absolute;z-index:2;top:270px;padding:0 10px 10px 0;width:155px;background:white;}#sidebar form{margin:0;}#notification{margin-left:20px;background:#ffe0e0;}#revisionbox dl,#cachebox dl{width:200px;margin:0;background:#ffe0e0 url("images/bottom_sidebar_round.png") no-repeat bottom left;}#revisionbox dd,#cachebox dd{padding-bottom:10px;}#revisionbox dt,#cachebox dt{margin:0;padding:5px;background:#ffe0e0 url("images/top_sidebar_round.png") no-repeat top left;}small,#sidebar ul ul li,#sidebar ul ol li,.nocomments,.postmetadata,blockquote,strike{color:#777;}code{font:1.1em 'Courier New',Courier,monospace;}acronym,abbr,span.caps{font-size:.9em;letter-spacing:.07em;}a,h2 a:hover,h3 a:hover{color:#06c;text-decoration:none;}a:hover{color:#147;text-decoration:underline;}a.namedurl{padding-right:6px;margin-right:0;background:url("images/http.png") right top no-repeat;}a.namedurl[href*="https"]{padding-right:6px;margin-right:0;background:url("images/https.png") right top no-repeat;}a.named-interwiki{padding-right:6px;margin-right:0;background:url("images/interwiki.png") right top no-repeat;}#xhtml-validator{padding-bottom:0;vertical-align:middle;}#searchholder{float:right;vertical-align:middle;margin-top:10px;margin-right:30px;}#livesearch{width:150px;font-size:.8em;}#bodyContent{float:left;padding:0 0 20px 25px;margin:0;width:550px;overflow:visible;min-height:490px;}.narrowcolumn,.wikiblog{width:550px!important;}#editpage,#edit-content,.wiki-edithelp{padding:0 0 20px 0;width:710px;overflow:visible;}.wiki-edithelp{font-size:.81em;}#wikiblog-form div.wiki-edithelp{width:550px;font-size:8pt;}.widecolumn{padding:10px 0 20px 0;margin:5px auto;width:450px;}.post{margin:0 0 40px;text-align:justify;}.widecolumn .post{margin:0;}.narrowcolumn .postmetadata{padding-top:5px;}.widecolumn .postmetadata{margin:30px 0;}h1{margin:0;}.description{text-align:center;}div.box-title,div.box-title a,div.box-title a:visited,div.box-title a:link{font-weight:bold;text-decoration:none;color:black;}div.box-data,div.box-data a,div.box-data a:visited,div.box-data a:link{font-size:8pt;}#sidebar h2,#sidebar .box-title{margin:5px 0 0 0;padding:0;color:black;text-decoration:none;}h3{padding:0;margin:30px 0 0;}h3.comments{padding:0;margin:40px auto 20px;}p img{padding:0;max-width:100%;}img.centered{display:block;margin-left:auto;margin-right:auto;}img.alignright{padding:4px;margin:0 0 2px 7px;display:inline;}img.alignleft{padding:4px;margin:0 7px 2px 0;display:inline;}.alignright{float:right;}.alignleft{float:left;}html>body ul{margin-left:0;padding:0 0 0 30px;list-style:none;padding-left:10px;text-indent:-10px;}html>body li{margin:0 0 0 10px;}.narrowcolumn ul li:before,#sidebar ul ul li:before{content:"\00BB \0020";}.entry ol{padding:0 0 0 35px;margin:0;}.entry ol li{margin:0;padding:0;}.postmetadata ul,.postmetadata li{display:inline;list-style-type:none;list-style-image:none;}#sidebar ul,#sidebar ul ol{margin:0;padding:0;}#sidebar ul li{list-style-type:none;list-style-image:none;margin-bottom:15px;}#sidebar ul p,#sidebar ul select{margin:5px 0 8px;}#sidebar ul ul,#sidebar ul ol{margin:5px 0 0 10px;}#sidebar ul ul ul,#sidebar ul ol{margin:0 0 0 10px;}ol li,#sidebar ul ol li{list-style:decimal outside;}#sidebar ul ul li,#sidebar ul ol li{margin:3px 0 0;padding:0;}#searchform{text-align:right;display:inline;}#wikiblog-summary{font-weight:bold;}acronym,abbr,span.caps{cursor:help;}acronym,abbr{border-bottom:1px dashed #999;}blockquote{margin:15px 30px 0 10px;padding-left:20px;border-left:5px solid #ddd;}blockquote cite{margin:5px 0 0;display:block;}.center{text-align:center;}hr{display:none;}a img{border:none;}.navigation{display:block;text-align:center;margin-top:10px;margin-bottom:60px;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}#difftext{width:710px;margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}#VisualWikiPlugin img{width:520px;margin-left:0;padding:0;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}.gensmall{font-size:9px;}.genmed{font-size:11px;}.wikiwyg_toolbar{background:#D3D3D3;border:1px outset;letter-spacing:0;padding:2px;}span.wikiwyg_control_link a{padding-right:8px;}.wikiwyg_button{background:#D3D3D3;border:1px solid #D3D3D3;cursor:pointer;width:20px;height:20px;vertical-align:bottom;}.wikiwyg_button:hover{border:1px outset;}.wikiwyg_button:active{border:1px inset;}.wikiwyg_separator{background:#D3D3D3;border:1px solid #D3D3D3;width:9px;height:20px;vertical-align:bottom;}.wikiwyg_selector{width:70px;}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em;}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file
+body{margin:20px auto;padding:0;font-size:75%;font-family:'Lucida Grande',Verdana,Arial,sans-serif;background-color:#d5d6d7;color:#333;background:url("images/kubrickbgcolor.png");}#header{top:0;background-color:#73a0c5;background:url("images/header.png") no-repeat top center;padding:0;margin:0 auto;height:200px;width:100%;}#flashheader,#yoursiteheader{padding-top:19px;margin-left:19px;width:722px;height:182px;background-color:transparent;font:bolder 67px/50px Verdana,Arial,Helvetica,sans-serif;letter-spacing:-0.1em;}#yoursiteheader a:hover,#yoursiteheader a:link,#yoursiteheader a:visited{text-decoration:none;color:black;}#actionbar,#editbar{background:url("images/actionbarbg.png") no-repeat top center;width:760px;}div.actionbuttons a#btn-edit{background:url('images/UEB16.png') bottom left no-repeat;background-repeat:no-repeat;padding-left:13px!important;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}#sitemeter{float:right;}#actionbuttons,.actionbuttons{float:left;height:20px;margin-top:12px;padding-left:30px;vertical-align:middle;}#editbar p{height:20px;padding-top:8px;margin-left:30px;vertical-align:middle;}#editarea-size{font-size:9px;margin-top:0;margin-left:20px;margin-right:10px;}#editarea-size input{font-size:9px;}#actionbuttons a{padding-right:0;font-size:11px;}#pagetrail{margin-left:19px;width:540px;}#pagetrail p{font-size:9px;margin-top:0;margin-left:20px;margin-right:20px;}#page{background-color:white;background:url("images/kubrickbg.png");margin:20px auto;padding:0;width:760px;}#content{font-size:1.2em;}#pagetitle,#pagetitle a{color:black;padding-left:20px;margin-top:12px;margin-bottom:4px;width:550px;}.indexLetterHeading{margin-top:8px;padding:4px;background-color:#f0f0f0;}div.wikitext{margin-top:12px;}pre{overflow:hidden;padding:2px;background-color:#f0f0f0;}#seealso table,.transclusion-title{font-size:.81em;}.transclusion-title{margin:0;}.transclusion{margin-bottom:8px;}div.comments{margin-top:0;text-align:right;font-size:.81em;}#bottom{font-size:.81em;border:none;width:720px;clear:both;margin:0 20px 0 20px;}#footer{font-size:.81em;background-color:#eee;background:url("images/kubrickfooter.png") no-repeat bottom center;border:none;width:760px;height:60px;clear:both;text-align:center;}#footer p,#bottom p{margin:0;padding:0;}.widecolumn .entry p{font-size:1.05em;}.narrowcolumn .entry,.widecolumn .entry{line-height:1.4em;}.widecolumn{line-height:1.6em;}.narrowcolumn .postmetadata{text-align:center;}.graybox{background-color:#f8f8f8;border-top:1px solid #ddd;border-bottom:1px solid #ddd;}small{font-family:Arial,Helvetica,sans-serif;font-size:.9em;line-height:1.5em;}tt{font-family:'Andale Mono','Lucida Console','Courier New',monospace;font-size:1.05em;}pre{width:486px;font-size:10px;font-family:'Andale Mono','Lucida Console','Courier New',monospace;overflow:hidden;}h1,h2,h3{font-family:'Trebuchet MS','Lucida Grande',Verdana,Arial,sans-serif;font-weight:bold;}h1{font-size:2em;text-align:center;}.description{font-size:1.2em;text-align:center;}h2{font-size:1.6em;margin-top:2px;text-align:left;}#sidebar h2,#sidebar .box-title{font-family:'Lucida Grande',Verdana,sans-serif;font-size:1.2em;}h3{font-size:1.3em;}h1,h1 a,h1 a:hover,h1 a:visited,.description{text-decoration:none;color:black;}h2,h2 a,h2 a:visited,.box-title a:visited,h3,h3 a,h3 a:visited{color:#333;}h2,h2 a,h2 a:hover,h2 a:visited,h3,h3 a,h3 a:hover,h3 a:visited,#sidebar h2,#wp-calendar caption,cite{text-decoration:none;}table.pagelist,table.referrerlist{width:100%;}table.referrerlist td{font-size:.71em;}table.pagelist{font-size:.81em;}tr.evenrow{background-color:#f0f0f0;}.entry p a:visited{color:#b85b5a;}#sidebar{font:1em 'Lucida Grande',Verdana,Arial,sans-serif;left:585px;position:absolute;z-index:2;top:260px;padding:0 10px 10px 0;width:155px;border:none;overflow:visible;color:black;}#moz-sidebar{font:1em 'Lucida Grande',Verdana,Arial,sans-serif;margin-left:560px;position:absolute;z-index:2;top:270px;padding:0 10px 10px 0;width:155px;background:white;}#sidebar form{margin:0;}#notification{margin-left:20px;background:#ffe0e0;}#revisionbox dl,#cachebox dl{width:200px;margin:0;background:#ffe0e0 url("images/bottom_sidebar_round.png") no-repeat bottom left;}#revisionbox dd,#cachebox dd{padding-bottom:10px;}#revisionbox dt,#cachebox dt{margin:0;padding:5px;background:#ffe0e0 url("images/top_sidebar_round.png") no-repeat top left;}small,#sidebar ul ul li,#sidebar ul ol li,.nocomments,.postmetadata,blockquote,strike{color:#777;}code{font:1.1em 'Courier New',Courier,monospace;}acronym,abbr,span.caps{font-size:.9em;letter-spacing:.07em;}a,h2 a:hover,h3 a:hover{color:#06c;text-decoration:none;}a:hover{color:#147;text-decoration:underline;}a.namedurl{padding-right:6px;margin-right:0;background:url("images/http.png") right top no-repeat;}a.namedurl[href*="https"]{padding-right:6px;margin-right:0;background:url("images/https.png") right top no-repeat;}a.named-interwiki{padding-right:6px;margin-right:0;background:url("images/interwiki.png") right top no-repeat;}#xhtml-validator{padding-bottom:0;vertical-align:middle;}#searchholder{float:right;vertical-align:middle;margin-top:10px;margin-right:30px;}#livesearch{width:150px;font-size:.8em;}#bodyContent{float:left;padding:0 0 20px 25px;margin:0;width:550px;overflow:visible;min-height:490px;}.narrowcolumn,.wikiblog{width:550px!important;}#editpage,#edit-content,.wiki-edithelp{padding:0 0 20px 0;width:710px;overflow:visible;}.wiki-edithelp{font-size:.81em;}#wikiblog-form div.wiki-edithelp{width:550px;font-size:8pt;}.widecolumn{padding:10px 0 20px 0;margin:5px auto;width:450px;}.post{margin:0 0 40px;text-align:justify;}.widecolumn .post{margin:0;}.narrowcolumn .postmetadata{padding-top:5px;}.widecolumn .postmetadata{margin:30px 0;}h1{margin:0;}.description{text-align:center;}div.box-title,div.box-title a,div.box-title a:visited,div.box-title a:link{font-weight:bold;text-decoration:none;color:black;}div.box-data,div.box-data a,div.box-data a:visited,div.box-data a:link{font-size:8pt;}#sidebar h2,#sidebar .box-title{margin:5px 0 0 0;padding:0;color:black;text-decoration:none;}h3{padding:0;margin:30px 0 0;}h3.comments{padding:0;margin:40px auto 20px;}img{border:0;}p img{padding:0;max-width:100%;}img.centered{display:block;margin-left:auto;margin-right:auto;}img.alignright{padding:4px;margin:0 0 2px 7px;display:inline;}img.alignleft{padding:4px;margin:0 7px 2px 0;display:inline;}.alignright{float:right;}.alignleft{float:left;}html>body ul{margin-left:0;padding:0 0 0 30px;list-style:none;padding-left:10px;text-indent:-10px;}html>body li{margin:0 0 0 10px;}.narrowcolumn ul li:before,#sidebar ul ul li:before{content:"\00BB \0020";}.entry ol{padding:0 0 0 35px;margin:0;}.entry ol li{margin:0;padding:0;}.postmetadata ul,.postmetadata li{display:inline;list-style-type:none;list-style-image:none;}#sidebar ul,#sidebar ul ol{margin:0;padding:0;}#sidebar ul li{list-style-type:none;list-style-image:none;margin-bottom:15px;}#sidebar ul p,#sidebar ul select{margin:5px 0 8px;}#sidebar ul ul,#sidebar ul ol{margin:5px 0 0 10px;}#sidebar ul ul ul,#sidebar ul ol{margin:0 0 0 10px;}ol li,#sidebar ul ol li{list-style:decimal outside;}#sidebar ul ul li,#sidebar ul ol li{margin:3px 0 0;padding:0;}#searchform{text-align:right;display:inline;}#wikiblog-summary{font-weight:bold;}acronym,abbr,span.caps{cursor:help;}acronym,abbr{border-bottom:1px dashed #999;}blockquote{margin:15px 30px 0 10px;padding-left:20px;border-left:5px solid #ddd;}blockquote cite{margin:5px 0 0;display:block;}.center{text-align:center;}hr{display:none;}.navigation{display:block;text-align:center;margin-top:10px;margin-bottom:60px;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}#difftext{width:710px;margin-top:0;margin-bottom:0;background:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}#VisualWikiPlugin img{width:520px;margin-left:0;padding:0;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}.gensmall{font-size:9px;}.genmed{font-size:11px;}.wikiwyg_toolbar{background:#D3D3D3;border:1px outset;letter-spacing:0;padding:2px;}span.wikiwyg_control_link a{padding-right:8px;}.wikiwyg_button{background:#D3D3D3;border:1px solid #D3D3D3;cursor:pointer;width:20px;height:20px;vertical-align:bottom;}.wikiwyg_button:hover{border:1px outset;}.wikiwyg_button:active{border:1px inset;}.wikiwyg_separator{background:#D3D3D3;border:1px solid #D3D3D3;width:9px;height:20px;vertical-align:bottom;}.wikiwyg_selector{width:70px;}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em;}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/Kubrick.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/Kubrick.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/Kubrick.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,8 +6,6 @@
   This is a work in progress - some of the original CSS may need collapsing
 */
 
-/* @import url("../default/phpwiki.css"); */
-
 body {
   margin: 20px auto;
   padding: 0; 
@@ -534,9 +532,10 @@
   }
 /* End Headers */
 
+/* Begin Images */
 
+img { border: 0; }
 
-/* Begin Images */
 p img {
   padding: 0;
   max-width: 100%;
@@ -574,8 +573,6 @@
   }
 /* End Images */
 
-
-
 /* Begin Lists
 
   Special stylized non-IE bullets
@@ -684,10 +681,6 @@
   display: none;
   }
 
-a img {
-  border: none;
-  }
-
 .navigation {
   display: block;
   text-align: center;
@@ -705,10 +698,6 @@
   margin-top:    1ex;
   margin-bottom: 0.5ex;
   background: white;
-  /* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-  border: 1px #ccc solid;
   color: black;
   border-top: 1px solid #494f5d;
   border-left:  1px solid #494f5d;
@@ -719,33 +708,16 @@
   padding-left:  .125em;
   padding-right: .125em;
   padding: 0;
-  /* "paper" borders */
-  /*border-top: 2px #d2d2d2 solid;
-  border-left:  2px #b2b2b2 solid;
-  border-bottom:  2px #e8e6df solid;
-  border-right: 2px #e8e6df solid;*/
-/*  padding-left:  0em; 
-  padding-bottom: 0ex;*/
-/*  border-style: inset;*/
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
-  /* I'm not sure what the intent of this was, but it's
-   *  not valid CSS: */
-  /* display: editarea; */
   clear: both;
 }
 .diff .block {
   background: #ddd;
   padding-left: 1em;
-  /* for NS4 */
-  /*border: none;*/
 }
 
 /* individual blocks */
 .diff .context {
   background: white;
-  /* for NS4 */
   border: none;
 }
 /* entire difftextblock */
@@ -754,10 +726,6 @@
   margin-top:    0;
   margin-bottom: 0;
   background: white;
-  /* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-  border: 1px black solid;
   /* "paper" borders */
   border-top:  1px #e8e6df solid;
   border-left: 1px #e8e6df solid;
@@ -767,9 +735,6 @@
   padding-right: 0em;
   padding-top:    0ex;
   padding-bottom: 0ex;
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
   clear: both;
 }
 /* + - line prefix */
@@ -777,7 +742,6 @@
   font-weight: normal;
   font-family: monospace;
   color: black;
-  /* for NS4 */
   margin-left: 0;
   border: none;
 }
@@ -795,17 +759,14 @@
 /* blocks containing deleted words */
 .diff .original, .diff .deleted {
   background: #fcc;
-  /* for NS4 */
   border: none;
 }
 /* blocks containing added words */
 .diff .final, .diff .added {
   background: #cfc;
-  /* for NS4 */
   border: none;
 }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 /* deleted words */
 .diff del { background: #f99; }
 /* added words */
@@ -862,7 +823,6 @@
  * TeX2png plugin
  */
 img.tex { 
-  border: 0ex;
   vertical-align: middle; 
 }
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/lib/RecentChanges.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/lib/RecentChanges.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/lib/RecentChanges.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: RecentChanges.php 7638 2010-08-11 11:58:40Z vargenau $');
+<?php // $Id: RecentChanges.php 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * Extensions/modifications to the stock RecentChanges (and PageHistory) format.
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <table summary="Toolbar: Mani Navigation"
        width="100%" cellpadding="0" cellspacing="0" border="0">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/blogform.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/blogform.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/blogform.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id: blogform.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: blogform.tmpl 7850 2011-01-21 09:41:05Z vargenau $
 ?>
 <div class="wikiblog wikiblog-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
@@ -7,7 +7,7 @@
   <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
   <input type="hidden" name="mode" value="add" />
   <div class="wikiblog-form">
-     <?php echo _("Headline").': ' ?><br />
+     <?php echo _("Headline")._(": ") ?><br />
      <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
                    maxlength="256" name="edit[summary]" value="" />
      <?php echo $EDIT_TOOLBAR ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: body.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <body <?php echo $WikiTheme->getMoreAttr('body') ?>>
 <!--{{{ Page-->

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/bottom.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/bottom.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/bottom.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: bottom.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: bottom.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!--span id="bottom" style="margin-left: 25px"-->
 <!-- Add your Disclaimer here -->

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/browse-footer.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/browse-footer.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/browse-footer.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse-footer.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse-footer.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!--{{{ Edit Date-->
 <p class="editdate">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/browse.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/browse.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/browse.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <?php if ($revision and !$revision->isCurrent()) { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/debug.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/debug.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/debug.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: debug.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: debug.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php global $RUNTIMER; ?>
 <p align="center" id="xhtml-validator"><a href="http://validator.w3.org/check/referer">Valid XHTML 1.0</a>  <a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS!</a>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/info.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/info.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/info.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: info.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: info.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php echo Template("default/info") ?>
 <div class="actionbuttons">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- Additional sidebar navigation -->
 <div class="box">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/sidebar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/sidebar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/sidebar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: sidebar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: sidebar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 $id = isBrowserIE() ? 'sidebar' : 'moz-sidebar';
 ?>
 <div id="<?php echo $id?>">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/top.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/top.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/top.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: top.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: top.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <div id="header">
 <?php if ( $request->getArg('action') == 'browse' ) { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/viewsource.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/viewsource.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/viewsource.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: viewsource.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php 
 if (empty($revision)) $revision = $page->getCurrentRevision(false);

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/wikiblog.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/wikiblog.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/templates/wikiblog.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id: wikiblog.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: wikiblog.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
 
 $buttons = $modified = '';

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/blog/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/blog/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/blog/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7690 2010-09-17 08:46:20Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /**
  * This file defines a blog theme for PhpWiki,
@@ -52,7 +52,7 @@
         $this->calendarInit(true);
     }
 
-    /* overload to load from Sidebar */  
+    /* overload to load from Sidebar */
     function _findFile ($file, $missing_okay=false) {
         if (file_exists($this->_path . "themes/".$this->_name."/$file"))
             return "themes/".$this->_name."/$file";
@@ -83,7 +83,7 @@
             return '_blog_RecentChanges_BoxFormatter';
         return '_blog_RecentChanges_Formatter';
     }
-  
+
     /* TODO: use the blog summary as label instead of the pagename */
     function linkExistingWikiWord($wikiword, $linktext = '', $version = false) {
         global $request;
@@ -103,7 +103,7 @@
              $default_text = $wikiword->shortName;
          else
              $default_text = $wikiword;
-       
+
         if (!empty($linktext)) {
             $link->pushContent($linktext);
             $link->setAttr('class', 'named-wiki');
@@ -118,44 +118,44 @@
     }
 
     function load() {
-	// CSS file defines fonts, colors and background images for this
-	// style.
+    // CSS file defines fonts, colors and background images for this
+    // style.
 
-	// override sidebar definitions:
-	$this->setDefaultCSS(_("blog"), 'Kubrick.css');
-	if (isBrowserIE()) {
-	    $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IEFixes.css'),'all'));
-	}
-	$this->addButtonAlias(_("(diff)"), "[diff]" );
-	$this->addButtonAlias("...", "alltime");
+    // override sidebar definitions:
+    $this->setDefaultCSS(_("blog"), 'Kubrick.css');
+    if (isBrowserIE()) {
+        $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IEFixes.css'),'all'));
+    }
+    $this->addButtonAlias(_("(diff)"), "[diff]" );
+    $this->addButtonAlias("...", "alltime");
 
-	$this->setButtonSeparator("");
+    $this->setButtonSeparator("");
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	$this->setAutosplitWikiWords(false);
+    /**
+     * WikiWords can automatically be split by inserting spaces between
+     * the words. The default is to leave WordsSmashedTogetherLikeSo.
+     */
+    $this->setAutosplitWikiWords(false);
 
-	/**
-	 * If true (default) show create '?' buttons on not existing pages, even if the
-	 * user is not signed in.
-	 * If false, anon users get no links and it looks cleaner, but then they
-	 * cannot easily fix missing pages.
-	 */
-	$this->setAnonEditUnknownLinks(false);
+    /**
+     * If true (default) show create '?' buttons on not existing pages, even if the
+     * user is not signed in.
+     * If false, anon users get no links and it looks cleaner, but then they
+     * cannot easily fix missing pages.
+     */
+    $this->setAnonEditUnknownLinks(false);
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	//$this->setDateFormat("%B %d, %Y");
-	$this->setDateFormat("%A, %B %e, %Y"); // must not contain time
-	$this->setTimeFormat("%H:%M:%S");
+    /*
+     * You may adjust the formats used for formatting dates and times
+     * below.  (These examples give the default formats.)
+     * Formats are given as format strings to PHP strftime() function See
+     * http://www.php.net/manual/en/function.strftime.php for details.
+     * Do not include the server's zone (%Z), times are converted to the
+     * user's time zone.
+     */
+    //$this->setDateFormat("%B %d, %Y");
+    $this->setDateFormat("%A, %B %e, %Y"); // must not contain time
+    $this->setTimeFormat("%H:%M:%S");
     }
 }
 
@@ -168,5 +168,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/highlight.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/highlight.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/highlight.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,22 +1,22 @@
 /**
- *  $Id: highlight.css 6480 2009-02-02 14:13:24Z vargenau $
+ *  $Id: highlight.css 7965 2011-03-07 09:47:31Z vargenau $
  */
 
 /* 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 */
+   /* 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, monospace;}
  .key    { color:#000000; font-weight:bold; }

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-img{border:0;}form{margin:0;}table{border-spacing:1px;empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}body{background:#fffff0;font-family:Arial,Helvetica,sans-serif;font-size:85%;margin:1.5ex 1em;}div.wikitext hr{height:1px;}div.wikitext pre{font-family:monospace;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;background-color:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:.8em;padding-right:.8em;padding-top:.5ex;padding-bottom:.5ex;clear:both;}div#browse{margin-top:1px;margin-bottom:.5px;}input#inp-openid{background:url('images/openid.png') bottom left no-repeat;background-repeat:no-repeat;padding-left:18px!important;}.pageinfo-majoredit{font-weight:bold;}.wiki-summary{font-size:94%;font-style:italic;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}div.wikiaction{background-color:#eee;}form.wikiadmin div{background-color:#fee;}form.wikiformrich{background-color:#eee;}.wiki,.named-wiki{text-decoration:none;font-weight:bold;}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold;}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Arial,Helvetica,sans-serif;white-space:nowrap;}a.wikiaction,a.wikiaction:visited,input.wikiaction,input.button{background-color:#ddd;}.wikiunsafe{background-color:#fcc;}a.wikiadmin,a.wikiadmin:visited,input.wikiadmin{background-color:#fdd;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;color:#006;}h1 .backlinks{text-decoration:underline;}.wikipage{font-weight:normal;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}a.wikibutton,a.wikibutton:visited,input.wikibutton{background-color:white;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{margin:0;font-size:140%;}table,td{font-family:Arial,Helvetica,sans-serif;}caption{font-family:Arial,Helvetica,sans-serif;}.pagelist{font-size:smaller;}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.toolbar,input.button,#signin{font-family:Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}#navbuttons{padding-right:4em;padding-bottom:1ex;}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex;}#logo img{float:right;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}#searchholder{display:inline;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.printer,.no-css{display:none;}div.errors{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}h4.errors{color:red;margin:0;padding:0;text-decoration:underline;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.error{font-family:monospace;font-size:120%;}.error ul{font-family:monospace;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid silver;}.box-title{font-family:Tahoma,Arial,Helvetica,sans-serif;font-weight:normal;background-color:#ccc;color:black;text-align:center;border:none;padding:2px 0 2px 0;}.box-data{width:160px;font-size:9pt;font-weight:normal;border:none;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}.wikiwyg_toolbar{background:#D3D3D3;border:1px outset;letter-spacing:0;padding:2px;}span.wikiwyg_control_link a{padding-right:8px;}.wikiwyg_button{background:#D3D3D3;border:1px solid #D3D3D3;cursor:pointer;width:20px;height:20px;vertical-align:bottom;}.wikiwyg_button:hover{border:1px outset;}.wikiwyg_button:active{border:1px inset;}.wikiwyg_separator{background:#D3D3D3;border:1px solid #D3D3D3;width:9px;height:20px;vertical-align:bottom;}.wikiwyg_selector{width:70px;}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em;}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top;}div.br{display:none;}.toolbar,div.toolbar{margin:.5ex 0;}div.wikitext{width:auto;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}a.wikiaction,a.wikiadmin,a.wikiunsafe,input.wikiaction,input.wikiadmin,input.wikiunsafe,input.button{color:black;border:1px outset;padding:.05ex .25em .1ex .25em;height:auto;width:auto;line-height:2.6ex;}div#navbuttons,div#signin,div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}div#actionbuttons a#btn-edit{background:url('images/UEB16.png') bottom left no-repeat;background-repeat:no-repeat;padding-left:20px!important;padding-right:.5em!important;}a.wikibutton,a.wikibutton:visited,input.wikibutton{background-color:white;border:0;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}div.errors{font-size:smaller;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500;}
\ No newline at end of file
+img{border:0;}form{margin:0;}table{border-spacing:1px;empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}body{background:#fffff0;font-family:Arial,Helvetica,sans-serif;font-size:85%;margin:1.5ex 1em;}div.wikitext hr{height:1px;}div.wikitext pre{font-family:monospace;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;background-color:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:.8em;padding-right:.8em;padding-top:.5ex;padding-bottom:.5ex;clear:both;}div#browse{margin-top:1px;margin-bottom:.5px;}input#inp-openid{background:url('images/openid.png') bottom left no-repeat;background-repeat:no-repeat;padding-left:18px!important;}.pageinfo-majoredit{font-weight:bold;}.wiki-summary{font-size:94%;font-style:italic;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}div.wikiaction{background-color:#eee;}form.wikiadmin div{background-color:#fee;}form.wikiformrich{background-color:#eee;}.wiki,.named-wiki{text-decoration:none;font-weight:bold;}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold;}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Arial,Helvetica,sans-serif;white-space:nowrap;}a.wikiaction,a.wikiaction:visited,input.wikiaction,input.button{background-color:#ddd;}.wikiunsafe{background-color:#fcc;}a.wikiadmin,a.wikiadmin:visited,input.wikiadmin{background-color:#fdd;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;color:#006;}h1 .backlinks{text-decoration:underline;}.wikipage{font-weight:normal;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}a.wikibutton,a.wikibutton:visited,input.wikibutton{background-color:white;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{margin:0;font-size:140%;}table,td{font-family:Arial,Helvetica,sans-serif;}caption{font-family:Arial,Helvetica,sans-serif;}.pagelist{font-size:smaller;}.pagelist thead td{background:#e8e8e8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.toolbar,input.button,#signin{font-family:Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}#navbuttons{padding-right:4em;padding-bottom:1ex;}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex;}#logo img{float:right;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}#searchholder{display:inline;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.printer,.no-css{display:none;}.error{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{border-left:medium #284 solid;padding-left:1em;margin-left:0;margin-right:0;}.mail-style-quote blockquote.mail-style-quote{margin-left:-0.6em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid silver;}.box-title{font-family:Tahoma,Arial,Helvetica,sans-serif;font-weight:normal;background-color:#ccc;color:black;text-align:center;border:none;padding:2px 0 2px 0;}.box-data{width:160px;font-size:9pt;font-weight:normal;border:none;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa;}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em;}div.itemdesc{padding-left:1em;}div.rssitem{border-top:thin dashed #aaa;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}.wikiwyg_toolbar{background:#D3D3D3;border:1px outset;letter-spacing:0;padding:2px;}span.wikiwyg_control_link a{padding-right:8px;}.wikiwyg_button{background:#D3D3D3;border:1px solid #D3D3D3;cursor:pointer;width:20px;height:20px;vertical-align:bottom;}.wikiwyg_button:hover{border:1px outset;}.wikiwyg_button:active{border:1px inset;}.wikiwyg_separator{background:#D3D3D3;border:1px solid #D3D3D3;width:9px;height:20px;vertical-align:bottom;}.wikiwyg_selector{width:70px;}.wikiwyg_wysiwyg table{border-collapse:collapse;margin-bottom:.2em;}.wikiwyg_wysiwyg table td{border:1px;border-style:solid;padding:.2em;vertical-align:top;}.toolbar,div.toolbar{margin:.5ex 0;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}a.wikiaction,a.wikiadmin,a.wikiunsafe,input.wikiaction,input.wikiadmin,input.wikiunsafe,input.button{color:black;border:1px outset;padding:.05ex .25em .1ex .25em;height:auto;width:auto;line-height:2.6ex;}div#navbuttons,div#signin,div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}div#actionbuttons a#btn-edit{background:url('images/UEB16.png') bottom left no-repeat;background-repeat:no-repeat;padding-left:20px!important;padding-right:.5em!important;}a.wikibutton,a.wikibutton:visited,input.wikibutton{background-color:white;border:0;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-modern-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-modern-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-modern-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-img{border:0;vertical-align:baseline;}form{margin:0;}input{margin:.1em;}input.numeric{text-align:right;}table{border-spacing:1px;empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}body{background:#eee;font-family:Arial,Helvetica,sans-serif;margin:1ex 1em;}hr{height:1px;}div.wikitext{background:white;border-bottom:.5pt #888 solid;padding-top:.75ex;padding-bottom:.75ex;padding-left:.8em;padding-right:.8em;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0;clear:both;}#logo img{position:relative;right:.25em;top:4.5ex;}.wiki{text-decoration:none;font-weight:bold;color:#004662;}.wiki:hover,.backlinks:hover{color:#5454ff;}.wikiaction,.wikiadmin,.wiki-rc-action,.backlinks{color:#69798f;text-decoration:none;font-weight:bold;}.wikiaction:hover{color:#5454ff;}.backlinks{color:#006;}.wikiunknown a,.named-wikiunknown a,.wikiunknown u{text-decoration:none;color:#600;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{color:white;background-color:black;padding-top:1.1ex;padding-left:.3em;padding-bottom:.2ex;padding-right:.6em;margin:0;}h1 .backlinks{color:white;text-decoration:none;}h1 .wiki{color:gray;text-decoration:none;}h2{color:white;background-color:#525D76;}h3{color:white;background-color:#828da6;margin-left:1em;}h4{color:white;background-color:#828da6;margin-left:1.5em;}h2,h3,h4,h5,h6{margin-top:2ex;padding-top:.15ex;padding-bottom:.1ex;padding-left:.6em;padding-right:.6em;}caption{font-family:Arial,Helvetica,sans-serif;}.pagelist{background:#bebebe;border:.5pt solid #bebebe;}.pagelist thead,.pagelist thead u{background:#bebebe;color:white;font-weight:bold;text-decoration:none;}.pagelist tr.evenrow{background:#e6e6e6;}.pagelist tr.oddrow{background:#f4f4f4;}.toolbar,td,input.button{font-family:Arial,Helvetica,sans-serif;}#navbuttons,#actionbar{color:black;background:#ddd;margin-top:.1ex;margin-bottom:1ex;margin-left:0;margin-right:0;}#actionbar table,#navbuttons{border-top:.5pt solid black;border-bottom:.5pt solid black;padding-top:.3ex;padding-bottom:.4ex;padding-left:.5em;padding-right:.5em;}.editdate{background:white;font-family:Arial,Helvetica,sans-serif;margin:0;padding-top:.4ex;padding-bottom:.3ex;padding-left:.5em;padding-right:.5em;}hr.ignore,hr.toolbar{height:0;position:absolute;top:-80px;}textarea.wikiedit{width:100%;border:1px inset #838383;margin-top:1ex;margin-bottom:1ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}.transclusion-title{text-align:right;margin-right:.25em;margin-bottom:.15ex;font-style:oblique;font-size:smaller;text-decoration:underline;}.transclusion,.wiki-edithelp{background:white;font-size:smaller;padding-left:.5em;padding-right:.5em;}.transclusion{border-top:solid 1px #ddd;border-left:solid 1px #c3c3c3;border-bottom:solid 1px #7d7d7d;border-right:solid 1px #b5b5b5;}.wiki-edithelp{border-top:solid 1px #ddd;border-left:solid 1px #c5c5c5;border-bottom:solid 1px #bdbdbd;border-right:solid 1px #b5b5b5;}.wiki-edithelp .wiki{color:#5454ff;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;background:#eef;border-top:solid 1px #aaa;border-left:solid 1px #c3c3c3;border-bottom:solid 1px #ddd;border-right:solid 1px #c5c5c5;padding-left:.5em;padding-right:.5em;padding-top:.25ex;padding-bottom:.25ex;margin-top:1ex;margin-bottom:1ex;}table.cal{border:thin outset gray;background:#ddd;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;background:black;color:white;}.cal-arrow{color:gray;font-weight:bold;text-decoration:none;}table.cal tbody tr .cal-dayname{background:#eee;border-top:1px solid gray;border-bottom:1px solid gray;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{background:inherit;border:2px solid gray;}table.cal td.cal-today a.cal-hide{color:black;}.diff .block{background:#ccc;border-top:1px solid black;border-bottom:1px solid black;padding:.5ex .5em;margin:.5ex 0;}.diff .context{background:white;}.diff .block tt{font-weight:normal;font-family:monospace;margin-left:-.6em;color:#ff0;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted{background:#fcc;}.diff .final,.diff .added{background:#cfc;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.printer{display:none;}div.errors{color:black;background:white;margin-top:2em;margin-bottom:2em;padding:1ex;font-size:smaller;border:thin dashed red;}.errors h4{color:red;background:inherit;margin:0;padding:0;text-decoration:underline;}.error{font-family:monospace;}.error ul{font-family:monospace;}.debug{color:black;background:white;font-family:monospace;margin:1ex 0;padding:.5ex .5em;}div.br{display:none;}div.wikitext{width:auto;}img.linkicon{vertical-align:middle;}img.rssicon{vertical-align:baseline;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:.5em;top:0;}
\ No newline at end of file
+img{border:0;vertical-align:baseline;}form{margin:0;}input{margin:.1em;}input.numeric{text-align:right;}table{border-spacing:1px;empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}body{background:#eee;font-family:Arial,Helvetica,sans-serif;margin:1ex 1em;}hr{height:1px;}div.wikitext{background:white;border-bottom:.5pt #888 solid;padding-top:.75ex;padding-bottom:.75ex;padding-left:.8em;padding-right:.8em;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0;clear:both;}#logo img{position:relative;right:.25em;top:4.5ex;}.wiki{text-decoration:none;font-weight:bold;color:#004662;}.wiki:hover,.backlinks:hover{color:#5454ff;}.wikiaction,.wikiadmin,.wiki-rc-action,.backlinks{color:#69798f;text-decoration:none;font-weight:bold;}.wikiaction:hover{color:#5454ff;}.backlinks{color:#006;}.wikiunknown a,.named-wikiunknown a,.wikiunknown u{text-decoration:none;color:#600;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{color:white;background-color:black;padding-top:1.1ex;padding-left:.3em;padding-bottom:.2ex;padding-right:.6em;margin:0;}h1 .backlinks{color:white;text-decoration:none;}h1 .wiki{color:gray;text-decoration:none;}h2{color:white;background-color:#525D76;}h3{color:white;background-color:#828da6;margin-left:1em;}h4{color:white;background-color:#828da6;margin-left:1.5em;}h2,h3,h4,h5,h6{margin-top:2ex;padding-top:.15ex;padding-bottom:.1ex;padding-left:.6em;padding-right:.6em;}caption{font-family:Arial,Helvetica,sans-serif;}.pagelist{background:#bebebe;border:.5pt solid #bebebe;}.pagelist thead,.pagelist thead u{background:#bebebe;color:white;font-weight:bold;text-decoration:none;}.pagelist tr.evenrow{background:#e6e6e6;}.pagelist tr.oddrow{background:#f4f4f4;}.toolbar,td,input.button{font-family:Arial,Helvetica,sans-serif;}#navbuttons,#actionbar{color:black;background:#ddd;margin-top:.1ex;margin-bottom:1ex;margin-left:0;margin-right:0;}#actionbar table,#navbuttons{border-top:.5pt solid black;border-bottom:.5pt solid black;padding-top:.3ex;padding-bottom:.4ex;padding-left:.5em;padding-right:.5em;}.editdate{background:white;font-family:Arial,Helvetica,sans-serif;margin:0;padding-top:.4ex;padding-bottom:.3ex;padding-left:.5em;padding-right:.5em;}hr.ignore,hr.toolbar{height:0;position:absolute;top:-80px;}textarea.wikiedit{width:100%;border:1px inset #838383;margin-top:1ex;margin-bottom:1ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}.transclusion-title{text-align:right;margin-right:.25em;margin-bottom:.15ex;font-style:oblique;font-size:smaller;text-decoration:underline;}.transclusion,.wiki-edithelp{background:white;font-size:smaller;padding-left:.5em;padding-right:.5em;}.transclusion{border-top:solid 1px #ddd;border-left:solid 1px #c3c3c3;border-bottom:solid 1px #7d7d7d;border-right:solid 1px #b5b5b5;}.wiki-edithelp{border-top:solid 1px #ddd;border-left:solid 1px #c5c5c5;border-bottom:solid 1px #bdbdbd;border-right:solid 1px #b5b5b5;}.wiki-edithelp .wiki{color:#5454ff;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;background:#eef;border-top:solid 1px #aaa;border-left:solid 1px #c3c3c3;border-bottom:solid 1px #ddd;border-right:solid 1px #c5c5c5;padding-left:.5em;padding-right:.5em;padding-top:.25ex;padding-bottom:.25ex;margin-top:1ex;margin-bottom:1ex;}table.cal{border:thin outset gray;background:#ddd;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;background:black;color:white;}.cal-arrow{color:gray;font-weight:bold;text-decoration:none;}table.cal tbody tr .cal-dayname{background:#eee;border-top:1px solid gray;border-bottom:1px solid gray;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{background:inherit;border:2px solid gray;}table.cal td.cal-today a.cal-hide{color:black;}.diff .block{background:#ccc;border-top:1px solid black;border-bottom:1px solid black;padding:.5ex .5em;margin:.5ex 0;}.diff .context{background:white;}.diff .block tt{font-weight:normal;font-family:monospace;margin-left:-.6em;color:#ff0;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted{background:#fcc;}.diff .final,.diff .added{background:#cfc;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.printer{display:none;}.error{color:black;background:white;margin-top:2em;margin-bottom:2em;padding:1ex;font-size:smaller;border:thin dashed red;}.debug{color:black;background:white;font-family:monospace;margin:1ex 0;padding:.5ex .5em;}img.linkicon{vertical-align:middle;}img.rssicon{vertical-align:baseline;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:.5em;top:0;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-modern.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-modern.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-modern.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: phpwiki-modern.css 6474 2009-01-31 14:44:58Z vargenau $
+ * $Id: phpwiki-modern.css 7965 2011-03-07 09:47:31Z vargenau $
  *
  * Inspiration for this stylesheet:
  *
@@ -14,10 +14,9 @@
  * used to reference the various CalendarPlugin elements.
  */
 
-
 /**
  * General
- */ 
+ */
 img {
   border: 0;
   vertical-align: baseline;
@@ -35,8 +34,7 @@
   caption-side: top;
   text-align: left;
   margin-bottom: .5ex;
-  /* Allow the caption to extend to the full page width
-     Mac ie5.1 ignores this*/
+  /* Allow the caption to extend to the full page width */
   width: 100%;
 }
 
@@ -58,20 +56,15 @@
 div.wikitext {
   background: white;
   border-bottom: 0.5pt #888 solid;
-  padding-top:    0.75ex; 
-  padding-bottom: 0.75ex; 
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
+  padding-top:    0.75ex;
+  padding-bottom: 0.75ex;
+  padding-left:  0.8em;
+  padding-right: 0.8em;
   margin-top:    0ex;
   margin-bottom: 0;
   margin-left:  0em;
   margin-right: 0em;
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
   clear: both;
-  /* user's browser settings *
-  font-family: none; */
 }
 
 #logo img {
@@ -95,7 +88,7 @@
 /**
  * wikiaction, wikiadmin, wikiunsafe:
  */
-.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks { 
+.wikiaction, .wikiadmin, .wiki-rc-action, .backlinks {
   color: #69798f;  /* pale cyan */
   text-decoration: none;
   font-weight: bold;
@@ -196,12 +189,7 @@
 }
 .pagelist tr.evenrow { background: #e6e6e6; }
 .pagelist tr.oddrow  { background: #f4f4f4; }
-/*.pagelist td {
-  border-left: 1px solid #bebebe;
-  border-right: 1px solid #bebebe;
-}*/
 
-
 /**
  * Toolbar
  */
@@ -231,9 +219,8 @@
   margin: 0;
   padding-top:    0.4ex;
   padding-bottom: 0.3ex;
-  padding-left:  0.5em; 
-  padding-right: 0.5em; 
-  /* border-top: 0.5pt solid #666; * medium gray */
+  padding-left:  0.5em;
+  padding-right: 0.5em;
 }
 
 hr.ignore, hr.toolbar {
@@ -264,7 +251,8 @@
   font-size: smaller;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   text-align: right;
   margin-right:  0.25em;
@@ -272,7 +260,7 @@
   font-style: oblique;
   font-size:  smaller;
   text-decoration: underline;
-} 
+}
 .transclusion, .wiki-edithelp {
   background:    white;
   font-size:   smaller;
@@ -319,13 +307,13 @@
   padding: 1px;
   /* For Mozilla */
   empty-cells: hide;
-} 
+}
 
 /* cells */
 table.cal td {
   background: white;
   text-align: right;
-} 
+}
 
 /* Month-name header */
 table.cal-header { /* the html for this should really be in the thead */
@@ -386,7 +374,7 @@
 .diff .context { background: white; }
 
 /* + - line prefix */
-.diff .block tt	{
+.diff .block tt    {
   font-weight: normal;
   font-family: monospace;
   margin-left: -.6em;
@@ -400,7 +388,6 @@
 .diff .original, .diff .deleted { background: #fcc; }
 .diff .final, .diff .added { background: #cfc; }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 .diff del { background: #f99; }
 .diff ins { background: #9f9; }
 
@@ -420,8 +407,7 @@
  */
 .printer { display: none; }
 
-/* PHP Warnings */
-div.errors {
+.error {
   color: black;
   background: white;
   margin-top:    2em;
@@ -430,15 +416,6 @@
   font-size: smaller;
   border: thin dashed red;
 }
-.errors h4 {
-  color: red;
-  background: inherit;
-  margin:  0;
-  padding: 0;
-  text-decoration: underline;
-}
-.error { font-family: monospace; }
-.error ul { font-family: monospace; }
 
 /* Debug */
 .debug {
@@ -449,12 +426,6 @@
   padding: 0.5ex 0.5em;
 }
 
-/* Hide the elements we put in just to get around NS4 bugs. */
-div.br { display: none; }
-
-/* This break NS4, but is necessary for IE4. */
-div.wikitext { width: auto; }
-
 /* Link icons */
 img.linkicon { vertical-align: middle; }
 img.rssicon  { vertical-align: baseline; }
@@ -464,7 +435,7 @@
  ** Diff Output
  **
  *****************************************************************/
-.diff .block div { position: relative; padding-left: 1.5em; } 
+.diff .block div { position: relative; padding-left: 1.5em; }
 .diff .prefix    { position: absolute; left: 0.5em; top: 0; }
 
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-printer-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-printer-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-printer-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-html{background:white;}body{margin:1em;padding:0;color:black;background:white;}div.wikitext{border:0;padding:0;margin:0;margin-top:1ex;background:white;}img{border:0;vertical-align:baseline;}form{margin:0;}input{margin:.1em;}input.numeric{text-align:right;}table{border-spacing:1px;empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}a{color:black;text-decoration:none;}.wiki{text-decoration:underline;font-weight:bold;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.wikipage{text-decoration:underline;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}.rawurl{text-decoration:underline;}.wikiblog-form{display:none;}#header,#logo,#footer{background:white;}table+br.clear-floats{display:none;}#navbuttons,#actionbuttons,#signin{display:none;}p.editdate{font-size:smaller;margin-top:0;background:white;}hr.toolbar{display:none;}hr.printer{display:block;background:white;}.wiki-rc-action{display:none;}img{vertical-align:baseline;border:0 none white;}.linkicon{display:none;}.rssicon{display:none;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{display:none;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{background:inherit;border:1pt solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{border:1pt solid black;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:thin outset gray;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;background:inherit;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{background:inherit;margin:1px;border:1px solid black;}#xhtml-validator{display:none;}div.errors{margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;font-size:smaller;border:.5pt solid black;clear:both;}.errors h4{margin:0;padding:0;text-decoration:underline;}.error{font-family:monospace;}.error ul{font-family:monospace;}.debug{display:none;}
\ No newline at end of file
+html{background:white;}body{margin:1em;padding:0;color:black;background:white;}div.wikitext{border:0;padding:0;margin:0;margin-top:1ex;background:white;}img{border:0;vertical-align:baseline;}form{margin:0;}input{margin:.1em;}input.numeric{text-align:right;}table{border-spacing:1px;empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;width:100%;}a{color:black;text-decoration:none;}.wiki{text-decoration:underline;font-weight:bold;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.wikipage{text-decoration:underline;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}.rawurl{text-decoration:underline;}.wikiblog-form{display:none;}#header,#logo,#footer{background:white;}table+br.clear-floats{display:none;}#navbuttons,#actionbuttons,#signin{display:none;}p.editdate{font-size:smaller;margin-top:0;background:white;}hr.toolbar{display:none;}hr.printer{display:block;background:white;}.wiki-rc-action{display:none;}img{vertical-align:baseline;border:0 none white;}.linkicon{display:none;}.rssicon{display:none;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{display:none;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{background:inherit;border:1pt solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{border:1pt solid black;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:thin outset gray;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;background:inherit;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{background:inherit;margin:1px;border:1px solid black;}#xhtml-validator{display:none;}.error{margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;font-size:smaller;border:.5pt solid black;clear:both;}.debug{display:none;}.portlet{display:none;}#img-logo-right,#rateit-widget-top,#footer{display:none;}#content{margin:0;padding:0;border:0;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-printer.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-printer.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-printer.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: phpwiki-printer.css 7002 2009-07-06 19:52:11Z vargenau $
+ * $Id: phpwiki-printer.css 7913 2011-01-26 17:48:29Z vargenau $
  *
  * PhpWiki style sheet for the printed page:
  * Black on white only, with no toolbar commands and no link icons.
@@ -159,7 +159,8 @@
   display: none;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   text-align: right;
   font-style: oblique;
@@ -253,8 +254,7 @@
   display: none;
 }
 
-/* PHP Warnings */
-div.errors {
+.error {
   margin-top:    1em;
   margin-bottom: 1em;
   padding-left:  0.8em; 
@@ -264,26 +264,27 @@
   font-size: smaller;
   border: 0.5pt solid black;
   clear: both;
-/*
-  display: none;
-*/
 }
-.errors h4 {
-  margin:  0;
-  padding: 0;
-  text-decoration: underline;
-}
-.error { font-family: monospace; }
-.error ul { font-family: monospace; }
 
 /* Debug */
 .debug {
-  /* font-family: monospace;
-  margin: 1ex 0;*/
   display: none;
 }
 
+.portlet {
+  display: none;
+}
 
+#img-logo-right, #rateit-widget-top, #footer {
+  display: none;
+}
+
+#content {
+    margin: 0;
+    padding: 0;
+    border: 0;
+}
+
 /* For emacs users
  *
  * Local Variables:

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-topbottombars-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-topbottombars-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-topbottombars-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
- at import url("phpwiki.css");body{padding-top:9ex;padding-bottom:9ex;}div#header,div#footer{background:#FFFFF0;margin:0;padding:0;position:fixed;left:0;right:0;padding-top:1ex;padding-bottom:1ex;padding-left:1em;padding-right:1em;}hr.toolbar{display:none;}div#header{top:0;padding-top:1.5ex;border-bottom:1px solid #b2b2b2;}div#navbuttons{padding-bottom:1ex;}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0;}div#actionbuttons{padding-bottom:1ex;}p.editdate{margin-bottom:.5ex;}
\ No newline at end of file
+ at import url("phpwiki.css");body{padding-top:9ex;padding-bottom:9ex;}div#header,div#footer{background:#FFFFF0;margin:0;padding:0;position:fixed;left:0;right:0;padding-top:1ex;padding-bottom:1ex;padding-left:1em;padding-right:1em;}hr.toolbar{display:none;}div#header{top:0;padding-top:1.5ex;border-bottom:1px solid #b2b2b2;}div#navbuttons{padding-bottom:1ex;}div#footer{border-top:1px solid #b2b2b2;bottom:-1ex;padding-bottom:0;}p.editdate{margin-bottom:.5ex;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-topbottombars.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-topbottombars.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki-topbottombars.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: phpwiki-topbottombars.css 6480 2009-02-02 14:13:24Z vargenau $
+ * $Id: phpwiki-topbottombars.css 7833 2011-01-13 15:06:45Z vargenau $
  *
  */
 @import url("phpwiki.css");
@@ -48,7 +48,6 @@
   padding-bottom: 1ex;
 }
 
-
 /**
  * Actionbar
  */
@@ -58,13 +57,8 @@
     bottom: -1ex;
     padding-bottom: 0ex;
 }
-div#actionbuttons {
-  /* For IE5.1Mac, workaround the Mozilla kludge */
-  padding-bottom: 1ex;
-}
 p.editdate { margin-bottom: 0.5ex; }
 
-
 /* For emacs users
  *
  * Local Variables:

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/phpwiki.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: phpwiki.css 7331 2010-04-15 09:04:51Z vargenau $
+ * $Id: phpwiki.css 7965 2011-03-07 09:47:31Z vargenau $
  *
  * This incarnation of this stylesheet is a complete rewrite from the
  * ground up.
@@ -11,8 +11,8 @@
 
 /**
  * General
- */ 
-img { border: 0ex; }
+ */
+img { border: 0; }
 
 form { margin: 0ex; }
 
@@ -56,22 +56,14 @@
   margin-top:    1ex;
   margin-bottom: 0.5ex;
   background-color: white;
-  /* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-  border: 1px black solid;
-  /* "paper" borders */
   border-top:  1px #e8e6df solid;
   border-left: 1px #e8e6df solid;
   border-bottom: 1px #d2d2d2 solid;
   border-right:  1px #b2b2b2 solid;
-  padding-left:  0.8em; 
+  padding-left:  0.8em;
   padding-right: 0.8em;
   padding-top:    0.5ex;
   padding-bottom: 0.5ex;
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
   clear: both;
 }
 /* for the login template */
@@ -86,17 +78,15 @@
   padding-left: 18px !important;
 }
 
-/* .interwiki-map thead td { text-decoration: underline; } */
-
 /*
 ** RecentChanges
 */
-.pageinfo-majoredit { 
-	font-weight: bold;
+.pageinfo-majoredit {
+    font-weight: bold;
 }
 .wiki-summary {
-  	font-size: 94%;
-  	font-style: italic;
+      font-size: 94%;
+      font-style: italic;
 }
 
 /* Mozilla RecentChanges Sidebar */
@@ -113,7 +103,7 @@
 
 /**
  * Wiki Forms
- * 
+ *
  * The div inside the wikiadmin upload form does not
  * have a class yet, so it must be referenced indirectly
  */
@@ -152,14 +142,14 @@
     /* font-size: inherit; */
 }
 
-a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button { 
-    background-color: #ddd; 
+a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button {
+    background-color: #ddd;
 }
 
 .wikiunsafe { background-color: #fcc; }
 
-a.wikiadmin, a.wikiadmin:visited, input.wikiadmin  { 
-    background-color: #fdd; 
+a.wikiadmin, a.wikiadmin:visited, input.wikiadmin  {
+    background-color: #fdd;
 }
 
 /* Unknown links */
@@ -192,8 +182,8 @@
 .interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; }
 
 /* image buttons */
-a.wikibutton, a.wikibutton:visited, input.wikibutton  { 
-    background-color: white; 
+a.wikibutton, a.wikibutton:visited, input.wikibutton  {
+    background-color: white;
 }
 
 /**
@@ -209,7 +199,7 @@
  */
 table, td { font-family: Arial, Helvetica, sans-serif; }
 caption { font-family: Arial, Helvetica, sans-serif; }
-.pagelist { 
+.pagelist {
   font-size: smaller;
 }
 .pagelist thead td {
@@ -243,7 +233,6 @@
   color: black;
 }
 
-
 /**
  * Toolbar
  */
@@ -272,17 +261,9 @@
   padding: 0;
   padding-top: 0.25ex;
 }
-/*
-div#logo {
-  float: right;
-}
-*/
+
 #logo img {
   float: right;
-  /* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-  border: 1px black solid;
   /* "paper" borders */
   border-top:  1px #e8e6df solid;
   border-left: 1px #e8e6df solid;
@@ -333,7 +314,7 @@
   display: none;
   z-index: 100;
   background-color: white;
-  border: 1px solid #d0d0d0; 
+  border: 1px solid #d0d0d0;
   font-size: 9px;
   overflow: hidden;
 }
@@ -342,9 +323,9 @@
 }
 #LSResult .evenrow {
   background-color: #f0f0f0;
-} 
+}
 #LSREsult .oddrow {
-} 
+}
 .LSEnd {
   text-align: right;
 }
@@ -353,7 +334,7 @@
 }
 .LSRow {
   padding: 1px;
-} 
+}
 ul.LSRes {
   margin: 0px;
   padding: 0px;
@@ -363,7 +344,8 @@
   list-style-image: none;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   text-align: right;
   font-style: oblique;
@@ -371,14 +353,14 @@
   text-decoration: underline;
   margin-bottom: 0.25ex;
   margin-right:  0.25em;
-} 
+}
 .transclusion, .wiki-edithelp {
   font-size: smaller;
 }
 .transclusion {
   border: 1px solid gray;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
+  padding-left:  0.8em;
+  padding-right: 0.8em;
   padding-top:     0px;
   padding-bottom:  0px;
   margin-left:   0.25em;
@@ -420,13 +402,13 @@
   padding: 1px;
   /* For Mozilla */
   empty-cells: hide;
-} 
+}
 
 /* cells */
 table.cal td {
   background: white;
   text-align: right;
-} 
+}
 
 /* Month-name header */
 table.cal-header { font-size: larger; }
@@ -464,10 +446,6 @@
   margin-top:    1ex;
   margin-bottom: 0.5ex;
   background: white;
-  /* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-  border: 1px #ccc solid;
   color: black;
   border-top: 1px solid #494f5d;
   border-left:  1px solid #494f5d;
@@ -478,33 +456,16 @@
   padding-left:  .125em;
   padding-right: .125em;
   padding: 0;
-  /* "paper" borders */
-  /*border-top: 2px #d2d2d2 solid;
-  border-left:  2px #b2b2b2 solid;
-  border-bottom:  2px #e8e6df solid;
-  border-right: 2px #e8e6df solid;*/
-/*  padding-left:  0em; 
-  padding-bottom: 0ex;*/
-/*  border-style: inset;*/
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
-  /* I'm not sure what the intent of this was, but it's
-   *  not valid CSS: */
-  /* display: editarea; */
   clear: both;
 }
 .diff .block {
   background: #ddd;
   padding-left: 1em;
-  /* for NS4 */
-  /*border: none;*/
 }
 
 /* individual blocks */
 .diff .context {
   background: white;
-  /* for NS4 */
   border: none;
 }
 /* entire difftextblock */
@@ -512,22 +473,15 @@
   margin-top:    0;
   margin-bottom: 0;
   background: white;
-  /* Netscape 4 requires this 1px border.
-     Without it, the paper borders below cause
-     the white background to disappear. */
-  border: 1px black solid;
   /* "paper" borders */
   border-top:  1px #e8e6df solid;
   border-left: 1px #e8e6df solid;
   border-bottom: 1px #d2d2d2 solid;
   border-right:  1px #b2b2b2 solid;
-  padding-left:  0em; 
+  padding-left:  0em;
   padding-right: 0em;
   padding-top:    0ex;
   padding-bottom: 0ex;
-  /*This breaks Netscape 4: (display does not go full width).
-   * width: auto;
-   */
   clear: both;
 }
 /* + - line prefix */
@@ -535,7 +489,6 @@
   font-weight: normal;
   font-family: monospace;
   color: black;
-  /* for NS4 */
   margin-left: 0;
   border: none;
 }
@@ -553,17 +506,14 @@
 /* blocks containing deleted words */
 .diff .original, .diff .deleted {
   background: #fcc;
-  /* for NS4 */
   border: none;
 }
 /* blocks containing added words */
 .diff .final, .diff .added {
   background: #cfc;
-  /* for NS4 */
   border: none;
 }
 
-/* These don't work in NS4 -- it completely ignores <del> and <ins>. */
 /* deleted words */
 .diff del { background: #f99; }
 /* added words */
@@ -585,39 +535,30 @@
  */
 .printer, .no-css { display: none; }
 
-/* PHP Warnings */
-div.errors {
+.error {
   color: black;
   background: #eee;
   margin-top:    1em;
   margin-bottom: 1em;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
+  padding-left:  0.8em;
+  padding-right: 0.8em;
   padding-top:    0.8ex;
   padding-bottom: 0;
   border: medium solid red;
   clear: both;
 }
-h4.errors {
-  color: red;
-  margin:  0;
-  padding: 0;
-  text-decoration: underline;
-}
-div.warning {
+.warning {
   color: black;
   background: #eee;
   margin-top:    1em;
   margin-bottom: 1em;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
+  padding-left:  0.8em;
+  padding-right: 0.8em;
   padding-top:    0.8ex;
   padding-bottom: 0;
   border: thin solid blue;
   clear: both;
 }
-.error { font-family: monospace; font-size: 120%; }
-.error ul { font-family: monospace; }
 
 /* Debug */
 .debug {
@@ -634,7 +575,6 @@
 .hint {
   color: black;
   background: #eeeeee;
-   /* font-size: smaller; */
   font-style: italic;
   margin-left: 3em;
   padding: 0.5ex 0.5em;
@@ -683,8 +623,8 @@
 .wiki-dl-table tr {
   border-top: 2px #444 solid;
   border-bottom: 2px #444 solid;
-  border-left: none; 
-  border-right: none; 
+  border-left: none;
+  border-right: none;
 }
 .wiki-dl-table th,
 .wiki-dl-table td {
@@ -851,12 +791,12 @@
 /* plugin BoxRight */
 div.boxright {
   background-color: #e9fbff;
-  width: 200px; 
+  width: 200px;
   right: 10px;
-  padding: 0.5em; 
-  float: right; 
-  border: thin solid #888888; 
   padding: 0.5em;
+  float: right;
+  border: thin solid #888888;
+  padding: 0.5em;
 }
 
 /* RssFeed */
@@ -867,7 +807,7 @@
 a.rssicon { font-weight:normal; font-size:small; vertical-align:middle; }
 
 /* SqlResult */
-table.sqlresult { 
+table.sqlresult {
   border: 1px outset gray;
   background: white;
   margin: 0.5ex 0.5em;
@@ -883,9 +823,8 @@
 /**
  * TeX2png plugin
  */
-img.tex { 
-  border: 0ex;
-  vertical-align: middle; 
+img.tex {
+  vertical-align: middle;
 }
 
 /**
@@ -949,26 +888,18 @@
     vertical-align: top;
 }
 
-/* Hide the elements we put in just to get around NS4 bugs. */
-div.br { display: none; }
-
-/* This makes spacings in NS4 too big. */
 .toolbar, div.toolbar { margin: 0.5ex 0ex; }
 
-/* This breaks NS4, but is necessary for IE4. */
-div.wikitext { width: auto; }
-
 /**
  * General
  */
-/* for NS4 */
 img { vertical-align: baseline; }
 input { margin: 0.1em; }
 input.numeric { text-align: right; }
 
 /**
  * Wiki Forms
- * 
+ *
  * The div inside the wikiadmin upload form does not
  * have a class yet, so it must be referenced indirectly
  */
@@ -993,34 +924,18 @@
 
 /**
  * Links
-  border-top:  1px solid #b2b2d1;
-  border-left: 1px solid #d2d2f1;
-  border-bottom: 1px solid #86929e;
-  border-right:  1px solid #86929e;
  */
 
-/* Make wikiaction links look like buttons */ 
+/* Make wikiaction links look like buttons */
 a.wikiaction, a.wikiadmin, a.wikiunsafe,
 input.wikiaction, input.wikiadmin, input.wikiunsafe, input.button {
   color: black;
-/*
-  border-top:  1px solid #c6d2de;
-  border-left: 1px solid #c6d2de;
-  border-bottom: 1px solid #494f5d;
-  border-right:  1px solid #494f5d;
-
-  padding-top:    0.15ex;
-  padding-bottom: 0.25ex;
-  padding-left:  .5em;
-  padding-right: .5em;
-*/
   border: 1px outset;
   padding: 0.05ex 0.25em 0.1ex 0.25em;
   height: auto;
   width: auto;
   /* Prevent buttons from overlapping when the toolbar is wrapped. */
   line-height: 2.6ex;
-  /*margin: 2ex 0.2em;*/
 }
 
 div#navbuttons, div#signin, div#actionbuttons { line-height: 3.0ex; }
@@ -1040,11 +955,9 @@
 /* Link icons */
 img.linkicon { vertical-align: middle; }
 
-
 /**
  * Edit Page & View Source
  */
-/* color: inherit; and background: inherit; display as lime in NS4 */
 
 /* http://universaleditbutton.org */
 div#actionbuttons a#btn-edit {
@@ -1054,7 +967,7 @@
   padding-right: 0.5em !important;
 }
 /* image buttons */
-a.wikibutton, a.wikibutton:visited, input.wikibutton  { 
+a.wikibutton, a.wikibutton:visited, input.wikibutton  {
   background-color: white;
   border: 0;
 }
@@ -1072,12 +985,6 @@
   padding-right: 1px;
 }
 
-/**
- * Other
- */
-/* PHP Warnings */
-div.errors { font-size: smaller }
-
 /*
  * table class="boxed"
  * will put a border around the table (but not around the cells)
@@ -1118,8 +1025,8 @@
 }
 
 #edit-public, h1.firstHeading-public, h1.firstHeading-rating-public {
-	background-color: #ffce7b;
-	border: 1px solid #ffa500;
+    background-color: #ffce7b;
+    border: 1px solid #ffa500;
 }
 
 /* For emacs users

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7591 2010-07-02 08:05:07Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
 <?php /* I would like not to have to use these tables, and managed to

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/addcomment.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/addcomment.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/addcomment.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id: addcomment.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: addcomment.tmpl 7956 2011-03-03 17:08:31Z vargenau $
   $request->setArg('action',false);
 ?>
 <div class="wikicomment wikicomment-form">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/blogform.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/blogform.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/blogform.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id: blogform.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: blogform.tmpl 7850 2011-01-21 09:41:05Z vargenau $
 ?>
 <div class="wikiblog wikiblog-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
@@ -7,7 +7,7 @@
   <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
   <input type="hidden" name="mode" value="add" />
   <div class="wikiblog-form">
-     <?php echo _("Headline").': ' ?><br />
+     <?php echo _("Headline")._(": ") ?><br />
      <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
                    maxlength="256" name="edit[summary]" value="" />
      <?php echo $EDIT_TOOLBAR ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: body.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <body<?php echo $WikiTheme->getMoreAttr('body') ?>>
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/bottom.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/bottom.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/bottom.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: bottom.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: bottom.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- Add your Disclaimer here -->
 <?php if (!$WikiTheme->DUMP_MODE) { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/browse-footer.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/browse-footer.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/browse-footer.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse-footer.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse-footer.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <hr class="printer" />
 <p class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></p>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/browse.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/browse.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/browse.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <?php if ($revision and !$revision->isCurrent()) { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/categorypage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/categorypage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/categorypage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: categorypage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: categorypage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
   // This template is used for the CategoryPage plugin.
 ?>
 <div class="categorypage categorypage-form">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/comment.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/comment.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/comment.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id: comment.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: comment.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 $CDATE = $WikiTheme->formatDateTime($COMMENT_CTIME);
 $buttons = $modified = '';
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/content.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/content.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/content.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: content.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: content.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php echo $CONTENT ?>
 <?php echo Template('bottom') ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/debug.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/debug.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/debug.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: debug.tmpl 7591 2010-07-02 08:05:07Z vargenau $');
+// $Id: debug.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php global $RUNTIMER; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/dialog.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/dialog.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/dialog.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: dialog.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: dialog.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 /* 
  * A "popup" dialog.  (Though it doesn't pop up yet.)
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/editpage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/editpage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/editpage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: editpage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?php echo _("Preview only!  Changes not saved.")?></strong>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/forumadd.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/forumadd.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/forumadd.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: forumadd.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: forumadd.tmpl 7956 2011-03-03 17:08:31Z vargenau $
   // This template is used for the WikiForum plugin.
 ?>
 <div class="wikiforum wikiforum-reply">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/frameset.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/frameset.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/frameset.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: frameset.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: frameset.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 // This template is used for the FrameInclude plugin.
 
 $topurl = $request->getURLtoSelf(array('frame' => 'header'));

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/head.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/head.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/head.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php  // -*-php-*-
-// rcs_id('$Id: head.tmpl 7618 2010-07-16 06:59:16Z vargenau $');
+// $Id: head.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <head>
 <?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?>
@@ -24,13 +24,6 @@
 <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" />
 <base href="<?php echo PHPWIKI_BASE_URL?>" />
 <link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" />
-<?php /**
-       * Additional navigation links are provided here in the html header for browsers
-       * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??).
-       *
-       * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK
-       *     http://www.euronet.nl/~tekelenb/WWW/LINK/index.html
-       */ ?>
 <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo 
@@ -117,7 +110,9 @@
       $pagetitle = " - ". AsString($TITLE);
 ?>
 <title><?php echo WIKI_NAME.$pagetitle ?></title>
+<?php if (ENABLE_OPEN_GRAPH) { ?>
 <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/>
 <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/>
+<?php } ?>
 <?php echo $WikiTheme->getMoreHeaders() ?>
 </head>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/homepage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/homepage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/homepage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: homepage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: homepage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 /**
  * Note: Automatic homepage creation is not yet functional.
  */

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/html.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/html.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/html.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,12 +1,9 @@
 <?php  // -*-php-*-
-// rcs_id('$Id: html.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: html.tmpl 7827 2011-01-13 13:55:52Z vargenau $'
 /*
  * This template is responsible mainly for the outer level <html> stuff.
- *
- * NS/MO/IE/Op Browsers before 4.0 don't like that.
  */
-if (browserVersion() >= 4.0)
-  echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n";
+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" xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/htmldump.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/htmldump.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/htmldump.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php  // -*-php-*-
-// rcs_id('$Id: htmldump.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: htmldump.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 /*
  * This template is used only for html file dumps, and is responsible
  * mainly for the outer level <html> stuff and the and <head>.
@@ -10,13 +10,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" />
-<?php /**
-       * Additional navigation links are provided here in the html header for browsers
-       * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??).
-       *
-       * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK
-       *     http://www.euronet.nl/~tekelenb/WWW/LINK/index.html
-       */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" />
 <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" />

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/info.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/info.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/info.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: info.tmpl 7651 2010-08-24 14:24:17Z vargenau $');
+// $Id: info.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
@@ -130,16 +130,16 @@
   </tr>
 <?php if (ENABLE_EXTERNAL_PAGES) { ?>
   <tr>
-    <td align="right" class="pageinfo">Is External:</td>
+    <td align="right" class="pageinfo"><?php echo _("Is External:") ?></td>
     <td><?php echo $page->get('external') ? _("Yes") : _("No") ?></td>
   </tr>
 <?php } ?>
   <tr>
-    <td align="right" class="pageinfo">ACL type</td>
+    <td align="right" class="pageinfo"><?php echo _("ACL type:") ?></td>
     <td><?php echo $type ?></td>
   </tr>
   <tr>
-    <td align="right" valign="top" class="pageinfo">ACL</td>
+    <td align="right" valign="top" class="pageinfo"><?php echo _("ACL:") ?></td>
     <td><?php echo $perm->asAclLines() ?></td>
   </tr>
 <?php } ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/login.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/login.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/login.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: login.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: login.tmpl 8011 2011-04-04 15:20:14Z vargenau $
 ?>
 <?php if ($fail_message) { ?>
   <p><strong><?php echo $fail_message?></strong></p>
@@ -68,7 +68,7 @@
 <tr>
 <td>
 <fieldset>
-<legend>Sign In</legend>
+<legend><?php echo _("Sign In") ?></legend>
 <table cellspacing="4">
 <tr>
   <td align="right"><?php echo _("UserId:") ?></td>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,11 +1,11 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- The top navigation/search bar -->
 <div id="navbuttons">
 <?php if (ENABLE_DISCUSSION_LINK) { ?>
 <?php // This requires Talk: map to end in "/Discussion"
-  if (!string_ends_with($page->getName(), _("Discussion"))) { ?>
+  if (!string_ends_with($page->getName(), SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php echo $SEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()), 
                'button', _("Discussion")) ?>
   <?php } else { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/nochanges.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/nochanges.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/nochanges.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: nochanges.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: nochanges.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <p><strong><?php echo _("Edit aborted.")?></strong>
 <?php echo _("You have not made any changes so no new version has been saved.")?></p>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/online.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/online.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/online.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: online.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: online.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
 // Formatting and idea borrowed from postnuke.

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/pagelink.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/pagelink.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/pagelink.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: pagelink.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: pagelink.tmpl 8021 2011-04-05 17:19:14Z vargenau $
 
 /**
  * Themable paging "|<< <<   - i/sum - >> >>|" links
@@ -13,18 +13,18 @@
   $NEXT = false;
 }
 ?>
-<tr><td width="100%" colspan="<?php echo $COLS ?>"><table width="100%"><tr class="wikipaging">
+<tr><td width="100%" colspan="<?php echo $COLS ?>"><table width="100%" class="wikipaging"><tr class="wikipaging">
   <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
-      <?php echo $PREV ?  HTML::a(array('href'=>$FIRST_LINK),_("|<<")) : _("|<<") ?>
+      <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
        
-      <?php echo $PREV ?  HTML::a(array('href'=>$PREV_LINK),_("<< Prev")) : _("<<") ?>
+      <?php echo $PREV ? HTML::a(array('href'=>$PREV_LINK), "<< " . _("Prev")) : "<<" ?>
   </td>
   <td class="wikipaging-enabled" align="center">
       <?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
   </td>
   <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
-      <?php echo $NEXT ?  HTML::a(array('href'=>$NEXT_LINK),_("Next >>"))  : _(">>") ?> 
+      <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK), _("Next") . " >>") : ">>" ?>
        
-      <?php echo $NEXT ?  HTML::a(array('href'=>$LAST_LINK),_(">>|")) : _(">>|") ?>
+      <?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK), ">>|") : ">>|" ?>
   </td>
 </tr></table></td></tr>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/redirect.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/redirect.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/redirect.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,10 +1,9 @@
 <?php
-// rcs_id('$Id: redirect.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: redirect.tmpl 7828 2011-01-13 13:57:59Z vargenau $
 /* 
  * Redirect output.
  */
-if (browserVersion() >= 4.0)
-  echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n";
+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">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/savepage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/savepage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/savepage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: savepage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: savepage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
     $signatureURL = $WikiTheme->getImageURL('signature');

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/signin.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/signin.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/signin.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: signin.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: signin.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 
 if (empty($FORMNAME))
     $FORMNAME = 'signin';

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/top.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/top.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/top.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: top.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: top.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 
 global $HIDE_TOOLBARS;
 if (!$HIDE_TOOLBARS) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/userprefs.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/userprefs.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/userprefs.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: userprefs.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: userprefs.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
 // Todo: Move the logic and code to the plugin

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/viewsource.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/viewsource.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/viewsource.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: viewsource.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/wikiblog.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/wikiblog.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/wikiblog.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id: wikiblog.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: wikiblog.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
 $buttons = $modified = '';
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/wikiforum.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/wikiforum.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/templates/wikiforum.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id: wikiforum.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: wikiforum.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 /* 
 navigation headline: "MainForum / SubPage / ThisTopic" comes for free
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/default/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/default/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/default/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 
 /*
  * This file defines the default appearance ("theme") of PhpWiki.
@@ -22,5 +22,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-autonumbering.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: fusionforge-autonumbering.css 7662 2010-08-31 15:12:14Z vargenau $
+ * $Id: fusionforge-autonumbering.css 8071 2011-05-18 14:56:14Z vargenau $
  *
  * Copyright (C) 2008 Alcatel-Lucent
  *
@@ -16,9 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-fullscreen.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: fusionforge-fullscreen.css 7661 2010-08-31 15:08:32Z vargenau $
+ * $Id: fusionforge-fullscreen.css 8071 2011-05-18 14:56:14Z vargenau $
  *
  * Copyright (C) 2008 Alcatel-Lucent
  *
@@ -16,9 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-li p{margin:0;}div.br{display:none;}.toolbar,div.toolbar{margin:.5ex 0;}div.wikitext{width:auto;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#navbuttons,div#signin,div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;background:white;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;}h1 .backlinks{text-decoration:none;color:inherit;}h1{font-weight:bold;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#navbuttons,#actionbuttons{white-space:nowrap;}#navbuttons .named-wiki,#actionbuttons .named-wiki,#navbuttons .wikiaction,#actionbuttons .wikiaction,#navbuttons .wikiadmin,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#navbuttons .named-wiki:hover,#actionbuttons .named-wiki:hover,#navbuttons .wikiaction:hover,#actionbuttons .wikiaction:hover,#navbuttons .wikiadmin:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}div.errors{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;background:white;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;}
\ No newline at end of file
+li p{margin:0;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;}h1 .backlinks{text-decoration:none;color:inherit;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#actionbuttons{white-space:nowrap;}#actionbuttons .named-wiki,#actionbuttons .wikiaction,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#actionbuttons .named-wiki:hover,#actionbuttons .wikiaction:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.error,.warning,.debug,.hint{font-weight:bold;font-size:11px;text-align:left;border-width:2px;border-style:solid;padding:.5em;}.error{background-color:#ffc0cb;border-color:red;}.warning{background-color:#ffd297;border-color:#FFA500;}.debug{background-color:white;border-color:#fff8dc;}.hint{background-color:#eee;border-color:black;}p.error,p.warning,p.debug,p.hint,div.error div.warning,div.debug,div.hint{border-radius:1em;-moz-border-radius:1em;-webkit-border-radius:1em;}span.error,span.warning,span.debug,span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background-color:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}#rateit-widget-top{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/fusionforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file
+.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}#rateit-widget-top{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/fusionforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}h1{font-weight:bold;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: fusionforge-print.css 7718 2010-10-22 08:26:31Z vargenau $
+ * $Id: fusionforge-print.css 8071 2011-05-18 14:56:14Z vargenau $
  *
  * Copyright (C) 2008 Alcatel-Lucent
  *
@@ -16,9 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source
@@ -82,6 +82,8 @@
     border-bottom: 1px solid black;
 }
 
+h1 { font-weight: bold; }
+
 /*
 div.toclist a::after {
     content: leader('.') target-counter(attr(href), page);

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge-rereading.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: fusionforge-rereading.css 7662 2010-08-31 15:12:14Z vargenau $
+ * $Id: fusionforge-rereading.css 8071 2011-05-18 14:56:14Z vargenau $
  *
  * Copyright (C) 2008 Alcatel-Lucent
  *
@@ -16,9 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/fusionforge.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,8 +1,8 @@
 /**
- * $Id: fusionforge.css 7707 2010-09-22 14:57:42Z vargenau $
+ * $Id: fusionforge.css 8071 2011-05-18 14:56:14Z vargenau $
  *
  * Copyright (C) 2002-2007 $ThePhpWikiProgrammingTeam
- * Copyright (C) 2008-2009 Alcatel-Lucent
+ * Copyright (C) 2008-2010 Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -17,9 +17,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source
@@ -43,24 +43,69 @@
  * ALONE BASIS."
  */
 
-/* Because in some cases there is a <p> in nested lists */
-li p { margin:0; }
+/**
+ * General
+ */
 
-/* Hide the elements we put in just to get around NS4 bugs. */
-div.br { display: none; }
+body {
+	margin: 0 0 0 0;
+}
 
-/* This makes spacings in NS4 too big. */
-.toolbar, div.toolbar { margin: 0.5ex 0ex; }
+form { margin: 0; }
 
-/* This breaks NS4, but is necessary for IE4. */
-div.wikitext { width: auto; }
+img { border: 0; vertical-align: middle; }
 
+body {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	color: #565c5e; /* Alcatel-Lucent grey */
+}
+
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.6em; line-height:1.1em;}
+h3 { font-size: 1.2em; line-height:1.3em;}
+h4 { font-size: 1.0em; line-height:1.3em;}
+h5 { font-size: 0.8em; }
+h6 { font-size: 0.6em; }
+
+/* Titles in the page. */
+h1, .titlebar, .widget_titlebar {
+	background: url(/themes/alcatel-lucent/images/bgrd_hpage_header.gif) white;
+	background-position: bottom;
+	background-repeat: repeat-x;
+	padding-left: 10px;
+	padding-right: 10px;
+	padding-top: 4px;
+	padding-bottom: 6px;
+	border-top:1px solid #dddddd;
+	border-bottom:1px solid #dddddd;
+	vertical-align: middle;
+	font-family: 'trebuchet MS', Arial, Helvetica, sans-serif;
+	color: #554295; /* Alcatel-Lucent violet */
+	font-weight: normal;
+	font-size: 1.8em;
+	line-height: 1.3em;
+	text-align: left;
+	height: 24px;
+	margin-top: 4px;
+}
+
+/* Hack for the wiki that inserts an unneccessary </p> */
+.titlebar p {
+	color: #554295; /* Alcatel-Lucent violet */
+	font-size: 1em;
+	margin-bottom: 0;
+	margin-top: 0;
+}
+
+.titlebar a {
+	padding-left: 10px;
+}
+
+/* Because in some cases there is a <p> in nested lists */
+li p { margin:0; }
+
 div.wikitext table p { margin-top: 0.3em;  margin-bottom: 0.3em;}
 
-/**
- * General
- */
-/* for NS4 */
 img { vertical-align: baseline; }
 input { margin: 0.1em; }
 input.numeric { text-align: right; }
@@ -74,6 +119,21 @@
     background-color: white;
 }
 
+img { border: 0; }
+
+form { margin: 0ex; }
+
+table {
+    /* For Mozilla */
+    empty-cells: show;
+}
+
+caption {
+    caption-side: top;
+    text-align: left;
+    margin-bottom: .5ex;
+}
+
 /**
  * Wiki Forms
  * 
@@ -90,15 +150,14 @@
   margin-top: 0.5ex;
   margin-bottom: 0.5ex;
   padding: 0.5ex 0.5em;
-  /* Emulate the display behaviour of a table, to shrink it's width.
-   * ie5.1Mac ignores this */
+  /* Emulate the display behaviour of a table, to shrink it's width. */
   display: table;
 }
 
 /* Add space between the input field and following buttons, but not after the last button. */
 div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; }
 
-div#navbuttons, div#signin, div#actionbuttons { line-height: 3.0ex; }
+div#actionbuttons { line-height: 3.0ex; }
 
 /* QuestionMark */
 .wikiunknown a, .named-wikiunknown a {
@@ -118,42 +177,6 @@
 img.inlineimage { vertical-align: middle; }
 
 /**
- * Edit Page & View Source
- */
-/* color: inherit; and background: inherit; display as lime in NS4 */
-
-/**
- * Diff Output
- */
-.diff .prefix {
-  position: relative;
-  left: -1em;
-}
-/* deleted & added words */
-.diff del, .diff ins {
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-/**
- * General
- */ 
-img { border: 0ex; }
-
-form { margin: 0ex; }
-
-table {
-  /* For Mozilla */
-  empty-cells: show;
-}
-
-caption {
-  caption-side: top;
-  text-align: left;
-  margin-bottom: .5ex;
-}
-
-/**
  * Wiki
  */
 
@@ -172,7 +195,6 @@
 div.wikitext {
   margin-top:    1ex;
   margin-bottom: 0.5ex;
-  background: white;
   padding-bottom: 1em;
   clear: both;
 }
@@ -230,16 +252,22 @@
 }
 h1 .backlinks { text-decoration: none; color: inherit; }
 
-h1 { font-weight: bold; }
-
 /* Interwiki links */
 .wikipage  { font-weight: normal; }
 .interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
 .interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; }
 
-/**
- * Table of content
- */
+table.wikipaging { 
+    border-width: 1px;
+    border-style: solid; 
+    border-color: black; 
+    font-weight: bold;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+/* CreateToc plugin =================================================== */
+
 div.toc {
     border: 1px solid #aaaaaa;
     background-color: #f9f9f9;
@@ -257,10 +285,10 @@
  * headings
  */
 div.toc p.toctitle, h2, h3, h4, h5, h6 { 
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
-        padding-top: .5em;
-        padding-bottom: .17em;
-        border-bottom: 1px solid #aaaaaa;
+    font-family: Verdana, Arial, Helvetica, sans-serif; 
+    padding-top: .5em;
+    padding-bottom: .17em;
+    border-bottom: 1px solid #aaaaaa;
 }
 
 h1, h1 .backlinks, h2, .wikitext h2 a, h3, .wikitext h3 a, h4, .wikitext h4 a, h5, h6 {
@@ -299,8 +327,8 @@
 /**
  * Toolbar
  */
-.toolbar, input.button, #signin { 
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
+.toolbar, input.button { 
+    font-family: Verdana, Arial, Helvetica, sans-serif; 
 }
 
 .toolbar {
@@ -326,28 +354,22 @@
 }
 
 .tooltitle {
-	font-weight: bold ;
+    font-weight: bold ;
 }
 
-#navbuttons, #actionbuttons {
+#actionbuttons {
   white-space: nowrap;
 }
 
-#navbuttons .named-wiki,
 #actionbuttons .named-wiki,
-#navbuttons .wikiaction,
 #actionbuttons .wikiaction,
-#navbuttons .wikiadmin,
 #actionbuttons .wikiadmin {
   font-weight: normal;
   color: #565c5e; /* Alcatel-Lucent grey */
 }
 
-#navbuttons .named-wiki:hover,
 #actionbuttons .named-wiki:hover,
-#navbuttons .wikiaction:hover,
 #actionbuttons .wikiaction:hover,
-#navbuttons .wikiadmin:hover,
 #actionbuttons .wikiadmin:hover {
   text-decoration: underline;
 }
@@ -381,7 +403,6 @@
 
 #logo img {
   float: right;
-  border: 1px black solid;
   /* "paper" borders */
   border-top:  1px #e8e6df solid;
   border-left: 1px #e8e6df solid;
@@ -457,13 +478,15 @@
   list-style-image: none;
 }
 
-/* PageTrail plugin */
+/* PageTrail plugin =================================================== */
+
 .pagetrail {
      background-color: #FFFF99;
      padding: 0.2em;
 }
 
-/* IncludePage plugin */
+/* IncludePage plugin ================================================= */
+
 .transclusion-title {
   text-align: right;
   font-style: oblique;
@@ -506,9 +529,8 @@
   margin: 0;
 }
 
-/**
- * Calendar plugin
- */
+/* Calendar plugin ==================================================== */
+
 table.cal {
   border: 1px outset gray;
   background: white;
@@ -552,15 +574,23 @@
  /* text */
 table.cal td.cal-today a.cal-hide {  }
 
-/**
- * Diff Output
- */
+/* Diff plugin ======================================================== */
+
+.diff .prefix {
+  position: relative;
+  left: -1em;
+}
+/* deleted & added words */
+.diff del, .diff ins {
+  padding-left: 1px;
+  padding-right: 1px;
+}
+
 /* main box */
 .diff {
   margin-top:    1ex;
   margin-bottom: 0.5ex;
   background: white;
-  border: 1px #ccc solid;
   color: black;
   border-top: 1px solid #494f5d;
   border-left:  1px solid #494f5d;
@@ -581,7 +611,6 @@
 /* individual blocks */
 .diff .context {
   background: white;
-  /* for NS4 */
   border: none;
 }
 /* entire difftextblock */
@@ -589,7 +618,6 @@
   margin-top:    0;
   margin-bottom: 0;
   background: white;
-  border: 1px black solid;
   border-top:  1px #e8e6df solid;
   border-left: 1px #e8e6df solid;
   border-bottom: 1px #d2d2d2 solid;
@@ -635,64 +663,122 @@
 /* added words */
 .diff ins { background: #9f9; }
 
-/**
- * PageHistory, Info
- */
+/* PageInfo plugin ==================================================== */
+
 td.pageinfo { font-weight: bold; }
 .pageinfo-minoredit, .pageinfo-authorid {
   font-size: smaller;
   font-style: oblique;
 }
 
-div.errors {
+/* Banners ============================================================ */
+
+p.success, p.feedback, p.warning, p.warning_msg, p.error, p.information,
+div.success, div.feedback, div.warning, div.warning_msg, div.error, div.information {
+   font-weight: bold;
+   font-size: 12px;
+   text-align: center;
+   border: 1px solid;
+   margin: 15px 0px;
+   padding: 10px 10px 10px 10px;
+}
+
+.success, .feedback {
+   border-color: green;
+   background-color: #DFF2BF;
+}
+.warning_msg, .warning {
+   border-color: orange;
+   background-color: #FEEFB3;
+}
+.error {
+   border-color: red;
+   background-color: #FFBABA;
+}
+.information {
+   border-color: blue;
+   background-color: #BDE5F8;
+}
+
+p.success, p.feedback, 
+p.warning, p.warning_msg, 
+p.error, 
+p.information,
+div.success, div.feedback, 
+div.warning, div.warning_msg, 
+div.error, 
+div.information {
+   text-align: left;
+   background-repeat: no-repeat;
+   background-position: 10px;
+   -moz-border-radius: 1em;
+   -webkit-border-radius: 1em;
+   border-radius: 1em;
+   padding: 10px 10px 10px 50px;
+}
+
+div.success, div.feedback,
+p.success, p.feedback {
+   color: #4F8A10;
+   background-image:url('/themes/base-alcatel-lucent/images/success.png');
+}
+div.feedback p, div.feedback li,
+div.success p, div.success li {
+   color: #4F8A10;
+}
+
+div.warning, div.warning_msg,
+p.warning, p.warning_msg {
+   color: #9F6000;
+   background-image: url('/themes/base-alcatel-lucent/images/warning.png');
+}
+div.warning p, div.warning_msg p,
+div.warning li, div.warning_msg li {
+   color: #9F6000;
+}
+
+div.error,
+p.error {
+   color: #D8000C;
+   background-image: url('/themes/base-alcatel-lucent/images/error.png');
+}
+div.error p,
+div.error li {
+   color: #D8000C;
+}
+
+div.information,
+p.information {
+   color: #00529B;
+   background-image: url('/themes/base-alcatel-lucent/images/info.png');
+}
+
+.error, .warning, .debug, .hint {
     font-weight: bold;
-    border-width: 2px;
+    font-size: 11px;
+    text-align: left;
+    border-width: 1px;
     border-style: solid;
-    background-color: #ffc0cb; /* pink */
-    border-color: red;
     padding: 0.5em;
 }
 
-div.warning {
-  color: black;
-  background: #eee;
-  margin-top:    1em;
-  margin-bottom: 1em;
-  padding-left:  0.8em; 
-  padding-right: 0.8em; 
-  padding-top:    0.8ex;
-  padding-bottom: 0;
-  border: thin solid blue;
-  clear: both;
-}
-
-/* Debug */
 .debug {
-  color: black;
-  background: white;
-  font-family: monospace;
-  font-size: smaller;
-  margin: 1ex 0;
-  padding: 0.5ex 0.5em;
-  border: medium solid #fff8dc; /* darker ivory */
+    background-color: white;
+    border-color: #fff8dc; /* darker ivory */
 }
 
-/* Hints */
 .hint {
-  color: black;
-  background: #eeeeee;
-  font-style: italic;
-  margin-left: 3em;
-  padding: 0.5ex 0.5em;
-  border: thin solid #aaaaaa;
+    background-color: #eeeeee; 
+    border-color: black;
 }
-span.hint {
+
+span.error, span.warning, span.debug, span.hint {
   padding: 0;
 }
 
-/* Disabled Plugins */
-.disabled-plugin
-{
+/* Disabled Plugins  ================================================== */
+
+.disabled-plugin {
   clear: both;
   margin: 1ex 0;
   padding: 0;
@@ -711,6 +797,8 @@
   padding: 0.3ex 0.5em;
 }
 
+/* RedirectTo plugin ================================================== */
+
 /* "(Redirected from ...)" message. */
 span.redirectfrom {
   font-size: small;
@@ -752,19 +840,19 @@
  * "E-mail" style blockquote
  */
 blockquote.mail-style-quote {
-	margin: 0em;
-	margin-bottom: 1em;
-	border: 1px solid #284;
-	padding: 0.5em;
+    margin: 0em;
+    margin-bottom: 1em;
+    border: 1px solid #284;
+    padding: 0.5em;
 } 
 .mail-style-quote blockquote.mail-style-quote {
-        margin-left: 0.3em;
-	margin-bottom : 0em;
-	background: transparent;
-	border-style: none;
-	border-left: medium solid #284;
-	padding: 0em;
-	padding-left: 0.5em;
+    margin-left: 0.3em;
+    margin-bottom : 0em;
+    background-color: transparent;
+    border-style: none;
+    border-left: medium solid #284;
+    padding: 0em;
+    padding-left: 0.5em;
 }
 
 /*
@@ -774,7 +862,6 @@
 .floatright { float: right; }
 
 div.wikiblog {
-  /* border: thin black solid; */
   margin: 1ex 2em;
   padding: 0 0;
 }
@@ -872,7 +959,6 @@
   clear: both;
 }
 
-
 /* postnuke css:*/
 .gensmall{font-size:10px}
 .genmed{font-size:11px}
@@ -919,17 +1005,14 @@
   border: 1px solid gray;
 }
 
-/**
- * TeX2png plugin
- */
+/* TeX2png plugin ===================================================== */
+
 img.tex { 
-  border: 0ex;
   vertical-align: middle; 
 }
 
-/**
- * PhotoAlbum plugin
- */
+/* PhotoAlbum plugin ================================================== */
+
 .boldsmall {
   font-weight: bold;
   font-size: 11px;
@@ -938,7 +1021,6 @@
 #content {
     margin: 0;
     padding: 1em 1em 1.5em 1em;
-    background: white;
     border: 1px solid #aaaaaa;
     line-height: 1.2em;
     position: relative;
@@ -948,9 +1030,9 @@
 /* the left column width is specified in class .portlet */
 
 #footer {
-        text-align: right;
-        vertical-align: bottom;
-        font-style: italic;
+    text-align: right;
+    vertical-align: bottom;
+    font-style: italic;
 }
 
 /*
@@ -992,7 +1074,8 @@
     background-color: #d8d8d8;
 }
 
-/* plugin BoxRight */
+/* BoxRight plugin ==================================================== */
+
 div.boxright {
   background-color: #e9fbff;
   width: 200px; 
@@ -1021,6 +1104,11 @@
 }
 
 /* Main wiki browse banner */
+
+.browsebanner {
+   clear: both;
+}
+
 .browsebanner table {
    width: 100%;
    background-color: #e9fbff;
@@ -1035,6 +1123,8 @@
    font-style: oblique;
 }
 
+/* RateIt plugin ====================================================== */
+
 .rateit {
    font-size: 60%;
    font-weight: bold;

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/pgsrc/PhpWikiAdministration	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Wed, 13 Apr 2011 18:02:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: PhpWikiAdministration 7682 2010-09-10 12:03:36Z vargenau $
+X-Rcs-Id: $Id: PhpWikiAdministration 8049 2011-04-13 16:04:19Z vargenau $
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;
   flags=PAGE_LOCKED;
@@ -78,8 +78,8 @@
 === 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.
+directories. The file or directory is located in the Web DAV of your project.
+You can also use this form to load from an http: or ftp: URL.
 
 <<WikiForm action=loadfile>>
 <<WikiForm action=loadfile buttontext="Load & Overwrite" overwrite=1>>
@@ -114,6 +114,8 @@
 links for page editing functions and navigation are removed from the
 pages.
 
+The directory will be located in the Web DAV of your project.
+
 The XHTML file collection can also be downloaded as an **[[phpwiki:?action=ziphtml|XHTML ZIP Snapshot]]**.
 
 ----

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// $Id: actionbar.tmpl 7720 2010-10-22 18:38:33Z vargenau $
+// $Id: actionbar.tmpl 7926 2011-02-01 10:47:10Z vargenau $
 
 $curuserprefs = $user->getPreferences();
 $dbh = $request->getDbh();
@@ -13,7 +13,7 @@
     <table cellpadding="0" cellspacing="0">
     <tr>
 
-    <?php if (!string_ends_with($pagename, _("/Discussion"))) { ?>
+    <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
       <td class="bold">
       <?php echo Button(array(),
@@ -48,7 +48,7 @@
     <td class="spacer"> </td>
     <td class="spacer"> </td>
 
-    <?php if (!($page->get('locked')) and (mayAccessPage('edit', $page->getName()))) { ?>
+    <?php if ($user->isAdmin() or (!($page->get('locked')) and (mayAccessPage('edit', $page->getName())))) { ?>
       <td class="bold">
       <?php if (! $dbh->isWikiPage($page->getName())) { ?>
       <?php echo Button("edit", _("Create Page")) ?>
@@ -81,7 +81,7 @@
       <td><?php echo Button("PageInfo", _("Page Info")) ?></td>
 
       <td class="spacer"> </td>
-      <td><?php echo Button(array('action'=>'BackLinks'), _("Back Links"),$page->getName()) ?></td>
+      <td><?php echo Button(array('action'=>_("BackLinks")), _("Back Links"),$page->getName()) ?></td>
 
     <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
       <?php if ($curuserprefs->get('pdfMenuItem')) { ?>
@@ -129,7 +129,7 @@
     <?php } ?>
 
     <td class="spacer"> </td>
-    <td><?php echo Button("WatchPage", _("Watch Page")) ?></td>
+    <td><?php echo Button(_("WatchPage"), _("Watch Page")) ?></td>
 
   </tr>
   </table>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/blogform.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/blogform.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// $Id: blogform.tmpl 7720 2010-10-22 18:38:33Z vargenau $
+// $Id: blogform.tmpl 7850 2011-01-21 09:41:05Z vargenau $
 ?>
 <div class="wikiblog wikiblog-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
@@ -7,7 +7,7 @@
   <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
   <input type="hidden" name="mode" value="add" />
   <div class="wikiblog-form">
-     <?php echo _("Headline").': ' ?><br />
+     <?php echo _("Headline")._(": ") ?><br />
      <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
                    maxlength="256" name="edit[summary]" value="" />
      <?php echo $EDIT_TOOLBAR ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,6 +1,9 @@
 <?php // -*-php-*-
-// $Id: body.tmpl 7720 2010-10-22 18:38:33Z vargenau $
+// $Id: body.tmpl 8028 2011-04-08 13:57:12Z vargenau $
 ?>
+<?php if ($WikiTheme->DUMP_MODE) { ?>
+<body>
+<?php } ?>
 <table width="100%" cellpadding="0" cellspacing="0">
 <tr>
 <td valign="top">
@@ -44,3 +47,6 @@
 </tr>
 </table>
 <?php echo Template('bottom') ?>
+<?php if ($WikiTheme->DUMP_MODE) { ?>
+</body>
+<?php } ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,13 +1,13 @@
 <?php // -*-php-*-
-// $Id: debug.tmpl 7720 2010-10-22 18:38:33Z vargenau $
+// $Id: debug.tmpl 8015 2011-04-05 09:47:42Z vargenau $
 ?>
-<?php global $RUNTIMER; ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td>
-<span class="debug"><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats()) ?>
-<?php $mem = @getMemoryUsage(); if ($mem) { ?>
-  <?php echo fmt(", Memory: %s", $mem) ?>
-<?php } ?>
-</span>
-</td></tr></table>
-<br class="clear-floats" />
+<p class="debug">
+<?php
+global $RUNTIMER;
+echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats());
+$mem = @getMemoryUsage();
+if ($mem) {
+    echo fmt(", Memory: %s", $mem);
+}
+?>
+</p>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,28 +1,28 @@
 <?php // -*-php-*-
-// $Id: navbar.tmpl 7720 2010-10-22 18:38:33Z vargenau $
+// $Id: navbar.tmpl 7924 2011-01-31 16:57:48Z vargenau $
 
 $curuserprefs = $user->getPreferences();
 $dbh = $request->getDbh();
 $username = $user->UserName();
 ?>
 
-   <tr><td class="submenu"><?php echo WikiLink(_("HomePage"), "","Home Page") ?></td></tr>
-   <tr><td class="submenu"><?php echo WikiLink(_("RecentChanges"), "","Recent Changes") ?></td></tr>
-   <tr><td class="submenu"><?php echo WikiLink(_("SpecialPages"), "","Special Pages") ?></td></tr>
-   <tr><td class="submenu"><?php echo WikiLink(_("FindPage"), "","Search") ?></td></tr>
+   <tr><td class="submenu"><?php echo WikiLink(_("HomePage"), "", _("Home Page")) ?></td></tr>
+   <tr><td class="submenu"><?php echo WikiLink(_("RecentChanges"), "", _("Recent Changes")) ?></td></tr>
+   <tr><td class="submenu"><?php echo WikiLink(_("SpecialPages"), "", _("Special Pages")) ?></td></tr>
+   <tr><td class="submenu"><?php echo WikiLink(_("FindPage"), "", _("Search")) ?></td></tr>
    <?php if ($curuserprefs->get('randomPageMenuItem')) { ?>
-     <tr><td class="submenu"><?php echo WikiLink(_("RandomPage"), "","Random Page") ?></td></tr>
+     <tr><td class="submenu"><?php echo WikiLink(_("RandomPage"), "", _("Random Page")) ?></td></tr>
    <?php } ?>
    <?php if ($curuserprefs->get('likePagesMenuItem')) { ?>
-     <tr><td class="submenu"><?php echo Button(array('action'=>'LikePages'),_("Like Pages"),$page->getName()) ?></td></tr>
+     <tr><td class="submenu"><?php echo Button(array('action'=>_("LikePages")), _("Like Pages"),$page->getName()) ?></td></tr>
    <?php } ?>
-   <tr><td class="submenu"><?php echo WikiLink(_("UpLoad"), "","Upload File") ?></td></tr>
+   <tr><td class="submenu"><?php echo WikiLink(_("UpLoad"), "", _("Upload File")) ?></td></tr>
    <?php if (!empty($user) && $user->isAdmin()) { ?>
-     <tr><td class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "","Wiki Admin") ?></td></tr>
+     <tr><td class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Wiki Admin")) ?></td></tr>
    <?php } ?>
    <?php if (!empty($user) && $user->isSignedIn()) { ?>
      <?php if ($dbh->isWikiPage($username)) { ?>
-       <tr><td class="submenu"><?php echo WikiLink($username, "","My User Page") ?></td></tr>
+       <tr><td class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></td></tr>
      <?php } ?>
-     <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "","User Preferences") ?></td></tr>
+     <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("User Preferences")) ?></td></tr>
    <?php } ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// $Id: userprefs.tmpl 7720 2010-10-22 18:38:33Z vargenau $'
+// $Id: userprefs.tmpl 7945 2011-03-02 10:15:46Z vargenau $'
 // Todo: Move the logic and code to the plugin
 // This is very experimental and the read-only part an ugly hack so far.
 foreach (explode(',','errmsg,isForm') as $var) {
@@ -186,7 +186,7 @@
 <?php } ?>
 
 <fieldset style="margin-bottom: 1em;">
-<legend><strong>User preferences for this project</strong></legend>
+<legend><strong><?php echo _("User preferences for this project")?></strong></legend>
 <table border="0" width="100%">
 
   <tr><td colspan="3"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
@@ -207,7 +207,7 @@
 </fieldset>
 
 <fieldset style="margin-bottom: 1em;">
-<legend><strong>Global user preferences (for all projects)</strong></legend>
+<legend><strong><?php echo _("Global user preferences (for all projects)")?></strong></legend>
 
 <table border="0" width="100%">
 
@@ -241,7 +241,7 @@
   <tr>
      <td>
        <fieldset>
-       <legend>Top Menu</legend>
+       <legend><?php echo _("Top Menu")?></legend>
        <table cellpadding="0" cellspacing="0">
          <tr>
             <td>
@@ -281,7 +281,7 @@
 
      <td valign="top">
        <fieldset>
-       <legend>Left Menu</legend>
+       <legend><?php echo _("Left Menu")?></legend>
        <table cellpadding="0" cellspacing="0">
          <tr>
             <td>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/fusionforge/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,64 +6,95 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7671 2010-09-02 20:07:31Z vargenau $');
+// $Id: themeinfo.php 8078 2011-05-18 16:44:31Z vargenau $;
 
 require_once('lib/WikiTheme.php');
 require_once('themes/wikilens/themeinfo.php');
 
 class WikiTheme_fusionforge extends WikiTheme_Wikilens {
 
+    function getCSS () {
+        $css = array();
+        $css[] = $this->_CSSlink("", "fusionforge.css", "");
+        $css[] = $this->_CSSlink("", "fusionforge-print.css", "print");
+        $css[] = $this->_CSSlink("Fullscreen", "fusionforge-fullscreen.css", "screen", true);
+        $css[] = $this->_CSSlink("Autonumbering", "fusionforge-autonumbering.css", "", true);
+        $css[] = $this->_CSSlink("Rereading Mode", "fusionforge-rereading.css", "", true);
+        return HTML($css);
+    }
+
     function header() {
         global $HTML, $group_id, $group_public_name, $request, $project;
 
         $pagename = $request->getArg('pagename');
 
-        $submenu = Template('navbar');
+        $submenu = Template('navbar')->asXML();
 
-	session_require_perm ('project_read', $group_id);
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
 
-        //for dead projects must be member of admin project
-        if (!$project->isActive()) {
-            //only SF group can view non-active, non-holding groups
-            session_require_global_perm ('forge_admin');
-        }
+            $domain = textdomain(NULL);
+            textdomain('fusionforge');
 
-        $HTML->header(array('title'=> $group_public_name.': '.htmlspecialchars($pagename),
-                            'group' => $group_id,
-                            'toptab' => 'wiki',
-                            'submenu' => $submenu->asXML()
-                           )
-                     );
+            //group is private
+            if (!$project->isPublic()) {
+                //if it's a private group, you must be a member of that group
+                session_require_perm('project_read', $group_id);
+                }
+            }
 
-        // Display a warning banner for internal users when the wiki is opened
-        // to external users.
-        if (method_exists($project, 'getIsExternal') && $project->getIsExternal()) {
-        	$external_user = false;
-        	if (session_loggedin()) {
-        		$user = session_get_user();
-        		$external_user = $user->getIsExternal();
-        	}
-        	if (!$external_user) {
-	        	$page = $request->getPage();
-	        	if ($page->get('external')) {
-	    			$external_msg = _("This page is external.");
-	    		}
-	    		echo $HTML->warning_msg(_("This project is shared with third-party users (non Alcatel-Lucent users).") .
-	    								(isset($external_msg) ? ' ' . $external_msg : ''));
-			}
+            //for dead projects must be member of admin project
+            if (!$project->isActive()) {
+                //only SF group can view non-active, non-holding groups
+                session_require_global_perm('forge_admin');
+            }
+
+            $HTML->header(array('h1' => '',
+                                'title'=> $group_public_name._(": ").htmlspecialchars($pagename),
+                                'group' => $group_id,
+                                'toptab' => 'wiki',
+                                'submenu' => $submenu
+                               )
+                         );
+
+            // Display a warning banner for internal users when the wiki is opened
+            // to external users.
+            if (method_exists($project, 'getIsExternal') && $project->getIsExternal()) {
+                $external_user = false;
+                if (session_loggedin()) {
+                   $user = session_get_user();
+                   $external_user = $user->getIsExternal();
+                }
+                if (!$external_user) {
+                    $page = $request->getPage();
+                    if ($page->get('external')) {
+                        $external_msg = _("This page is external.");
+                    }
+                    echo $HTML->information(_("This project is shared with third-party users") .
+                                            sprintf(_(" (non %s users)."), forge_get_config('company')) .
+                                            (isset($external_msg) ? ' ' . $external_msg : ''));
+                }
+            }
+            textdomain($domain);
         }
     }
 
     function footer() {
-        global $HTML;
 
-        $HTML->footer(array());
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
+            global $HTML;
 
+            $domain = textdomain(NULL);
+            textdomain('fusionforge');
+
+            $HTML->footer(array());
+
+            textdomain($domain);
+        }
     }
 
     function initGlobals() {
         global $request;
-		static $already = 0;
+        static $already = 0;
         if (!$already) {
             $script_url = deduce_script_name();
             $script_url .= '/'. $GLOBALS['group_name'] ;
@@ -74,13 +105,13 @@
             $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikilens.js"))));
             $js = "var data_path = '". javascript_quote_string(DATA_PATH) ."';\n"
             // Temp remove pagename because of XSS warning
-            //	."var pagename  = '". javascript_quote_string($pagename) ."';\n"
+            //  ."var pagename  = '". javascript_quote_string($pagename) ."';\n"
                 ."var script_url= '". javascript_quote_string($script_url) ."';\n"
                 ."var stylepath = data_path+'/".javascript_quote_string($this->_theme)."/';\n"
                 ."var folderArrowPath = '".javascript_quote_string($folderArrowPath)."';\n"
                 ."var use_path_info = " . (USE_PATH_INFO ? "true" : "false") .";\n";
             $this->addMoreHeaders(JavaScript($js));
-	    $already = 1;
+            $already = 1;
         }
     }
     function load() {

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/shamino_com-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/shamino_com-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/shamino_com-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
-body{font-family:sans-serif;font-weight:normal;font-style:normal;background-color:#fff;position:absolute;top:0;left:0;visibility:visible;z-index:auto;margin:0;}hr{height:0;margin-left:10px;margin-right:10px;}#content{font-size:10pt;font-family:sans-serif;font-weight:normal;font-style:normal;background-color:#fff;padding:1em 10px 1em 10px;}.wikitext,.wiki,p,form,ul,dd,dl,li,td{line-height:150%;color:#111;margin:0;padding:0;list-style-type:none;}p,ul{padding:10px;text-align:justify;background-color:#fff;}dd{font-size:9pt;text-align:right;padding:0;margin:0;bottom:0;}dl{padding:0;margin:0;margin-top:14px;bottom:0;}li{margin-left:0;margin-bottom:0;}img{margin:0;border:0;padding:0;}table{border:0;padding:0;border-spacing:0;margin:0;}td,th,tr,tt{padding:0;margin:2px;border:0;border-spacing:0;}input.numeric{text-align:right;}input{font-family:sans-serif;font-size:10pt;font-style:normal;font-weight:normal;}textarea{text-decoration:none;font-family:sans-serif;font-size:10pt;font-style:normal;font-weight:normal;}h1,h2,h3,h4{font-family:Lucida Grande,sans-serif;font-weight:normal;font-style:normal;margin:0;padding:0;padding-top:10px;text-decoration:none;text-align:left;}a.wiki{font-weight:normal;}a:link{font-weight:normal;color:#456;text-decoration:none;}a:visited{font-weight:normal;color:#456;text-decoration:none;}a:hover{font-weight:normal;color:#456;text-decoration:underline;}a:active{font-weight:normal;color:#456;text-decoration:underline;}a:focus{font-weight:normal;color:#456;text-decoration:underline;}.main{padding:0;border:0;margin:0;}.maintable{padding:0;border:0;margin:0;}.menu{font-size:9pt;padding:10px;padding-top:0;border:0;margin:0;}.box{background-color:#eee;border:1px solid #dcdcdc;color:#111;padding:0;position:absolute;}.bar{background-color:#eee;color:#111;font-weight:bold;padding:2px 1em 2px 1em;}.wikilink{color:#55C;text-decoration:none;font-style:normal;}.wikinavbar{border-bottom:1px #999 solid;padding:2px;font-size:8pt;}.toolbar{border-top:1px #999 solid;padding:2px;font-size:8pt;}.debug{padding:2px;margin-left:10px;font-size:8pt;}.wikinavbar a.wikilink,.toolbar a.wikilink,.editdate,#xhtml-validator a.wikilink{font-size:8pt;}#content a.wiki{font-size:9pt;}.wikiaction{color:#55C;text-decoration:none;font-style:normal;}.wiki{color:#55C;text-decoration:none;font-style:normal;}.backlinks{color:#55C;text-decoration:none;font-style:normal;}#header{font-size:8pt;margin-left:4px;}.signin,.signin a.wiki,.signin a.wikiaction{font-size:8pt;}.top{font-size:75%;margin:4px;}.plugin{margin:0;}div#logo{float:right;}div.boxright{width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file
+body{font-family:sans-serif;font-weight:normal;font-style:normal;background-color:#fff;position:absolute;top:0;left:0;visibility:visible;z-index:auto;margin:0;}hr{height:0;margin-left:10px;margin-right:10px;}#content{font-size:10pt;font-family:sans-serif;font-weight:normal;font-style:normal;background-color:#fff;padding:1em 10px 1em 10px;}.wikitext,.wiki,p,form,ul,dd,dl,li,td{line-height:150%;color:#111;margin:0;padding:0;list-style-type:none;}p,ul{padding:10px;text-align:justify;background-color:#fff;}dd{font-size:9pt;text-align:right;padding:0;margin:0;bottom:0;}dl{padding:0;margin:0;margin-top:14px;bottom:0;}li{margin-left:0;margin-bottom:0;}img{margin:0;border:0;padding:0;}table{border:0;padding:0;border-spacing:0;margin:0;}td,th,tr,tt{padding:0;margin:2px;border:0;border-spacing:0;}input.numeric{text-align:right;}input{font-family:sans-serif;font-size:10pt;font-style:normal;font-weight:normal;}textarea{text-decoration:none;font-family:sans-serif;font-size:10pt;font-style:normal;font-weight:normal;}h1,h2,h3,h4{font-family:Lucida Grande,sans-serif;font-weight:normal;font-style:normal;margin:0;padding:0;padding-top:10px;text-decoration:none;text-align:left;}a.wiki{font-weight:normal;}a:link{font-weight:normal;color:#456;text-decoration:none;}a:visited{font-weight:normal;color:#456;text-decoration:none;}a:hover{font-weight:normal;color:#456;text-decoration:underline;}a:active{font-weight:normal;color:#456;text-decoration:underline;}a:focus{font-weight:normal;color:#456;text-decoration:underline;}.main{padding:0;border:0;margin:0;}.maintable{padding:0;border:0;margin:0;}.menu{font-size:9pt;padding:10px;padding-top:0;border:0;margin:0;}.box{background-color:#eee;border:1px solid #dcdcdc;color:#111;padding:0;position:absolute;}.bar{background-color:#eee;color:#111;font-weight:bold;padding:2px 1em 2px 1em;}.wikilink{color:#55C;text-decoration:none;font-style:normal;}.wikinavbar{border-bottom:1px #999 solid;padding:2px;font-size:8pt;}.toolbar{border-top:1px #999 solid;padding:2px;font-size:8pt;}.debug{padding:2px;margin-left:10px;font-size:8pt;}.wikinavbar a.wikilink,.toolbar a.wikilink,.editdate,#xhtml-validator a.wikilink{font-size:8pt;}#content a.wiki{font-size:9pt;}.wikiaction{color:#55C;text-decoration:none;font-style:normal;}.wiki{color:#55C;text-decoration:none;font-style:normal;}.backlinks{color:#55C;text-decoration:none;font-style:normal;}#header{font-size:8pt;margin-left:4px;}.signin,.signin a.wiki,.signin a.wikiaction{font-size:8pt;}.top{font-size:75%;margin:4px;}.plugin{margin:0;}div#logo{float:right;}div.boxright{width:200px;right:10px;padding:.5em;float:right;border:thin solid #888;padding:.5em;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}.transclusion-title{font-style:oblique;font-size:.75em;text-decoration:underline;text-align:right;}.transclusion{background:lightgreen;border:thin;border-style:solid;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin:.5ex 0;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/shamino_com.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/shamino_com.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/shamino_com.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: shamino_com.css 6600 2009-02-27 16:24:31Z vargenau $
+ * $Id: shamino_com.css 7821 2011-01-07 12:42:51Z vargenau $
  *
  * shamino.com style sheet based on the original Wiki
  *
@@ -69,12 +69,11 @@
 
 img {
     margin:0px;
-    border:0px;
+    border:0;
     padding:0px;
 }
 
 table {
-/*  position:relative;left:0px;top:0px; */
   border: 0px;;
   padding: 0px;
   border-spacing: 0px;
@@ -167,6 +166,26 @@
   font-weight: normal;
 }
 
+/* IncludePage plugin ================================================= */
+
+.transclusion-title {
+   font-style: oblique;
+   font-size: 0.75em;
+   text-decoration: underline;
+   text-align: right;
+}
+
+.transclusion {
+   background: lightgreen;
+   border: thin;
+   border-style: solid;
+   padding-left: 0.8em;
+   padding-right: 0.8em;
+   padding-top: 0px;
+   padding-bottom: 0px;
+   margin: 0.5ex 0px;
+}
+
 /*
  * table class="boxed"
  * will put a border around the table (but not around the cells)

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php
 if (empty($revision)) $revision = $page->getCurrentRevision(false);

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/browse-footer.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/browse-footer.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/browse-footer.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse-footer.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: browse-footer.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <div class="toolbar">
 <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/debug.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/debug.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/debug.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: debug.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: debug.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- shamino.com debug -->
 <div class="debug">

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/info.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/info.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/info.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: info.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: info.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <?php echo Template("default/info") ?>
 <?php echo Template("actionbar") ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/signin.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/signin.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/signin.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: signin.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: signin.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 // signin only implicitly by clicking "Edit"
 if (empty($FORMNAME))
     $FORMNAME = 'signin';

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/top.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/top.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/templates/top.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: top.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: top.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- The logo -->
 <div id="logo"><a class="wikilink" 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/shamino_com/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 /**
  * A minimalistic design by walter rafelsberger
  * See http://www.shamino.com/wiki/
@@ -46,81 +46,66 @@
     }
 
     function load() {
-	// 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.
+    // 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.
 
-	// This should result in phpwiki-printer.css being used when
-	// printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
-	$this->setDefaultCSS('PhpWiki',
-				  array(''      => 'shamino_com.css',
-					'print' => 'phpwiki-printer.css'));
+    // This should result in phpwiki-printer.css being used when
+    // printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
+    $this->setDefaultCSS('PhpWiki', array('' => 'shamino_com.css', 'print' => 'phpwiki-printer.css'));
 
-	// This allows one to manually select "Printer" style (when browsing page)
-	// to see what the printer style looks like.
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+    // This allows one to manually select "Printer" style (when browsing page)
+    // to see what the printer style looks like.
+    $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+    $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
+    $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	//$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+    /**
+     * The logo image appears on every page and links to the HomePage.
+     */
+    //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is set to false then the "Thank you for editing..." screen will
-	 * be omitted.
-	 */
+    /**
+     * The Signature image is shown after saving an edited page. If this
+     * is set to false then the "Thank you for editing..." screen will
+     * be omitted.
+     */
 
-	//$this->addImageAlias('signature', WIKI_NAME . "Signature.png");
-	// Uncomment this next line to disable the signature.
-	$this->addImageAlias('signature', false);
+    //$this->addImageAlias('signature', WIKI_NAME . "Signature.png");
+    // Uncomment this next line to disable the signature.
+    $this->addImageAlias('signature', false);
 
-	/*
-	 * Link icons.
-	 */
-	//$this->setLinkIcon('http');
-	//$this->setLinkIcon('https');
-	//$this->setLinkIcon('ftp');
-	//$this->setLinkIcon('mailto');
-	//$this->setLinkIcon('interwiki');
-	//$this->setLinkIcon('wikiuser');
-	//$this->setLinkIcon('*', 'url');
+    /**
+     * WikiWords can automatically be split by inserting spaces between
+     * the words. The default is to leave WordsSmashedTogetherLikeSo.
+     */
+    //$this->setAutosplitWikiWords(false);
 
-	//$this->setButtonSeparator("\n | ");
+    /**
+     * Layout improvement with dangling links for mostly closed wiki's:
+     * If false, only users with edit permissions will be presented the
+     * special wikiunknown class with "?" and Tooltip.
+     * If true (default), any user will see the ?, but will be presented
+     * the PrintLoginForm on a click.
+     */
+    $this->setAnonEditUnknownLinks(false);
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	//$this->setAutosplitWikiWords(false);
+    /*
+     * You may adjust the formats used for formatting dates and times
+     * below.  (These examples give the default formats.)
+     * Formats are given as format strings to PHP strftime() function See
+     * http://www.php.net/manual/en/function.strftime.php for details.
+     * Do not include the server's zone (%Z), times are converted to the
+     * user's time zone.
+     */
+    $this->setDateFormat("%B %d, %Y");
+    $this->setTimeFormat("%H:%M");
 
-	/**
-	 * Layout improvement with dangling links for mostly closed wiki's:
-	 * If false, only users with edit permissions will be presented the
-	 * special wikiunknown class with "?" and Tooltip.
-	 * If true (default), any user will see the ?, but will be presented
-	 * the PrintLoginForm on a click.
-	 */
-	$this->setAnonEditUnknownLinks(false);
-
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	$this->setDateFormat("%B %d, %Y");
-	$this->setTimeFormat("%H:%M");
-
-	/*
-	 * To suppress times in the "Last edited on" messages, give a
-	 * give a second argument of false:
-	 */
-	//$this->setDateFormat("%B %d, %Y", false);
+    /*
+     * To suppress times in the "Last edited on" messages, give a
+     * give a second argument of false:
+     */
+    //$this->setDateFormat("%B %d, %Y", false);
     }
 }
 
@@ -132,5 +117,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/actionbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/actionbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/actionbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: actionbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 if (!$WikiTheme->DUMP_MODE) {
 // Only [Info] button when not signed in.
 // The rest behind Info

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/info.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/info.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/info.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: info.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: info.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 
 <?php echo Template("default/info") ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- The top navigation/search bar -->
 <form action="<?php echo WikiURL(_("TitleSearch"))?>"
@@ -13,8 +13,8 @@
              onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
              onmouseout="window.status=''; return true;" />
     <?php if (!empty($revision)) { ?>
-     <?php echo $SEP?><?php echo Button(array('action'=>'LikePages'),_("LikePages"),$page->getName()) ?>
-     <?php echo $SEP?><?php echo Button(array('action'=>'BackLinks'), _("BackLinks"),$page->getName()) ?>
+     <?php echo $SEP?><?php echo Button(array('action'=>_("LikePages")),_("LikePages"),$page->getName()) ?>
+     <?php echo $SEP?><?php echo Button(array('action'=>_("BackLinks")), _("BackLinks"),$page->getName()) ?>
     <?php } ?>
     <?php if (!empty($user) && $user->isAdmin()) { ?>
      <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "","Admin") ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/signin.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/signin.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/templates/signin.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: signin.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: signin.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 
 if (empty($FORMNAME))
     $FORMNAME = 'signin';

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/smaller/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 /**
  * tiny actionbar, only Edit (if signed in) and Info => PageInfo,
  *   all other Actionbars buttons in info.tmpl
@@ -40,18 +40,15 @@
 
         return $this->makeButton($label, WikiURL($pagename, $attr), $class);
     }
-    
 }
 
 $WikiTheme = new WikiTheme_smaller('smaller');
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// (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:   
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/body.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/body.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/body.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: body.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <body<?php echo $WikiTheme->getMoreAttr('body') ?>>
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/categorypage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/categorypage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/categorypage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: categorypage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: categorypage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <div class="categorypage categorypage-form">
 

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/head.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/head.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/head.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php  // -*-php-*-
-// rcs_id('$Id: head.tmpl 7618 2010-07-16 06:59:16Z vargenau $');
+// $Id: head.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" />
@@ -18,13 +18,6 @@
 <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" />
 <base href="<?php echo PHPWIKI_BASE_URL?>" />
 <link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" />
-<?php /**
-       * Additional navigation links are provided here in the html header for browsers
-       * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??).
-       *
-       * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK
-       *     http://www.euronet.nl/~tekelenb/WWW/LINK/index.html
-       */ ?>
 <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?>
 <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" />
 <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(
@@ -110,8 +103,10 @@
       $pagetitle = " - ". AsString($TITLE);
 ?>
 <title><?php echo WIKI_NAME.$pagetitle ?></title>
+<?php if (ENABLE_OPEN_GRAPH) { ?>
 <meta property="og:title" content="<?php echo strip_tags($TITLE) ?>"/>
 <meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/>
+<?php } ?>
 <?php
   require_once("lib/plugin/RateIt.php");
   $plugin = new WikiPlugin_RateIt;

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/navbar.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/navbar.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/navbar.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,12 +1,12 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: navbar.tmpl 7956 2011-03-03 17:08:31Z vargenau $
   $NSEP = HTML::br();
 ?>
 <!-- The left navigation/search bar -->
 <div id="navbuttons">
 <?php if (ENABLE_DISCUSSION_LINK) { ?>
 <?php // This requires Talk: map to end in "/Discussion"
-  if (!string_ends_with($page->getName(), _("Discussion"))) { ?>
+  if (!string_ends_with($page->getName(), SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php echo $NSEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()), 
                'button', _("Discussion")) ?>
   <?php } else { ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/newuserwelcomepage.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/newuserwelcomepage.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/newuserwelcomepage.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: newuserwelcomepage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: newuserwelcomepage.tmpl 7956 2011-03-03 17:08:31Z vargenau $
   $dbi = $request->getDbh();
 ?>
 <div>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/ratings.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/ratings.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/ratings.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ratings.tmpl 7417 2010-05-19 12:57:42Z vargenau $');
+// $Id: ratings.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 ?>
 <!-- Ratings -->
 <?php if (!$WikiTheme->DUMP_MODE) {

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/top.tmpl
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/top.tmpl	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/templates/top.tmpl	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: top.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: top.tmpl 7956 2011-03-03 17:08:31Z vargenau $
 global $HIDE_TOOLBARS;
 if (!$HIDE_TOOLBARS) { ?>
 <!-- The logo -->

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/themeinfo.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/themeinfo.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/themeinfo.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// $Id: themeinfo.php 7968 2011-03-07 13:39:47Z vargenau $
 /**
  * The wikilens theme is just a normal WikiTheme (can be based on any, here based on default),
  * which additionally loads some wikilens libraries.
@@ -18,82 +18,78 @@
 class WikiTheme_Wikilens extends WikiTheme {
 
     function load() {
-	// 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.
+   // 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.
 
-	// This should result in phpwiki-printer.css being used when
-	// printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
-	$this->setDefaultCSS('PhpWiki',
-				  array(''      => 'wikilens.css',
-					'print' => 'phpwiki-printer.css'));
+   // This should result in phpwiki-printer.css being used when
+   // printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
+   $this->setDefaultCSS('PhpWiki', array('' => 'wikilens.css', 'print' => 'phpwiki-printer.css'));
 
-	// This allows one to manually select "Printer" style (when browsing page)
-	// to see what the printer style looks like.
-	$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-	$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
-	$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+   // This allows one to manually select "Printer" style (when browsing page)
+   // to see what the printer style looks like.
+   $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+   $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css');
+   $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
 
-	/**
-	 * The logo image appears on every page and links to the HomePage.
-	 */
-	$this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+   /**
+    * The logo image appears on every page and links to the HomePage.
+    */
+   $this->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
-	/**
-	 * The Signature image is shown after saving an edited page. If this
-	 * is set to false then the "Thank you for editing..." screen will
-	 * be omitted.
-	 */
+   /**
+    * The Signature image is shown after saving an edited page. If this
+    * is set to false then the "Thank you for editing..." screen will
+    * be omitted.
+    */
 
-	$this->addImageAlias('signature', WIKI_NAME . "Signature.png");
-	// Uncomment this next line to disable the signature.
-	$this->addImageAlias('signature', false);
+   $this->addImageAlias('signature', WIKI_NAME . "Signature.png");
+   // Uncomment this next line to disable the signature.
+   $this->addImageAlias('signature', false);
 
-	/*
-	 * Link icons.
-	 */
-	//$this->setLinkIcon('http');
-	$this->setLinkIcon('https');
-	$this->setLinkIcon('ftp');
-	$this->setLinkIcon('mailto');
-	//$this->setLinkIcon('interwiki');
-	$this->setLinkIcon('wikiuser');
-	//$this->setLinkIcon('*', 'url');
+   /*
+    * Link icons.
+    */
+   //$this->setLinkIcon('http');
+   $this->setLinkIcon('https');
+   $this->setLinkIcon('ftp');
+   $this->setLinkIcon('mailto');
+   //$this->setLinkIcon('interwiki');
+   $this->setLinkIcon('wikiuser');
+   //$this->setLinkIcon('*', 'url');
 
-	//$this->setButtonSeparator(HTML::br());
+   /**
+    * WikiWords can automatically be split by inserting spaces between
+    * the words. The default is to leave WordsSmashedTogetherLikeSo.
+    */
+   //$this->setAutosplitWikiWords(false);
 
-	/**
-	 * WikiWords can automatically be split by inserting spaces between
-	 * the words. The default is to leave WordsSmashedTogetherLikeSo.
-	 */
-	//$this->setAutosplitWikiWords(false);
+   /**
+    * Layout improvement with dangling links for mostly closed wiki's:
+    * If false, only users with edit permissions will be presented the
+    * special wikiunknown class with "?" and Tooltip.
+    * If true (default), any user will see the ?, but will be presented
+    * the PrintLoginForm on a click.
+    */
+   $this->setAnonEditUnknownLinks(false);
 
-	/**
-	 * Layout improvement with dangling links for mostly closed wiki's:
-	 * If false, only users with edit permissions will be presented the
-	 * special wikiunknown class with "?" and Tooltip.
-	 * If true (default), any user will see the ?, but will be presented
-	 * the PrintLoginForm on a click.
-	 */
-	$this->setAnonEditUnknownLinks(false);
+   /*
+    * You may adjust the formats used for formatting dates and times
+    * below.  (These examples give the default formats.)
+    * Formats are given as format strings to PHP strftime() function See
+    * http://www.php.net/manual/en/function.strftime.php for details.
+    * Do not include the server's zone (%Z), times are converted to the
+    * user's time zone.
+    */
+   $this->setDateFormat("%B %d, %Y");
+   $this->setTimeFormat("%H:%M");
 
-	/*
-	 * You may adjust the formats used for formatting dates and times
-	 * below.  (These examples give the default formats.)
-	 * Formats are given as format strings to PHP strftime() function See
-	 * http://www.php.net/manual/en/function.strftime.php for details.
-	 * Do not include the server's zone (%Z), times are converted to the
-	 * user's time zone.
-	 */
-	$this->setDateFormat("%B %d, %Y");
-	$this->setTimeFormat("%H:%M");
+   /*
+    * To suppress times in the "Last edited on" messages, give a
+    * give a second argument of false:
+    */
+   //$this->setDateFormat("%B %d, %Y", false);
 
-	/*
-	 * To suppress times in the "Last edited on" messages, give a
-	 * give a second argument of false:
-	 */
-	//$this->setDateFormat("%B %d, %Y", false);
-
     }
 }
 
@@ -107,5 +103,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/wikilens-min.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/wikilens-min.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/wikilens-min.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1 +1 @@
- at import url(../default/phpwiki.css);body{background:#FEFEFE;font-size:90%;margin:0;}div.wikitext{margin-top:0;margin-bottom:0;background:#FEFEFE;}td.leftnav{background:#F3F3F7;padding:8px;padding-left:.3em;padding-right:.2em;padding-top:.5ex;padding-bottom:.5ex;margin:0;border-right:1px #e6e6fa solid;border-bottom:1px #e6e6fa solid;}#logo img{margin:0;float:left;border:0;}#toolbar{margin:1.5ex 1em 0 1em;}
\ No newline at end of file
+ at import url(../default/phpwiki.css);body{background:#FEFEFE;font-size:90%;margin:0;}div.wikitext{margin-top:0;margin-bottom:0;background:#FEFEFE;}td.leftnav{background:#F3F3F7;padding:8px;padding-left:.3em;padding-right:.2em;padding-top:.5ex;padding-bottom:.5ex;margin:0;border-right:1px #e6e6fa solid;border-bottom:1px #e6e6fa solid;}img{border:0;}#logo img{margin:0;float:left;}#toolbar{margin:1.5ex 1em 0 1em;}
\ No newline at end of file

Modified: branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/wikilens.css
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/wikilens.css	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/themes/wikilens/wikilens.css	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,5 +1,5 @@
 /**
- * $Id: wikilens.css 7327 2010-04-15 08:16:21Z vargenau $
+ * $Id: wikilens.css 7821 2011-01-07 12:42:51Z vargenau $
  * We have two possibilities to override the default:
  * 1. import is ns4 incompatible
  * 2. add a 2nd css in themeinfo.php
@@ -36,10 +36,11 @@
   border-bottom: 1px #e6e6fa solid; /* lavender */
 }
 
+img { border: 0; }
+
 #logo img {
   margin: 0;
   float: left;
-  border: 0;
 }
 
 #toolbar {

Modified: branches/Branch_5_1/src/plugins/wiki/www/uploads/index.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/uploads/index.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/uploads/index.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // $Id: index.php 7102 2009-09-09 13:11:38Z vargenau $ 
-	header( "Location: ../index.php?pagename=UpLoad" );
-	exit();
+<?php // $Id: index.php 7964 2011-03-05 17:05:30Z vargenau $
+    header( "Location: ../index.php?pagename=UpLoad" );
+    exit();
 ?>

Modified: branches/Branch_5_1/src/plugins/wiki/www/wikiadmin.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/wikiadmin.php	2011-05-18 18:30:11 UTC (rev 13354)
+++ branches/Branch_5_1/src/plugins/wiki/www/wikiadmin.php	2011-05-18 19:36:20 UTC (rev 13355)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: wikiadmin.php 7713 2010-10-08 13:56:07Z vargenau $
+<?php // -*-php-*- $Id: wikiadmin.php 8071 2011-05-18 14:56:14Z vargenau $
 /*
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
  * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -16,9 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+*/
 
 /*
  * Standard Alcatel-Lucent disclaimer for contributing to open source
@@ -44,63 +44,52 @@
 
 require_once dirname(__FILE__)."/../../env.inc.php";
 require_once $gfcommon.'include/pre.php';
-require_once forge_get_config('plugins_path').'/wiki/common/WikiPlugin.class.php';
-require_once forge_get_config('plugins_path').'/wiki/common/wikiconfig.class.php';
+require_once forge_get_config('plugins_path').'wiki/common/WikiPlugin.class.php';
+require_once forge_get_config('plugins_path').'wiki/common/wikiconfig.class.php';
 
-// the header that displays for the user portion of the plugin
-function wiki_Project_Header($params) {
-    global $id;
-    $params['toptab']='wiki';
-    $params['group']=$id;
-    /*
-        Show horizontal links
-    */
-    site_project_header($params);
-}
-
 $user = session_get_user(); // get the session user
 
 if (!$user || !is_object($user)) {
     exit_error(_('Invalid User'),'home');
 } else if ( $user->isError()) {
-	exit_error($user->getErrorMessage(),'home');
+    exit_error($user->getErrorMessage(),'home');
 } else if ( !$user->isActive()) {
-	exit_error(_('User not active'),'home');
+    exit_error(_('User not active'),'home');
 }
 
 $type = getStringFromRequest('type');
-$id = getIntFromRequest('id');
+$group_id = getIntFromRequest('group_id');
 $pluginname = 'wiki';
 $config = getArrayFromRequest('config');
 
 if (!$type) {
-    exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No TYPE specified')),'home');
-} elseif (!$id) {
-    exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No ID specified')),'home');
+    exit_missing_param('',array(_('No TYPE specified')),'home');
+} elseif (!$group_id) {
+    exit_missing_param('',array(_('No ID specified')),'home');
 } else {
     if ($type == 'admin_post') {
-        $group = group_get_object($id);
+        $group = group_get_object($group_id);
         if ( !$group) {
-			exit_no_group();
+            exit_no_group();
         }
         if (!($group->usesPlugin($pluginname))) { //check if the group has the wiki plugin active
-			exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'),$pluginname),'home');
+            exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'),$pluginname),'home');
         }
         $userperm = $group->getPermission($user); //we'll check if the user belongs to the group
         if ( !$userperm->IsMember()) {
-			exit_permission_denied(_('You are not a member of this project'),'home');
+            exit_permission_denied(_('You are not a member of this project'),'home');
         }
         //only project admin can access here
         if ( $userperm->isAdmin() ) {
 
-            $wc = new WikiConfig($id);
+            $wc = new WikiConfig($group_id);
 
             foreach ($wc->getWikiConfigNames() as $c) {
                 if ( ! array_key_exists($c, $config)) {
                     $config[$c] = 0;
                 }
             }
- 
+
             foreach ($config as $config_name => $config_value) {
                 $r = $wc->updateWikiConfig($config_name, $config_value);
                 if (!$r) exit_error("Error", $wc->getErrorMessage());
@@ -113,12 +102,12 @@
         }
     }
     if ($type == 'admin') {
-        $group = group_get_object($id);
+        $group = group_get_object($group_id);
         if ( !$group) {
-			exit_no_group();
+            exit_no_group();
         }
         if ( ! ($group->usesPlugin ($pluginname)) ) {//check if the group has the plugin active
-			exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'),$pluginname),'home');
+            exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'),$pluginname),'home');
         }
         $userperm = $group->getPermission($user); //we'll check if the user belongs to the group
         if ( !$userperm->IsMember()) {
@@ -126,9 +115,13 @@
         }
         //only project admin can access here
         if ( $userperm->isAdmin() ) {
-            wiki_Project_Header(array('title'=>"Configuration for your project's Wiki",'pagename'=>"$pluginname",'sectionvals'=>array(group_getname($id))));
+            site_project_header(array('title' => _("Configuration for your project's wiki"),
+                                      'pagename' => $pluginname,
+                                      'group'    => $group_id,
+                                      'toptab'   => 'wiki',
+                                      'sectionvals' => array(group_getname($group_id))));
 
-            $wc = new WikiConfig($id);
+            $wc = new WikiConfig($group_id);
 
             print "<table>\n";
             print "<tr>\n";
@@ -136,7 +129,7 @@
             print "<fieldset>\n";
             print "<legend>"._('Wiki Configuration')."</legend>\n";
             print "<form action=\"/wiki/wikiadmin.php\" method=\"post\">\n";
-            print "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n";
+            print "<input type=\"hidden\" name=\"group_id\" value=\"$group_id\" />\n";
             print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n";
             print "<input type=\"hidden\" name=\"type\" value=\"admin_post\" />\n";
 




More information about the Fusionforge-commits mailing list